@stamhoofd/backend 2.73.3 → 2.74.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.73.3",
+    "version": "2.74.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.19.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.73.3",
-        "@stamhoofd/backend-middleware": "2.73.3",
-        "@stamhoofd/email": "2.73.3",
-        "@stamhoofd/models": "2.73.3",
-        "@stamhoofd/queues": "2.73.3",
-        "@stamhoofd/sql": "2.73.3",
-        "@stamhoofd/structures": "2.73.3",
-        "@stamhoofd/utility": "2.73.3",
+        "@stamhoofd/backend-i18n": "2.74.0",
+        "@stamhoofd/backend-middleware": "2.74.0",
+        "@stamhoofd/email": "2.74.0",
+        "@stamhoofd/models": "2.74.0",
+        "@stamhoofd/queues": "2.74.0",
+        "@stamhoofd/sql": "2.74.0",
+        "@stamhoofd/structures": "2.74.0",
+        "@stamhoofd/utility": "2.74.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "00bbe8abcaac99c614bb352efa0fca54241f77d7"
+    "gitHead": "3a77692b8163f10c231785de2f720c423a909762"
 }

package/src/audit-logs/MemberPlatformMembershipLogger.ts

@@ -10,7 +10,7 @@ const defaultGenerator = getDefaultGenerator({
 });
 
 export const MemberPlatformMembershipLogger = new ModelLogger(MemberPlatformMembership, {
-    skipKeys: ['balanceItemId'],
+    skipKeys: ['balanceItemId', 'priceWithoutDiscount', 'maximumFreeAmount', 'generated'],
     async optionsGenerator(event) {
         const result = await defaultGenerator(event);
 

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -428,7 +428,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid period',
-                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in dit werkjaar`),
+                            human: Context.i18n.$t(`62103514-05f5-4dc0-a5cc-c9321f21c63d`),
                             field: 'periodId',
                         });
                     }
@@ -437,7 +437,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid period',
-                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            human: Context.i18n.$t(`745f5355-3398-406d-842e-5c9f7a700e91`, { period: period?.getBaseStructure().name }),
                             field: 'periodId',
                         });
                     }
@@ -563,7 +563,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid period',
-                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in dit werkjaar`),
+                            human: Context.i18n.$t(`1f1d657d-bc73-4cae-9025-b3ec67a705e7`),
                             field: 'periodId',
                         });
                     }
@@ -572,7 +572,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid period',
-                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            human: Context.i18n.$t(`2e615670-813a-414f-b06c-f76136891bf8`, { period: period?.getBaseStructure().name }),
                             field: 'periodId',
                         });
                     }

package/src/seeds-temporary/README.md

@@ -0,0 +1 @@
+This folder contains seeds that should only run once on specific servers. To fix a bug, or migrate data specific for a server.

package/src/services/PlatformMembershipService.ts

@@ -15,14 +15,19 @@ export class PlatformMembershipService {
         }
 
         // Listen for group changes
-        Model.modelEventBus.addListener(this, (event) => {
-            if (!(event.model instanceof Group)) {
+        Model.modelEventBus.addListener(this, async (event) => {
+            if (event.model instanceof Group) {
+                // Check if group has been deleted
+                if (event.type === 'deleted' || (event.type === 'updated' && (event.changedFields['deletedAt'] !== undefined || event.changedFields['defaultAgeGroupId'] !== undefined))) {
+                    PlatformMembershipService.updateMembershipsForGroupId(event.model.id);
+                }
                 return;
             }
 
-            // Check if group has been deleted
-            if (event.type === 'deleted' || (event.type === 'updated' && (event.changedFields['deletedAt'] !== undefined || event.changedFields['defaultAgeGroupId'] !== undefined))) {
-                PlatformMembershipService.updateMembershipsForGroupId(event.model.id);
+            if (event.model instanceof RegistrationPeriod) {
+                if (event.type === 'updated' && event.changedFields['locked'] !== undefined && event.model.locked === true) {
+                    PlatformMembershipService.setMembershipsLockedForRegistrationPeriodId(event.model.id);
+                }
             }
         });
     }
@@ -80,6 +85,25 @@ export class PlatformMembershipService {
         });
     }
 
+    static setMembershipsLockedForRegistrationPeriodId(periodId: string) {
+        if (STAMHOOFD.userMode === 'organization') {
+            return;
+        }
+
+        QueueHandler.schedule('bulk-lock-memberships', async () => {
+            console.log('Bulk locking memberships for period id ', periodId);
+
+            await MemberPlatformMembership.update()
+                .set('locked', true)
+                .where('periodId', periodId)
+                .update();
+
+            console.log(`Locked memberships for period id ${periodId}`);
+        }).catch((e) => {
+            console.error('Failed to lock memberships for period id ', periodId, e);
+        });
+    }
+
     static updateMembershipsForGroupId(id: string) {
         if (STAMHOOFD.userMode === 'organization') {
             return;
@@ -186,8 +210,7 @@ export class PlatformMembershipService {
                                 if (!silent) {
                                     console.log('Removing membership because no longer registered member and not yet invoiced for: ' + me.id + ' - membership ' + membership.id);
                                 }
-                                membership.deletedAt = new Date();
-                                await membership.save();
+                                await membership.doDelete();
                             }
                         }
 
@@ -234,15 +257,16 @@ export class PlatformMembershipService {
                         }
                         return diff;
                     })[0];
+
                     if (!cheapestMembership) {
                         console.error('No membership found');
                         continue;
                     }
 
                     // Check if already have the same membership
+                    let didFind = false;
                     for (const m of activeMemberships) {
-                        let didFind = false;
-                        if (m.membershipTypeId === cheapestMembership.membership.id) {
+                        if (m.membershipTypeId === cheapestMembership.membership.id && m.organizationId === cheapestMembership.registration.organizationId) {
                             // Update the price of this active membership (could have changed)
                             try {
                                 await m.calculatePrice(me, cheapestMembership.registration);
@@ -257,10 +281,10 @@ export class PlatformMembershipService {
                             didFind = true;
                             break;
                         }
+                    }
 
-                        if (didFind) {
-                            continue;
-                        }
+                    if (didFind) {
+                        continue;
                     }
 
                     const periodConfig = cheapestMembership.membership.periods.get(period.id);
@@ -273,6 +297,7 @@ export class PlatformMembershipService {
                     if (!silent) {
                         console.log('Creating automatic membership for: ' + me.id + ' - membership type ' + cheapestMembership.membership.id);
                     }
+
                     const membership = new MemberPlatformMembership();
                     membership.memberId = me.id;
                     membership.membershipTypeId = cheapestMembership.membership.id;
@@ -303,8 +328,7 @@ export class PlatformMembershipService {
                             if (!silent) {
                                 console.log('Removing membership because cheaper membership found for: ' + me.id + ' - membership ' + toDelete.id);
                             }
-                            toDelete.deletedAt = new Date();
-                            await toDelete.save();
+                            await toDelete.doDelete();
                         }
                     }
                 }