@stamhoofd/backend 2.63.0 → 2.65.0

package/src/helpers/MemberUserSyncer.ts

@@ -1,9 +1,10 @@
-import { Member, MemberResponsibilityRecord, MemberWithRegistrations, User } from '@stamhoofd/models';
+import { CachedBalance, Member, MemberResponsibilityRecord, MemberWithRegistrations, User } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
 import { AuditLogSource, MemberDetails, Permissions, UserPermissions } from '@stamhoofd/structures';
 import crypto from 'crypto';
 import basex from 'base-x';
 import { AuditLogService } from '../services/AuditLogService';
+import { Formatter } from '@stamhoofd/utility';
 
 const ALPHABET = '123456789ABCDEFGHJKMNPQRSTUVWXYZ'; // Note: we removed 0, O, I and l to make it easier for humans
 const customBase = basex(ALPHABET);
@@ -185,6 +186,9 @@ export class MemberUserSyncerStatic {
         console.log('Removing access for ' + user.id + ' to member ' + member.id);
         await Member.users.reverse('members').unlink(user, member);
 
+        // Update balance of this user, as it could have changed
+        await this.updateUserBalance(user.id, member.id);
+
         if (user.memberId === member.id) {
             user.memberId = null;
         }
@@ -305,6 +309,23 @@ export class MemberUserSyncerStatic {
         if (!member.users.find(u => u.id === user.id)) {
             await Member.users.reverse('members').link(user, [member]);
             member.users.push(user);
+
+            // Update balance of this user, as it could have changed
+            await this.updateUserBalance(user.id, member.id);
+        }
+    }
+
+    /**
+     * Update the balance after making a change in linked member/users
+     */
+    async updateUserBalance(userId: string, memberId: string) {
+        // Update balance of this user, as it could have changed
+        const memberBalances = await CachedBalance.getForObjects([memberId]);
+        if (memberBalances.length > 0) {
+            const organizationIds = Formatter.uniqueArray(memberBalances.map(b => b.organizationId));
+            for (const organizationId of organizationIds) {
+                await CachedBalance.updateForUsers(organizationId, [userId]);
+            }
         }
     }
 }

package/src/helpers/MembershipCharger.ts

