Skip to content

Update trial logic after onboarding #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 6, 2023
Merged

Update trial logic after onboarding #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3372c0d
Update trial logic after onboarding
skwowet Oct 3, 2023
04c3b7e
Fix failing test cases
skwowet Oct 3, 2023
458facc
Fix tests
skwowet Oct 3, 2023
1d5d286
Merge branch 'main' into improvement/C-2355
skwowet Oct 4, 2023
d788ef2
Merge branch 'main' into improvement/C-2355
skwowet Oct 6, 2023
7cc9f2b
Merge branch 'main' into improvement/C-2355
skwowet Oct 6, 2023
dc930bd
Merge branch 'main' into improvement/C-2355
skwowet Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions backend/src/database/repositories/tenantRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import lodash from 'lodash'
import moment from 'moment'
import Sequelize, { QueryTypes } from 'sequelize'
import { getCleanString } from '@crowd/common'
import { Edition } from '@crowd/types'
Expand Down Expand Up @@ -63,10 +62,6 @@ class TenantRepository {
throw new Error400(options.language, 'tenant.url.exists')
}

const trialEndsAt = moment().add(14, 'days').isAfter('2023-01-15')
? moment().add(14, 'days').toISOString()
: '2023-01-15'

const record = await options.database.tenant.create(
{
...lodash.pick(data, [
Expand All @@ -78,9 +73,7 @@ class TenantRepository {
'integrationsRequired',
'importHash',
]),
plan: API_CONFIG.edition === Edition.LFX ? Plans.values.enterprise : Plans.values.growth,
isTrialPlan: API_CONFIG.edition !== Edition.LFX,
trialEndsAt: API_CONFIG.edition !== Edition.LFX ? trialEndsAt : null,
plan: API_CONFIG.edition === Edition.LFX ? Plans.values.enterprise : Plans.values.essential,
createdById: currentUser.id,
updatedById: currentUser.id,
},
Expand Down
7 changes: 3 additions & 4 deletions backend/src/services/__tests__/tenantService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,14 @@ describe('TenantService tests', () => {

tenantCreatedPlain.createdAt = tenantCreatedPlain.createdAt.toISOString().split('T')[0]
tenantCreatedPlain.updatedAt = tenantCreatedPlain.updatedAt.toISOString().split('T')[0]
tenantCreatedPlain.trialEndsAt = tenantCreatedPlain.trialEndsAt.toISOString().split('T')[0]

const tenantExpected = {
id: tenantCreatedPlain.id,
name: 'testName',
url: 'testUrl',
plan: Plans.values.growth,
isTrialPlan: true,
trialEndsAt: moment().add(14, 'days').toISOString().split('T')[0],
plan: Plans.values.essential,
isTrialPlan: false,
trialEndsAt: null,
onboardedAt: null,
integrationsRequired: ['github', 'discord'],
hasSampleData: false,
Expand Down