@stamhoofd/models 2.121.0 → 2.122.1

package/src/migrations/1733994455-balance-item-status-open.ts

@@ -0,0 +1,30 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+import { BalanceItemStatus } from '@stamhoofd/structures';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment === 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    const query = `
+        UPDATE
+            balance_items
+        SET status = ?
+        WHERE status IN (?)`;
+    await Database.update(query, [
+        BalanceItemStatus.Due,
+        ['Paid', 'Pending'],
+    ]);
+
+    const q2 = `
+        UPDATE
+            balance_items
+        SET status = ?,
+            amount = coalesce(nullif(ROUND(coalesce(pricePaid / nullif(unitPrice, 0), 0)), 0), 1)
+        WHERE amount = 0 AND status = ?`;
+    await Database.update(q2, [
+        BalanceItemStatus.Canceled,
+        BalanceItemStatus.Due,
+    ]);
+});

package/src/migrations/1769087808-corrected-invoice-user-agent.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `invoices`
+CHANGE `userAgent` `userAgent` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL;

package/src/migrations/1769087809-payments-invoice-id.sql

@@ -1,3 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `payments`
 ADD COLUMN `invoiceId` varchar(36) NULL AFTER `customer`,
 ADD FOREIGN KEY (`invoiceId`) REFERENCES `invoices` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;

package/src/migrations/1772033555-balance-item-package-id.sql

@@ -1,3 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `balance_items`
 ADD COLUMN `packageId` varchar(36) NULL AFTER `memberId`,
 ADD FOREIGN KEY (`packageId`) REFERENCES `stamhoofd_packages` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;

package/src/migrations/1778796615-payments-reversing-payment-id.sql

@@ -1,3 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `payments`
 ADD COLUMN `reversingPaymentId` varchar(36) NULL AFTER `invoiceId`,
 ADD FOREIGN KEY (`reversingPaymentId`) REFERENCES `payments` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;

package/src/migrations/1779443446-transfer-fees.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `payments`
+ADD COLUMN `transferFeeManual` int NOT NULL DEFAULT '0' AFTER `transferFee`,
+ADD COLUMN `transferFeeManualCharged` int NOT NULL DEFAULT '0' AFTER `transferFeeManual`;

package/src/migrations/1779709174-used-register-code-balance-item-id.sql

@@ -0,0 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `used_register_codes`
+ADD COLUMN `balanceItemId` varchar(36) NULL AFTER `code`,
+ADD FOREIGN KEY (`balanceItemId`) REFERENCES `balance_items` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;

package/src/migrations/1779968328-payments-admin-user-id.sql

@@ -0,0 +1,5 @@
+SET FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `payments`
+ADD COLUMN `adminUserId` varchar(36) NULL AFTER `organizationId`,
+ADD FOREIGN KEY (`adminUserId`) REFERENCES `users` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;
+SET FOREIGN_KEY_CHECKS=1;

package/src/migrations/1779970611-payments-refunded-amount.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `payments`
+ADD COLUMN `refundedAmount` bigint NOT NULL DEFAULT '0' AFTER `price`;

package/src/migrations/1779972640-balance-items-failed-at.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `balance_items`
+ADD COLUMN `failedAt` datetime NULL AFTER `paidAt`;

package/src/migrations/1780328285-document-template-locked.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `document_templates`
+ADD COLUMN `isLocked` tinyint(1) NOT NULL DEFAULT '0' AFTER `publishedAt`;

package/src/migrations/1780328286-document-locked.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `documents`
+ADD COLUMN `isLocked` tinyint(1) NOT NULL DEFAULT '0' AFTER `number`;

package/src/migrations/1780412083-documents-set-locked.ts

