Skip to content

Tenants created after the 18th of December only had trial for 14 days. It should be until the 15th of January. #363

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
joanreyero merged 1 commit into from
Dec 19, 2022
Merged

Tenants created after the 18th of December only had trial for 14 days. It should be until the 15th of January. #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion backend/src/database/repositories/tenantRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class TenantRepository {
]),
plan: 'Growth',
isTrialPlan: true,
trialEndsAt: moment().add(14, 'days').isAfter('2023-01-01')
trialEndsAt: moment().add(14, 'days').isAfter('2023-01-15')
? moment().add(14, 'days').toISOString()
: '2023-01-15',
createdById: currentUser.id,
Expand Down
5 changes: 4 additions & 1 deletion backend/src/services/__tests__/tenantService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import moment from 'moment'
import SequelizeTestUtils from '../../database/utils/sequelizeTestUtils'
import TenantService from '../tenantService'
import MemberService from '../memberService'
Expand Down Expand Up @@ -152,7 +153,9 @@ describe('TenantService tests', () => {
url: 'testUrl',
plan: Plans.values.growth,
isTrialPlan: true,
trialEndsAt: new Date('2023-01-15T00:00:00.000Z'),
trialEndsAt: moment().add(14, 'days').isAfter('2023-01-15')
? moment().add(14, 'days').toISOString()
: new Date('2023-01-15T00:00:00.000Z'),
planStatus: 'active',
planStripeCustomerId: null,
planUserId: null,
Expand Down