@@ -3,6 +3,7 @@ import { BalanceItem, Member, MemberPlatformMembership, Platform } from '@stamho
 import { SQL, SQLOrderBy, SQLWhereSign } from '@stamhoofd/sql';
 import { BalanceItemRelation, BalanceItemRelationType, BalanceItemType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
+import { BalanceItemService } from '../services/BalanceItemService';
 
 export const MembershipCharger = {
     async charge() {
@@ -35,6 +36,7 @@ export const MembershipCharger = {
                 .where('balanceItemId', null)
                 .where('deletedAt', null)
                 .whereNot('organizationId', chargeVia)
+                .where(SQL.where('trialUntil', null).or('trialUntil', SQLWhereSign.LessEqual, new Date()))
                 .limit(chunkSize)
                 .orderBy(
                     new SQLOrderBy({
@@ -122,6 +124,9 @@ export const MembershipCharger = {
 
             await BalanceItem.updateOutstanding(createdBalanceItems);
 
+            // Reallocate
+            await BalanceItemService.reallocate(createdBalanceItems, chargeVia);
+
             if (memberships.length < chunkSize) {
                 break;
             }

package/src/helpers/OrganizationCharger.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, Platform } from '@stamhoofd/models';
 import { BalanceItemType, Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { BalanceItemService } from '../services/BalanceItemService';
 
 export class OrganizationCharger {
     static async chargeFromPlatform(args: { organizationsToCharge: OrganizationStruct[]; price: number; amount?: number; description: string }) {
@@ -30,6 +31,9 @@ export class OrganizationCharger {
 
         await Promise.all(balanceItems.map(balanceItem => balanceItem.save()));
         await BalanceItem.updateOutstanding(balanceItems);
+
+        // Reallocate
+        await BalanceItemService.reallocate(balanceItems, chargingOrganizationId);
     }
 
     private static createBalanceItem({ price, amount, description, chargingOrganizationId, organizationBeingCharged }: { price: number; amount?: number; description: string; chargingOrganizationId: string; organizationBeingCharged: OrganizationStruct }): BalanceItem {

package/src/helpers/TagHelper.ts

@@ -1,7 +1,6 @@
 import { Organization, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { AuditLogSource, OrganizationTag, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
-import { ModelHelper } from './ModelHelper';
 import { AuditLogService } from '../services/AuditLogService';
 
 export class TagHelper extends SharedTagHelper {
@@ -14,17 +13,15 @@ export class TagHelper extends SharedTagHelper {
                 let platform = await Platform.getShared();
 
                 const tagCounts = new Map<string, number>();
-                await this.loopOrganizations(async (organizations) => {
-                    for (const organization of organizations) {
-                        organization.meta.tags = this.getAllTagsFromHierarchy(organization.meta.tags, platform.config.tags);
 
-                        for (const tag of organization.meta.tags) {
-                            tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
-                        }
-                    }
+                for await (const organization of Organization.select().all()) {
+                    organization.meta.tags = this.getAllTagsFromHierarchy(organization.meta.tags, platform.config.tags);
 
-                    await Promise.all(organizations.map(organization => organization.save()));
-                });
+                    for (const tag of organization.meta.tags) {
+                        tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
+                    }
+                    await organization.save();
+                }
 
                 // Reload platform to avoid race conditions
                 platform = await Platform.getShared();
@@ -39,10 +36,6 @@ export class TagHelper extends SharedTagHelper {
         });
     }
 
-    private static async loopOrganizations(onBatchReceived: (batch: Organization[]) => Promise<void>) {
-        await ModelHelper.loop(Organization, 'id', onBatchReceived, { limit: 10 });
-    }
-
     /**
      * Removes child tag ids that do not exist and sorts the tags.
      * @param platformTags

package/src/seeds/1728928974-update-cached-outstanding-balance-from-items.ts

@@ -2,6 +2,9 @@ import { Migration } from '@simonbackx/simple-database';
 import { logger } from '@simonbackx/simple-logging';
 import { BalanceItem } from '@stamhoofd/models';
 
+/**
+ * This migration is required to keep '1733994455-balance-item-status-open' working
+ */
 export default new Migration(async () => {
     if (STAMHOOFD.environment == 'test') {
         console.log('skipped in tests');
@@ -10,26 +13,13 @@ export default new Migration(async () => {
 
     process.stdout.write('\n');
     let c = 0;
-    let id: string = '';
 
     await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
-        while (true) {
-            const items = await BalanceItem.where({
-                id: {
-                    value: id,
-                    sign: '>',
-                },
-            }, { limit: 1000, sort: ['id'] });
-
+        for await (const items of BalanceItem.select().limit(1000).allBatched()) {
             await BalanceItem.updateOutstanding(items);
 
             c += items.length;
             process.stdout.write('.');
-
-            if (items.length < 1000) {
-                break;
-            }
-            id = items[items.length - 1].id;
         }
     });
 

package/src/seeds/1729253172-update-orders.ts

@@ -1,7 +1,5 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Order } from '@stamhoofd/models';
-import { sleep } from '@stamhoofd/utility';
-import { ModelHelper } from '../helpers/ModelHelper';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment === 'test') {
@@ -11,22 +9,13 @@ export default new Migration(async () => {
 
     console.log('Start saving orders.');
 
-    const limit = 100;
-    let count = limit;
+    const batchSize = 100;
+    let count = 0;
 
-    await ModelHelper.loop(Order, 'id', async (batch: Order[]) => {
-        console.log('Saving orders...', `(${count})`);
-
-        // save all orders to update the new columns
-        for (const order of batch) {
-            await order.save();
-        }
-
-        count += limit;
-    },
-    { limit });
-
-    await sleep(1000);
+    for await (const order of Order.select().limit(batchSize).all()) {
+        await order.save();
+        count += 1;
+    }
 
-    console.log('Finished saving orders.');
+    console.log('Finished saving ' + count + ' orders.');
 });

package/src/seeds/{1733996431-update-cached-outstanding-balance-from-items.ts → 1734596144-fill-previous-period-id.ts}

@@ -1,6 +1,6 @@
 import { Migration } from '@simonbackx/simple-database';
 import { logger } from '@simonbackx/simple-logging';
-import { BalanceItem } from '@stamhoofd/models';
+import { Platform, RegistrationPeriod } from '@stamhoofd/models';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment == 'test') {
@@ -12,20 +12,28 @@ export default new Migration(async () => {
     let c = 0;
     let id: string = '';
 
-    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+    await logger.setContext({ tags: ['seed'] }, async () => {
         while (true) {
-            const items = await BalanceItem.where({
+            const items = await RegistrationPeriod.where({
                 id: {
                     value: id,
                     sign: '>',
                 },
             }, { limit: 1000, sort: ['id'] });
 
-            await BalanceItem.updateOutstanding(items);
+            if (items.length === 0) {
+                break;
+            }
 
-            c += items.length;
             process.stdout.write('.');
 
+            for (const item of items) {
+                await item.setPreviousPeriodId();
+                if (await item.save()) {
+                    c += 1;
+                }
+            }
+
             if (items.length < 1000) {
                 break;
             }
@@ -33,7 +41,14 @@ export default new Migration(async () => {
         }
     });
 
-    console.log('Updated outstanding balance for ' + c + ' items');
+    console.log('Updated ' + c + ' registration periods');
+
+    // Now update platform
+    const platform = await Platform.getShared();
+    await platform.setPreviousPeriodId();
+    await platform.save();
+
+    console.log('Updated platform');
 
     // Do something here
     return Promise.resolve();

package/src/seeds/{1726494420-update-cached-outstanding-balance-from-items.ts → 1735577912-update-cached-outstanding-balance-from-items.ts}

@@ -10,26 +10,13 @@ export default new Migration(async () => {
 
     process.stdout.write('\n');
     let c = 0;
-    let id: string = '';
 
     await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
-        while (true) {
-            const items = await BalanceItem.where({
-                id: {
-                    value: id,
-                    sign: '>',
-                },
-            }, { limit: 1000, sort: ['id'] });
-
+        for await (const items of BalanceItem.select().limit(1000).allBatched()) {
             await BalanceItem.updateOutstanding(items);
 
             c += items.length;
             process.stdout.write('.');
-
-            if (items.length < 1000) {
-                break;
-            }
-            id = items[items.length - 1].id;
         }
     });
 

package/src/services/BalanceItemService.ts

@@ -1,7 +1,9 @@
 import { BalanceItem, Order, Organization, Payment, Webshop } from '@stamhoofd/models';
-import { AuditLogSource, BalanceItemStatus, OrderStatus } from '@stamhoofd/structures';
-import { RegistrationService } from './RegistrationService';
+import { AuditLogSource, BalanceItemStatus, OrderStatus, ReceivableBalanceType } from '@stamhoofd/structures';
 import { AuditLogService } from './AuditLogService';
+import { RegistrationService } from './RegistrationService';
+import { PaymentReallocationService } from './PaymentReallocationService';
+import { Formatter } from '@stamhoofd/utility';
 
 export const BalanceItemService = {
     async markPaid(balanceItem: BalanceItem, payment: Payment | null, organization: Organization) {
@@ -45,6 +47,24 @@ export const BalanceItemService = {
         }
     },
 
+    async reallocate(balanceItems: BalanceItem[], organizationId: string) {
+        const memberIds = Formatter.uniqueArray(balanceItems.map(b => b.memberId).filter(b => b !== null));
+        const payingOrganizationIds = Formatter.uniqueArray(balanceItems.map(b => b.payingOrganizationId).filter(b => b !== null));
+        const userIds = Formatter.uniqueArray(balanceItems.map(b => b.userId).filter(b => b !== null));
+
+        for (const memberId of memberIds) {
+            await PaymentReallocationService.reallocate(organizationId, memberId, ReceivableBalanceType.member);
+        }
+
+        for (const payingOrganizationId of payingOrganizationIds) {
+            await PaymentReallocationService.reallocate(organizationId, payingOrganizationId, ReceivableBalanceType.organization);
+        }
+
+        for (const userId of userIds) {
+            await PaymentReallocationService.reallocate(organizationId, userId, ReceivableBalanceType.user);
+        }
+    },
+
     async markUpdated(balanceItem: BalanceItem, payment: Payment, organization: Organization) {
         // For orders: mark order as changed (so they are refetched in front ends)
         if (balanceItem.orderId) {
@@ -93,5 +113,4 @@ export const BalanceItemService = {
             }
         }
     },
-
 };