@stamhoofd/backend 2.69.0 → 2.70.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.69.0",
+    "version": "2.70.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.69.0",
-        "@stamhoofd/backend-middleware": "2.69.0",
-        "@stamhoofd/email": "2.69.0",
-        "@stamhoofd/models": "2.69.0",
-        "@stamhoofd/queues": "2.69.0",
-        "@stamhoofd/sql": "2.69.0",
-        "@stamhoofd/structures": "2.69.0",
-        "@stamhoofd/utility": "2.69.0",
+        "@stamhoofd/backend-i18n": "2.70.0",
+        "@stamhoofd/backend-middleware": "2.70.0",
+        "@stamhoofd/email": "2.70.0",
+        "@stamhoofd/models": "2.70.0",
+        "@stamhoofd/queues": "2.70.0",
+        "@stamhoofd/sql": "2.70.0",
+        "@stamhoofd/structures": "2.70.0",
+        "@stamhoofd/utility": "2.70.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1cc1c8c1109298b0c712b1e7ddf7ef37054be5a9"
+    "gitHead": "5c6f4bbab24bf118b45da350bdaf3c62756909ad"
 }

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

@@ -13,9 +13,9 @@ import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructure
 import { Context } from '../../../helpers/Context';
 import { MembershipCharger } from '../../../helpers/MembershipCharger';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
+import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
 import { RegistrationService } from '../../../services/RegistrationService';
-import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -446,7 +446,11 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     throw Context.auth.error('Je hebt niet voldoende rechten om deze aansluiting toe te voegen');
                 }
 
-                if (!platform.config.membershipTypes.find(t => t.id === put.membershipTypeId)) {
+                const putForOrganization = await Context.auth.getOrganization(put.organizationId);
+
+                const membershipType = platform.config.membershipTypes.find(t => t.id === put.membershipTypeId);
+
+                if (!membershipType) {
                     throw new SimpleError({
                         code: 'invalid_field',
                         field: 'membershipTypeId',
@@ -455,6 +459,28 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     });
                 }
 
+                const organizationTags = putForOrganization.meta.tags ?? [];
+                const memberDefaultAgeGroupIds: string[] = [];
+
+                for (const r of member.registrations) {
+                    if (r.periodId !== put.periodId || r.deactivatedAt !== null || r.registeredAt === null || r.group.defaultAgeGroupId === null) {
+                        continue;
+                    }
+
+                    memberDefaultAgeGroupIds.push(r.group.defaultAgeGroupId);
+                }
+
+                const isEnabled = membershipType.isEnabled(organizationTags, memberDefaultAgeGroupIds);
+
+                if (!isEnabled) {
+                    throw new SimpleError({
+                        code: 'invalid_field',
+                        field: 'membershipTypeId',
+                        message: 'Invalid membership type',
+                        human: 'Dit aansluitingstype is niet toegestaan voor dit lid',
+                    });
+                }
+
                 // Check duplicate memberships
                 const existing = await MemberPlatformMembership.select()
                     .where('memberId', member.id)