@@ -0,0 +1,18 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+
+export default new Migration(async () => {
+    process.stdout.write('\n');
+
+    if (STAMHOOFD.userMode === 'platform') {
+        console.log('Skipped set documents locked for userMode platform.');
+        return Promise.resolve();
+    }
+
+    console.log('Start locking document templates.');
+    await Database.statement(`update document_templates set isLocked = 1 where status = 'Published';`);
+
+    console.log('Start locking documents.');
+    await Database.statement(`update documents set isLocked = 1 where status = 'Published';`);
+
+    return Promise.resolve();
+});

package/src/migrations/1780928401-v1-groups-migration-data.ts

@@ -0,0 +1,50 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+export default new Migration(async () => {
+    if (STAMHOOFD.environment === 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    if (STAMHOOFD.userMode === 'platform') {
+        console.log('skipped for userMode platform');
+        return;
+    }
+
+    console.log('start create v1_groups_migration_data table');
+
+    // create table to keep track of which combination of group id and cycle has been migrated to a new group after the migration from Stamhoofd v1 to v2
+    const groupsQuery = `CREATE TABLE \`v1_groups_migration_data\` (
+        \`newGroupId\` varchar(36) NOT NULL,
+        \`oldGroupId\` varchar(36) NOT NULL,
+        \`oldCycle\` int NOT NULL DEFAULT '0',
+    PRIMARY KEY (\`newGroupId\`),
+    UNIQUE KEY \`oldKey\` (\`oldGroupId\`,\`oldCycle\`) USING BTREE,
+    CONSTRAINT \`v1_groups_migration_data_ibfk_1\` FOREIGN KEY (\`newGroupId\`) REFERENCES \`groups\` (\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;`;
+
+    await Database.statement(groupsQuery);
+    console.log('finished create v1_groups_migration_data table');
+
+    console.log('start create v1_waiting_list_migration_data table');
+    // create table to keep track of which combination of waiting list group id and cycle has been migrated to a new group after the migration from Stamhoofd v1 to v2
+    const waitingListsQuery = `CREATE TABLE \`v1_waiting_list_migration_data\` (
+        \`newGroupId\` varchar(36) NOT NULL,
+        \`oldGroupId\` varchar(36) NOT NULL,
+        \`oldCycle\` int NOT NULL DEFAULT '0',
+    PRIMARY KEY (\`newGroupId\`),
+    UNIQUE KEY \`oldKey\` (\`oldGroupId\`,\`oldCycle\`) USING BTREE,
+    CONSTRAINT \`v1_waiting_list_migration_data_ibfk_1\` FOREIGN KEY (\`newGroupId\`) REFERENCES \`groups\` (\`id\`) ON DELETE CASCADE ON UPDATE CASCADE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;`;
+    await Database.statement(waitingListsQuery);
+
+    console.log('finished create v1_waiting_list_migration_data table');
+});
+
+// CREATE TABLE `v1_groups_migration_data` (
+//     `newGroupId` varchar(36) NOT NULL,
+//     `oldGroupId` varchar(36) NOT NULL,
+//     `oldCycle` int NOT NULL DEFAULT '0',
+//   PRIMARY KEY (`newGroupId`),
+//   UNIQUE KEY `oldKey` (`oldGroupId`,`oldCycle`) USING BTREE,
+//   CONSTRAINT `groups_ibfk_1` FOREIGN KEY (`newGroupId`) REFERENCES `groups` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+// ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/models/BalanceItem.ts

@@ -5,7 +5,8 @@ import { Formatter, STMath } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { EnumDecoder, MapDecoder } from '@simonbackx/simple-encoding';
-import { QueryableModel } from '@stamhoofd/sql';
+import { SimpleError } from '@simonbackx/simple-errors';
+import { QueryableModel, SQL } from '@stamhoofd/sql';
 import { Payment } from './Payment.js';
 
 /**
@@ -212,6 +213,12 @@ export class BalanceItem extends QueryableModel {
     @column({ type: 'datetime', nullable: true })
     paidAt: Date | null = null;
 
+    /**
+     * Marking a balance item as 'failed' can have side effects. To prevent executing these side effects multiple times, we store it in here.
+     */
+    @column({ type: 'datetime', nullable: true })
+    failedAt: Date | null = null;
+
     @column({
         type: 'datetime', beforeSave(old?: any) {
             if (old !== undefined) {
@@ -550,7 +557,7 @@ export class BalanceItem extends QueryableModel {
         await Database.update(query, params);
     }
 
-        /**
+    /**
      * Update the outstanding balance of multiple members in one go (or all members)
      */
     static async updateInvoiced(balanceItemIds: string[] | 'all') {
@@ -662,55 +669,38 @@ export class BalanceItem extends QueryableModel {
     }
 
     static async balanceItemsForUsersAndMembers(organizationId: string | null, userIds: string[], memberIds: string[]): Promise<BalanceItem[]> {
-        if (memberIds.length == 0 && userIds.length == 0) {
+        if (memberIds.length === 0 && userIds.length === 0) {
             return [];
         }
 
-        const params: any[] = [];
-        const where: string[] = [];
-
-        if (memberIds.length) {
-            if (memberIds.length == 1) {
-                where.push(`memberId = ?`);
-                params.push(memberIds[0]);
-            }
-            else {
-                where.push(`memberId IN (?)`);
-                params.push(memberIds);
-            }
-        }
-
-        // Note here, we don't search for memberId IS NULL restriction in MySQL because it slows down the query too much (500ms)
-        // Better if we do it in code here
-        if (userIds.length) {
-            if (userIds.length == 1) {
-                where.push('userId = ?');
-                params.push(userIds[0]);
-            }
-            else {
-                where.push('userId IN (?)');
-                params.push(userIds);
-            }
-        }
-
-        const requiredWhere: string[] = [];
+        const base = BalanceItem.select()
+            .whereNot('status', BalanceItemStatus.Hidden);
 
         if (organizationId) {
-            requiredWhere.push('organizationId = ?');
-            params.push(organizationId);
+            base.andWhere('organizationId', organizationId);
         }
 
-        const query = `SELECT ${BalanceItem.getDefaultSelect()} FROM ${BalanceItem.table} WHERE (${where.join(' OR ')}) ${requiredWhere.length ? (' AND ' + requiredWhere.join(' AND ')) : ''} AND ${BalanceItem.table}.status != ?`;
-        params.push(BalanceItemStatus.Hidden);
+        if (memberIds.length && userIds.length) {
+            // Don't include other members than the provided members
+            base.andWhere(
+                SQL.where('memberId', memberIds)
+                // Include null member
+                    .or(
+                    // Don't include balances of other members, even when userId matches
+                    // this allows removing access for a member
+                        SQL.where('userId', userIds)
+                            .and('memberId', null),
+                    ),
+            );
+        } else if (memberIds.length) {
+            base.andWhere('memberId', memberIds);
+        } else if (userIds.length) {
+            base.andWhere('userId', userIds);
+        }
 
-        const [rows] = await Database.select(query, params);
-        const balanceItems = BalanceItem.fromRows(rows, BalanceItem.table);
+        base.andWhere('priceOpen', '!=', 0);
 
-        // Filter out items of other members
-        if (memberIds.length) {
-            return balanceItems.filter(b => !b.memberId || memberIds.includes(b.memberId));
-        }
-        return balanceItems;
+        return await base.fetch();
     }
 
     static async balanceItemsForOrganization(payingOrganizationId: string, organizationId?: string): Promise<BalanceItem[]> {
@@ -719,9 +709,20 @@ export class BalanceItem extends QueryableModel {
             .whereNot('status', BalanceItemStatus.Hidden);
 
         if (organizationId) {
-            base.where('organizationId', organizationId)
+            base.where('organizationId', organizationId);
         }
 
         return await base.fetch();
     }
+
+    override save(...args: Parameters<QueryableModel['save']>): Promise<boolean> {
+        if (this.unitPrice % 100 !== 0) {
+            throw new SimpleError({
+                statusCode: 500,
+                code: 'unrounded_balance_item',
+                message: 'Balance item unitPrices should be rounded up to 1 cent',
+            });
+        }
+        return super.save(...args);
+    }
 }

package/src/models/CachedBalance.test.ts

@@ -1,5 +1,5 @@
-import { BalanceItemStatus } from '../../../../../shared/structures/dist/BalanceItem.js';
-import { ReceivableBalanceType } from '../../../../../shared/structures/dist/ReceivableBalance.js';
+import { BalanceItemStatus } from '@stamhoofd/structures/BalanceItem.js';
+import { ReceivableBalanceType } from '@stamhoofd/structures/ReceivableBalance.js';
 import { MemberFactory } from '../factories/MemberFactory.js';
 import { OrganizationFactory } from '../factories/OrganizationFactory.js';
 import { UserFactory } from '../factories/UserFactory.js';
@@ -21,19 +21,19 @@ describe('CachedBalance', () => {
 
     test('Balances for members are summed', async () => {
         const organization = await new OrganizationFactory({}).create();
-        const member = await new MemberFactory({organization}).create();
+        const member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
-        balanceA.dueAt = null
+        balanceA.dueAt = null;
         balanceA.quantity = 2;
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Due
+        balanceA.status = BalanceItemStatus.Due;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -44,7 +44,7 @@ describe('CachedBalance', () => {
 
     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 member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 6); // 6 days later
@@ -52,11 +52,11 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Due
+        balanceA.status = BalanceItemStatus.Due;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -67,7 +67,7 @@ describe('CachedBalance', () => {
 
     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 member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
@@ -75,11 +75,11 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Due
+        balanceA.status = BalanceItemStatus.Due;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -90,7 +90,7 @@ describe('CachedBalance', () => {
 
     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 member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
@@ -98,12 +98,12 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Due
+        balanceA.status = BalanceItemStatus.Due;
         balanceA.pricePaid = 2_00;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -112,9 +112,9 @@ describe('CachedBalance', () => {
         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 () => {
+    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 member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = new Date(now.getTime() + 1000 * 60 * 60 * 24 * 8); // 8 days later
@@ -122,12 +122,12 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Due
+        balanceA.status = BalanceItemStatus.Due;
         balanceA.pricePaid = 1_00;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -138,7 +138,7 @@ describe('CachedBalance', () => {
 
     test('Canceled items are not summed', async () => {
         const organization = await new OrganizationFactory({}).create();
-        const member = await new MemberFactory({organization}).create();
+        const member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = null;
@@ -146,11 +146,11 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Canceled
+        balanceA.status = BalanceItemStatus.Canceled;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -160,7 +160,7 @@ describe('CachedBalance', () => {
 
     test('Hidden items are not summed', async () => {
         const organization = await new OrganizationFactory({}).create();
-        const member = await new MemberFactory({organization}).create();
+        const member = await new MemberFactory({ organization }).create();
 
         const balanceA = new BalanceItem();
         balanceA.dueAt = null;
@@ -168,11 +168,11 @@ describe('CachedBalance', () => {
         balanceA.unitPrice = 1_00;
         balanceA.memberId = member.id;
         balanceA.organizationId = organization.id;
-        balanceA.status = BalanceItemStatus.Hidden
+        balanceA.status = BalanceItemStatus.Hidden;
         await balanceA.save();
 
         // Update cached balance for user.
-        await CachedBalance.updateForMembers(organization.id, [member.id])
+        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);
@@ -183,8 +183,8 @@ describe('CachedBalance', () => {
     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();
+            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]);
@@ -195,7 +195,7 @@ describe('CachedBalance', () => {
             balanceA.unitPrice = 1_00;
             balanceA.memberId = member.id;
             balanceA.organizationId = organization.id;
-            balanceA.status = BalanceItemStatus.Due
+            balanceA.status = BalanceItemStatus.Due;
             await balanceA.save();
 
             const balanceB = new BalanceItem();
@@ -204,12 +204,12 @@ describe('CachedBalance', () => {
             balanceB.unitPrice = 1_00;
             balanceB.userId = user.id;
             balanceB.organizationId = organization.id;
-            balanceB.status = BalanceItemStatus.Due
+            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])
+            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);
@@ -231,8 +231,8 @@ describe('CachedBalance', () => {
 
         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();
+            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]);
@@ -243,7 +243,7 @@ describe('CachedBalance', () => {
             balanceA.unitPrice = 1_00;
             balanceA.memberId = member.id;
             balanceA.organizationId = organization.id;
-            balanceA.status = BalanceItemStatus.Due
+            balanceA.status = BalanceItemStatus.Due;
             await balanceA.save();
 
             const balanceB = new BalanceItem();
@@ -252,12 +252,12 @@ describe('CachedBalance', () => {
             balanceB.unitPrice = 1_00;
             balanceB.userId = user.id;
             balanceB.organizationId = organization.id;
-            balanceB.status = BalanceItemStatus.Due
+            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])
+            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);
@@ -278,9 +278,9 @@ describe('CachedBalance', () => {
 
             // 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])
+            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);
@@ -291,8 +291,8 @@ describe('CachedBalance', () => {
 
         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();
+            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]);
@@ -304,7 +304,7 @@ describe('CachedBalance', () => {
             balanceA.memberId = member.id;
             balanceA.organizationId = organization.id;
             balanceA.pricePaid = 50;
-            balanceA.status = BalanceItemStatus.Due
+            balanceA.status = BalanceItemStatus.Due;
             await balanceA.save();
 
             const balanceB = new BalanceItem();
@@ -314,12 +314,12 @@ describe('CachedBalance', () => {
             balanceB.userId = user.id;
             balanceB.organizationId = organization.id;
             balanceB.pricePaid = 50;
-            balanceB.status = BalanceItemStatus.Due
+            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])
+            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);

package/src/models/CachedBalance.ts

@@ -1,11 +1,11 @@
 import { column } from '@simonbackx/simple-database';
-import type { SQLWhere} 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 { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 import { BalanceItem } from './BalanceItem.js';
 import { MemberUser } from './MemberUser.js';
-import { Formatter } from '@stamhoofd/utility';
 
 /**
  * Keeps track of how much a member/user owes or needs to be reimbursed.
@@ -328,8 +328,7 @@ export class CachedBalance extends QueryableModel {
 
                 result[1].amountPending += amountPending;
                 result[1].amountPaid += amountPaid;
-            }
-            else {
+            } else {
                 results.push([objectId, { amountPaid, amountOpen: 0, amountPending, nextDueAt: amountOpen !== 0 ? dueAt : null }]);
             }
         }
@@ -407,10 +406,12 @@ export class CachedBalance extends QueryableModel {
 
     static async updateForOrganizations(organizationId: string, organizationIds: string[]) {
         if (organizationIds.length === 0) {
-            return;
+            return [];
         }
         const results = await this.fetchForObjects(organizationId, organizationIds, 'payingOrganizationId');
         await this.setForResults(organizationId, results, ReceivableBalanceType.organization);
+
+        return results;
     }
 
     static async updateForMembers(organizationId: string, memberIds: string[]) {
@@ -462,8 +463,7 @@ export class CachedBalance extends QueryableModel {
                     if (memberCachedBalance.nextDueAt && (!result[1].nextDueAt || memberCachedBalance.nextDueAt < result[1].nextDueAt)) {
                         result[1].nextDueAt = memberCachedBalance.nextDueAt;
                     }
-                }
-                else {
+                } else {
                     // Not possible
                     throw new Error('User not found in results');
                 }