@stamhoofd/models 2.119.0 → 2.120.1

package/src/models/CachedBalance.test.ts

@@ -0,0 +1,331 @@
+import { BalanceItemStatus } from '../../../../../shared/structures/dist/BalanceItem.js';
+import { ReceivableBalanceType } from '../../../../../shared/structures/dist/ReceivableBalance.js';
+import { MemberFactory } from '../factories/MemberFactory.js';
+import { OrganizationFactory } from '../factories/OrganizationFactory.js';
+import { UserFactory } from '../factories/UserFactory.js';
+import { BalanceItem } from './BalanceItem.js';
+import { CachedBalance } from './CachedBalance.js';
+import { Member } from './Member.js';
+
+describe('CachedBalance', () => {
+    const now = new Date('2024-05-01T00:00:00Z');
+
+    beforeEach(() => {
+        // Mock datetime
+        vitest.useFakeTimers({ toFake: ['Date'] }).setSystemTime(now);
+    });
+
+    afterAll(() => {
+        vitest.useRealTimers();
+    });
+
+    test('Balances for members are summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = null
+        balanceA.quantity = 2;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Due
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(2_00);
+        expect(cached[0].amountPaid).toBe(0);
+        expect(cached[0].amountPending).toBe(0);
+        expect(cached[0].nextDueAt).toBe(null);
+    });
+
+    test('Balances less than 7 days in the future are summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 6); // 6 days later
+        balanceA.quantity = 1;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Due
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(1_00);
+        expect(cached[0].amountPaid).toBe(0);
+        expect(cached[0].amountPending).toBe(0);
+        expect(cached[0].nextDueAt).toEqual(null);
+    });
+
+    test('Balances more than 7 days in the future are not summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
+        balanceA.quantity = 1;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Due
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(0);
+        expect(cached[0].amountPaid).toBe(0);
+        expect(cached[0].amountPending).toBe(0);
+        expect(cached[0].nextDueAt).toEqual(balanceA.dueAt);
+    });
+
+    test('Paid balances more than 7 days in the future are summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
+        balanceA.quantity = 2;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Due
+        balanceA.pricePaid = 2_00;
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(0);
+        expect(cached[0].amountPaid).toBe(2_00);
+        expect(cached[0].amountPending).toBe(0);
+        expect(cached[0].nextDueAt).toEqual(null);
+    });
+
+     test('Paid balances more than 7 days in the future are summed and due at is still set if only partially paid', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
+        balanceA.quantity = 2;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Due
+        balanceA.pricePaid = 1_00;
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(0);
+        expect(cached[0].amountPaid).toBe(1_00);
+        expect(cached[0].amountPending).toBe(0);
+        expect(cached[0].nextDueAt).toEqual(balanceA.dueAt);
+    });
+
+    test('Canceled items are not summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = null;
+        balanceA.quantity = 1;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Canceled
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(0);
+        expect(cached[0].amountPaid).toBe(0);
+        expect(cached[0].amountPending).toBe(0);
+    });
+
+    test('Hidden items are not summed', async () => {
+        const organization = await new OrganizationFactory({}).create();
+        const member = await new MemberFactory({organization}).create();
+
+        const balanceA = new BalanceItem();
+        balanceA.dueAt = null;
+        balanceA.quantity = 1;
+        balanceA.unitPrice = 1_00;
+        balanceA.memberId = member.id;
+        balanceA.organizationId = organization.id;
+        balanceA.status = BalanceItemStatus.Hidden
+        await balanceA.save();
+
+        // Update cached balance for user.
+        await CachedBalance.updateForMembers(organization.id, [member.id])
+        const cached = await CachedBalance.getForObjects([member.id], organization.id, ReceivableBalanceType.member);
+        expect(cached).toHaveLength(1);
+        expect(cached[0].amountOpen).toBe(0);
+        expect(cached[0].amountPaid).toBe(0);
+        expect(cached[0].amountPending).toBe(0);
+    });
+
+    describe('nextDueAt for users with members', () => {
+        test('Two balance items in the future are merged if less than 7 days in the future', async () => {
+            const organization = await new OrganizationFactory({}).create();
+            const member = await new MemberFactory({organization}).create();
+            const user = await new UserFactory({organization}).create();
+
+            // Link member with user
+            await Member.users.reverse('members').link(user, [member]);
+
+            const balanceA = new BalanceItem();
+            balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60); // 1 hour later
+            balanceA.quantity = 1;
+            balanceA.unitPrice = 1_00;
+            balanceA.memberId = member.id;
+            balanceA.organizationId = organization.id;
+            balanceA.status = BalanceItemStatus.Due
+            await balanceA.save();
+
+            const balanceB = new BalanceItem();
+            balanceB.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 2); // 2 hours later
+            balanceB.quantity = 1;
+            balanceB.unitPrice = 1_00;
+            balanceB.userId = user.id;
+            balanceB.organizationId = organization.id;
+            balanceB.status = BalanceItemStatus.Due
+            await balanceB.save();
+
+            // Update cached balance for user.
+            await CachedBalance.updateForMembers(organization.id, [member.id])
+            await CachedBalance.updateForUsers(organization.id, [user.id])
+            {
+                const cached = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.user);
+                expect(cached).toHaveLength(1);
+                expect(cached[0].amountOpen).toBe(2_00);
+                expect(cached[0].amountPaid).toBe(0);
+                expect(cached[0].amountPending).toBe(0);
+                expect(cached[0].nextDueAt).toBe(null);
+            }
+
+            {
+                const cached = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.userWithoutMembers);
+                expect(cached).toHaveLength(1);
+                expect(cached[0].amountOpen).toBe(1_00);
+                expect(cached[0].amountPaid).toBe(0);
+                expect(cached[0].amountPending).toBe(0);
+                expect(cached[0].nextDueAt).toBe(null);
+            }
+        });
+
+        test('[Regression] Two balance items more than 7 days in the future set correct nextDueAt', async () => {
+            const organization = await new OrganizationFactory({}).create();
+            const member = await new MemberFactory({organization}).create();
+            const user = await new UserFactory({organization}).create();
+
+            // Link member with user
+            await Member.users.reverse('members').link(user, [member]);
+
+            const balanceA = new BalanceItem();
+            balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
+            balanceA.quantity = 1;
+            balanceA.unitPrice = 1_00;
+            balanceA.memberId = member.id;
+            balanceA.organizationId = organization.id;
+            balanceA.status = BalanceItemStatus.Due
+            await balanceA.save();
+
+            const balanceB = new BalanceItem();
+            balanceB.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 9); // 9 days later
+            balanceB.quantity = 1;
+            balanceB.unitPrice = 1_00;
+            balanceB.userId = user.id;
+            balanceB.organizationId = organization.id;
+            balanceB.status = BalanceItemStatus.Due
+            await balanceB.save();
+
+            // Update cached balance for user.
+            await CachedBalance.updateForMembers(organization.id, [member.id])
+            await CachedBalance.updateForUsers(organization.id, [user.id])
+            {
+                const cached = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.user);
+                expect(cached).toHaveLength(1);
+                expect(cached[0].amountOpen).toBe(0);
+                expect(cached[0].amountPaid).toBe(0);
+                expect(cached[0].amountPending).toBe(0);
+                expect(cached[0].nextDueAt).toEqual(balanceA.dueAt);
+            }
+
+            {
+                const cached = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.userWithoutMembers);
+                expect(cached).toHaveLength(1);
+                expect(cached[0].amountOpen).toBe(0);
+                expect(cached[0].amountPaid).toBe(0);
+                expect(cached[0].amountPending).toBe(0);
+                expect(cached[0].nextDueAt).toEqual(balanceB.dueAt);
+            }
+
+            // Advance time with one day, balanceA is now less than 7 days in the future and should be included in the cached balance.
+            // nextDueAt should be different and set to balanceB.dueAt
+            vitest.setSystemTime(new Date(now.getTime() + 1000 * 60 * 60 * 24 * 1))
+            await CachedBalance.updateForMembers(organization.id, [member.id])
+            await CachedBalance.updateForUsers(organization.id, [user.id])
+            const cachedAfter = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.user);
+            expect(cachedAfter).toHaveLength(1);
+            expect(cachedAfter[0].amountOpen).toBe(1_00);
+            expect(cachedAfter[0].amountPaid).toBe(0);
+            expect(cachedAfter[0].amountPending).toBe(0);
+            expect(cachedAfter[0].nextDueAt).toEqual(balanceB.dueAt);
+        });
+
+        test('Two balance items more than 7 days in the future that are partially paid are summed correctly', async () => {
+            const organization = await new OrganizationFactory({}).create();
+            const member = await new MemberFactory({organization}).create();
+            const user = await new UserFactory({organization}).create();
+
+            // Link member with user
+            await Member.users.reverse('members').link(user, [member]);
+
+            const balanceA = new BalanceItem();
+            balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
+            balanceA.quantity = 1;
+            balanceA.unitPrice = 1_00;
+            balanceA.memberId = member.id;
+            balanceA.organizationId = organization.id;
+            balanceA.pricePaid = 50;
+            balanceA.status = BalanceItemStatus.Due
+            await balanceA.save();
+
+            const balanceB = new BalanceItem();
+            balanceB.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 9); // 9 days later
+            balanceB.quantity = 1;
+            balanceB.unitPrice = 1_00;
+            balanceB.userId = user.id;
+            balanceB.organizationId = organization.id;
+            balanceB.pricePaid = 50;
+            balanceB.status = BalanceItemStatus.Due
+            await balanceB.save();
+
+            // Update cached balance for user.
+            await CachedBalance.updateForMembers(organization.id, [member.id])
+            await CachedBalance.updateForUsers(organization.id, [user.id])
+            const cached = await CachedBalance.getForObjects([user.id], organization.id, ReceivableBalanceType.user);
+            expect(cached).toHaveLength(1);
+            expect(cached[0].amountOpen).toBe(0);
+            expect(cached[0].amountPaid).toBe(1_00);
+            expect(cached[0].amountPending).toBe(0);
+            expect(cached[0].nextDueAt).toEqual(balanceA.dueAt);
+        });
+    });
+});

package/src/models/CachedBalance.ts

@@ -1,5 +1,6 @@
 import { column } from '@simonbackx/simple-database';
-import { QueryableModel, SQL, SQLAlias, SQLMin, SQLSelectAs, SQLSum, SQLWhere, SQLWhereSign } from '@stamhoofd/sql';
+import type { SQLWhere} from '@stamhoofd/sql';
+import { QueryableModel, SQL, SQLAlias, SQLMin, SQLSelectAs, SQLSum, SQLWhereSign } from '@stamhoofd/sql';
 import { BalanceItemStatus, BalanceItem as BalanceItemStruct, ReceivableBalanceType } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { BalanceItem } from './BalanceItem.js';
@@ -458,7 +459,7 @@ export class CachedBalance extends QueryableModel {
                     result[1].amountPaid += memberCachedBalance.amountPaid;
                     result[1].amountOpen += memberCachedBalance.amountOpen;
                     result[1].amountPending += memberCachedBalance.amountPending;
-                    if (memberCachedBalance.nextDueAt && (!result[1].nextDueAt || memberCachedBalance.nextDueAt > result[1].nextDueAt)) {
+                    if (memberCachedBalance.nextDueAt && (!result[1].nextDueAt || memberCachedBalance.nextDueAt < result[1].nextDueAt)) {
                         result[1].nextDueAt = memberCachedBalance.nextDueAt;
                     }
                 }

package/src/models/Document.ts

@@ -5,8 +5,8 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
 import { render } from '../helpers/Handlebars.js';
-import { Member, MemberWithRegistrations, MemberWithUsersRegistrationsAndGroups, RegistrationWithMember } from './Member.js';
-import { Organization } from './Organization.js';
+import type { Member, MemberWithRegistrations, RegistrationWithMember } from './Member.js';
+import type { Organization } from './Organization.js';
 import { Registration } from './Registration.js';
 
 export class Document extends QueryableModel {

package/src/models/DocumentTemplate.ts

@@ -1,7 +1,8 @@
 import { column } from '@simonbackx/simple-database';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
-import { BalanceItemStatus, DocumentData, DocumentPrivateSettings, DocumentSettings, DocumentStatus, DocumentTemplatePrivate, GroupType, NationalRegisterNumberOptOut, Parent, RecordAddressAnswer, RecordAnswer, RecordAnswerDecoder, RecordDateAnswer, RecordPriceAnswer, RecordSettings, RecordTextAnswer, RecordType } from '@stamhoofd/structures';
+import type { Parent, RecordAnswer} from '@stamhoofd/structures';
+import { BalanceItemStatus, DocumentData, DocumentPrivateSettings, DocumentSettings, DocumentStatus, DocumentTemplatePrivate, GroupType, NationalRegisterNumberOptOut, RecordAddressAnswer, RecordAnswerDecoder, RecordDateAnswer, RecordPriceAnswer, RecordSettings, RecordTextAnswer, RecordType } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -10,8 +11,9 @@ import { render } from '../helpers/Handlebars.js';
 import { BalanceItem } from './BalanceItem.js';
 import { Document } from './Document.js';
 import { Group } from './Group.js';
-import { Member, RegistrationWithMember } from './Member.js';
-import { Organization } from './Organization.js';
+import type { RegistrationWithMember } from './Member.js';
+import { Member } from './Member.js';
+import type { Organization } from './Organization.js';
 import { Registration } from './Registration.js';
 import { User } from './User.js';
 

package/src/models/Email.test.ts

@@ -1,4 +1,5 @@
-import { BalanceItemType, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailRecipientSubfilter, EmailStatus, LimitedFilteredRequest, OrganizationMetaData, PaginatedResponse } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest} from '@stamhoofd/structures';
+import { BalanceItemType, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailRecipientSubfilter, EmailStatus, OrganizationMetaData, PaginatedResponse } from '@stamhoofd/structures';
 import { Email } from './Email.js';
 import { EmailRecipient } from './EmailRecipient.js';
 import { EmailMocker } from '@stamhoofd/email';
@@ -217,7 +218,7 @@ describe('Model.Email', () => {
             ],
         });
 
-        await expect(model.queueForSending(true)).toReject();
+        await expect(model.queueForSending(true)).rejects.toThrow();
         await model.refresh();
 
         // Check if it was sent correctly
@@ -284,7 +285,7 @@ describe('Model.Email', () => {
                 sentAt: null,
                 failCount: 1,
                 failError: STExpect.simpleErrors([{
-                    message: /This is a simulated network error (3|4|5|6)/,
+                    message: /This is a simulated network error ([3-6])/,
                 }]),
                 firstFailedAt: expect.any(Date),
                 lastFailedAt: expect.any(Date),
@@ -294,7 +295,7 @@ describe('Model.Email', () => {
                 sentAt: null,
                 failCount: 1,
                 failError: STExpect.simpleErrors([{
-                    message: /This is a simulated network error (3|4|5|6)/,
+                    message: /This is a simulated network error ([3-6])/,
                 }]),
                 firstFailedAt: expect.any(Date),
                 lastFailedAt: expect.any(Date),
@@ -933,20 +934,20 @@ describe('Model.Email', () => {
                     subject: `${expectedAmount}`,
                 });
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('<p>' + expectedAmount + '</p>');
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(expectedAmount);
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('<p>' + expectedAmount + '</p>');
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(expectedAmount);
 
                 // Check if the table is correct
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('<table');
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('2 x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude(Formatter.price(12_99)); // unit price
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('<td>' + expectedAmount); // total price in table
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('Test balance item'); // description
-
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude('2 x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(Formatter.price(12_99)); // unit price
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(expectedAmount); // total price in table
-                expect(EmailMocker.getSucceededEmail(0).text?.toLowerCase()).toInclude('test balance item'); // description
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('<table');
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('2 x '); // amount
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(Formatter.price(12_99)); // unit price
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('<td>' + expectedAmount); // total price in table
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('Test balance item'); // description
+
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch('2 x '); // amount
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(Formatter.price(12_99)); // unit price
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(expectedAmount); // total price in table
+                expect(EmailMocker.getSucceededEmail(0).text?.toLowerCase()).toMatch('test balance item'); // description
             }, 15_000);
 
             it('The balance is zero for unknown users', async () => {
@@ -994,16 +995,16 @@ describe('Model.Email', () => {
                     subject: `${expectedAmount}`,
                 });
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('<p>' + expectedAmount + '</p>');
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(expectedAmount);
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('<p>' + expectedAmount + '</p>');
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(expectedAmount);
 
                 // Check if the table is correct
-                expect(EmailMocker.getSucceededEmail(0).html).not.toInclude('<table');
-                expect(EmailMocker.getSucceededEmail(0).html).not.toInclude(' x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude('<p class="description">' + $t('%hX') + '</p>');
+                expect(EmailMocker.getSucceededEmail(0).html).not.toMatch('<table');
+                expect(EmailMocker.getSucceededEmail(0).html).not.toMatch(' x '); // amount
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch('<p class="description">' + $t('%hX') + '</p>');
 
-                expect(EmailMocker.getSucceededEmail(0).text).not.toInclude(' x '); // amount
-                expect(EmailMocker.getSucceededEmail(0).text?.toLowerCase()).toInclude($t('%hX').toLowerCase());
+                expect(EmailMocker.getSucceededEmail(0).text).not.toMatch(' x '); // amount
+                expect(EmailMocker.getSucceededEmail(0).text?.toLowerCase()).toMatch($t('%hX').toLowerCase());
             }, 15_000);
 
             it('loginDetails are added for existing users without password', async () => {
@@ -1048,10 +1049,10 @@ describe('Model.Email', () => {
                 expect(await EmailMocker.getSucceededCount()).toBe(1);
                 expect(await EmailMocker.getFailedCount()).toBe(0);
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(
                     $t('%1EB', { email: existingUser.email }),
                 );
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(
                     $t('%1EB', { email: existingUser.email }),
                 );
             }, 15_000);
@@ -1093,10 +1094,10 @@ describe('Model.Email', () => {
                 expect(await EmailMocker.getSucceededCount()).toBe(1);
                 expect(await EmailMocker.getFailedCount()).toBe(0);
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(
                     $t('%1EB', { email: 'unknown@example.com' }),
                 );
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(
                     $t('%1EB', { email: 'unknown@example.com' }),
                 );
             }, 15_000);
@@ -1143,10 +1144,10 @@ describe('Model.Email', () => {
                 expect(await EmailMocker.getSucceededCount()).toBe(1);
                 expect(await EmailMocker.getFailedCount()).toBe(0);
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(
                     $t('%1EA', { email: existingUser.email }),
                 );
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(
                     $t('%1EA', { email: existingUser.email }),
                 );
             }, 15_000);
@@ -1202,13 +1203,13 @@ describe('Model.Email', () => {
                 expect(await EmailMocker.getSucceededCount()).toBe(1);
                 expect(await EmailMocker.getFailedCount()).toBe(0);
 
-                expect(EmailMocker.getSucceededEmail(0).html).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).html).toMatch(
                     $t('%1EC', {
                         firstName: Formatter.escapeHtml(member.firstName),
                         securityCode: `<span class="style-inline-code">${Formatter.escapeHtml(Formatter.spaceString(member.details.securityCode ?? '', 4, '-'))}</span>`,
                     }),
                 );
-                expect(EmailMocker.getSucceededEmail(0).text).toInclude(
+                expect(EmailMocker.getSucceededEmail(0).text).toMatch(
                     $t('%1EC', {
                         firstName: member.firstName,
                         securityCode: Formatter.spaceString(member.details.securityCode ?? '', 4, '-'),

package/src/models/Email.ts

@@ -1,12 +1,15 @@
 import { column } from '@simonbackx/simple-database';
-import { BaseOrganization, EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, EmailTemplateType, EmailWithRecipients, getExampleRecipient, isSoftEmailRecipientError, LimitedFilteredRequest, PaginatedResponse, SortItemDirection, StamhoofdFilter, User as UserStruct } from '@stamhoofd/structures';
+import type { BaseOrganization, EmailRecipientFilterType, EmailRecipient as EmailRecipientStruct, EmailTemplateType, PaginatedResponse, StamhoofdFilter, User as UserStruct } from '@stamhoofd/structures';
+import { EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientsStatus, EmailStatus, Email as EmailStruct, EmailWithRecipients, getExampleRecipient, isSoftEmailRecipientError, LimitedFilteredRequest, SortItemDirection } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { AnyDecoder, ArrayDecoder } from '@simonbackx/simple-encoding';
 import { isSimpleError, isSimpleErrors, SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { Email as EmailClass, EmailInterfaceRecipient } from '@stamhoofd/email';
-import { isAbortedError, QueueHandler, QueueHandlerOptions } from '@stamhoofd/queues';
+import { I18n } from '@stamhoofd/backend-i18n/I18n';
+import type { EmailInterfaceRecipient } from '@stamhoofd/email';
+import { Email as EmailClass } from '@stamhoofd/email';
+import type { QueueHandlerOptions } from '@stamhoofd/queues';
+import { isAbortedError, QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel, readDynamicSQLExpression, SQL, SQLAlias, SQLCalculation, SQLCount, SQLPlusSign, SQLSelectAs, SQLWhereSign } from '@stamhoofd/sql';
 import { canSendFromEmail, fillRecipientReplacements, getEmailBuilder, mergeReplacementsIfEqual, removeUnusedReplacements, stripRecipientReplacementsForWebDisplay, stripSensitiveRecipientReplacements } from '../helpers/EmailBuilder.js';
 import { EmailRecipient } from './EmailRecipient.js';

package/src/models/EmailTemplate.ts

@@ -1,7 +1,8 @@
 import { column } from '@simonbackx/simple-database';
 import { AnyDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
+import type { EmailTemplateType } from '@stamhoofd/structures';
+import { EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 /**

package/src/models/EmailVerificationCode.ts

@@ -1,6 +1,6 @@
 import { column } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
+import type {I18n} from '@stamhoofd/backend-i18n';
 import { QueryableModel } from '@stamhoofd/sql';
 import { EmailTemplateType, Recipient, Replacement } from '@stamhoofd/structures';
 import basex from 'base-x';
@@ -8,6 +8,8 @@ import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
 import { Platform } from './Platform.js';
+import type {User} from './User.js';
+import type {Organization} from './Organization.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);
@@ -118,7 +120,7 @@ export class EmailVerificationCode extends QueryableModel {
         this.expiresAt = new Date(new Date().getTime() + 1000 * 60 * 60 * 12);
     }
 
-    getEmailVerificationUrl(user: import('./User').User, organization: import('./Organization').Organization | null, i18n: I18n) {
+    getEmailVerificationUrl(user: User, organization: Organization | null, i18n: I18n) {
         let host: string;
         if (user.permissions || !organization || STAMHOOFD.userMode === 'platform') {
             host = 'https://' + (STAMHOOFD.domains.dashboard ?? 'stamhoofd.app') + '/' + i18n.locale;
@@ -244,7 +246,7 @@ export class EmailVerificationCode extends QueryableModel {
         }
     }
 
-    async send(user: import('./User').User, organization: import('./Organization').Organization | null, i18n: I18n, withCode = true) {
+    async send(user: User, organization: Organization | null, i18n: I18n, withCode = true) {
         const url = this.getEmailVerificationUrl(user, organization, i18n);
 
         const name = organization?.name ?? (await Platform.getSharedPrivateStruct()).config.name;
@@ -298,7 +300,7 @@ export class EmailVerificationCode extends QueryableModel {
         }
     }
 
-    static async resend(organization: import('./Organization').Organization | null, token: string, i18n: I18n) {
+    static async resend(organization: Organization | null, token: string, i18n: I18n) {
         const verificationCodes = await this.where({
             token,
             organizationId: organization
@@ -336,7 +338,7 @@ export class EmailVerificationCode extends QueryableModel {
      * If needed, it will update the code.
      * Use this method for sending only, not for verification!
      */
-    static async createFor(user: import('./User').User, email: string): Promise<EmailVerificationCode> {
+    static async createFor(user: User, email: string): Promise<EmailVerificationCode> {
         // TODO: make this constant time to avoid complex timing attacks (especially when under load)
         // Do we already have a verificationCode for this email?
 

package/src/models/EventNotification.ts

@@ -1,7 +1,8 @@
 import { column, ManyToManyRelation } from '@simonbackx/simple-database';
 import { MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EventNotificationStatus, RecordAnswer, RecordAnswerDecoder } from '@stamhoofd/structures';
+import type { RecordAnswer} from '@stamhoofd/structures';
+import { EventNotificationStatus, RecordAnswerDecoder } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Event } from './Event.js';
 
@@ -79,5 +80,5 @@ export class EventNotification extends QueryableModel {
     updatedAt: Date;
 
     // Note: all relations should point to their parents, not the other way around to avoid reference cycles
-    static events = new ManyToManyRelation(EventNotification, Event, 'events');
+    static events = new ManyToManyRelation<'events', EventNotification, Event>(EventNotification, Event, 'events');
 }