@stamhoofd/backend 2.88.0 → 2.89.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.88.0",
+    "version": "2.89.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -44,14 +44,14 @@
         "@simonbackx/simple-encoding": "2.22.0",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.88.0",
-        "@stamhoofd/backend-middleware": "2.88.0",
-        "@stamhoofd/email": "2.88.0",
-        "@stamhoofd/models": "2.88.0",
-        "@stamhoofd/queues": "2.88.0",
-        "@stamhoofd/sql": "2.88.0",
-        "@stamhoofd/structures": "2.88.0",
-        "@stamhoofd/utility": "2.88.0",
+        "@stamhoofd/backend-i18n": "2.89.0",
+        "@stamhoofd/backend-middleware": "2.89.0",
+        "@stamhoofd/email": "2.89.0",
+        "@stamhoofd/models": "2.89.0",
+        "@stamhoofd/queues": "2.89.0",
+        "@stamhoofd/sql": "2.89.0",
+        "@stamhoofd/structures": "2.89.0",
+        "@stamhoofd/utility": "2.89.0",
         "archiver": "^7.0.1",
         "axios": "^1.8.2",
         "cookie": "^0.7.0",
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "0406b1c0f731ff037988ddf71f3bc9a0046a64f3"
+    "gitHead": "8e3fb2710de0f21f374a30ed92523b7e8bdb64a5"
 }

package/src/endpoints/global/platform/GetPlatformAdminsEndpoint.ts

@@ -1,13 +1,13 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { User } from '@stamhoofd/models';
-import { User as UserStruct } from '@stamhoofd/structures';
+import { OrganizationAdmins } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
+
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = undefined;
-type ResponseBody = UserStruct[];
+type ResponseBody = OrganizationAdmins;
 
 export class GetPlatformAdminsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -35,7 +35,9 @@ export class GetPlatformAdminsEndpoint extends Endpoint<Params, Query, Body, Res
         const admins = await User.getPlatformAdmins();
 
         return new Response(
-            await AuthenticatedStructures.usersWithMembers(admins),
+            OrganizationAdmins.create({
+                users: admins.map(user => user.getStructure()),
+            }),
         );
     }
 }

package/src/endpoints/organization/dashboard/documents/PatchDocumentEndpoint.ts

@@ -1,8 +1,8 @@
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Document, DocumentTemplate, Group, Member, Registration, Token } from '@stamhoofd/models';
-import { Document as DocumentStruct, DocumentStatus, DocumentTemplatePrivate, PermissionLevel } from '@stamhoofd/structures';
+import { Document, DocumentTemplate, Member, Registration } from '@stamhoofd/models';
+import { DocumentStatus, Document as DocumentStruct, PermissionLevel } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 

package/src/endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.ts

@@ -324,7 +324,13 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         for (const s of struct.groups) {
             s.settings.registeredMembers = 0;
             s.settings.reservedMembers = 0;
-            await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(s, organization.id, period);
+            try {
+                await PatchOrganizationRegistrationPeriodsEndpoint.createGroup(s, organization.id, period);
+            }
+            catch (e) {
+                // Can happen when a group is no longer valid anymore when duplicating a period
+                console.error('Error creating group', s.id, e);
+            }
         }
         const groups = await Group.getAll(organization.id, organizationPeriod.periodId);
 

package/src/endpoints/organization/dashboard/users/GetOrganizationAdminsEndpoint.ts

@@ -2,7 +2,6 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { User } from '@stamhoofd/models';
 import { OrganizationAdmins } from '@stamhoofd/structures';
 
-import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
 type Params = Record<string, never>;
 type Query = undefined;
@@ -35,8 +34,10 @@ export class GetOrganizationAdminsEndpoint extends Endpoint<Params, Query, Body,
         // Get all admins
         const admins = await User.getAdmins(organization.id);
 
-        return new Response(OrganizationAdmins.create({
-            users: await AuthenticatedStructures.usersWithMembers(admins),
-        }));
+        return new Response(
+            OrganizationAdmins.create({
+                users: admins.map(user => user.getStructure()),
+            }),
+        );
     }
 }

package/src/endpoints/organization/webshops/{retrieveUitpasSocialTariffPrice.ts → RetrieveUitpasSocialTariffPriceEndpoint.ts}

@@ -1,5 +1,5 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { SimpleError } from '@simonbackx/simple-errors';
+import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
 import { UitpasPriceCheckRequest, UitpasPriceCheckResponse } from '@stamhoofd/structures';
 
 import { UitpasNumberValidator } from '../../../helpers/UitpasNumberValidator';
@@ -9,7 +9,7 @@ type Query = undefined;
 type Body = UitpasPriceCheckRequest;
 type ResponseBody = UitpasPriceCheckResponse;
 
-export class retrieveUitpasSocialTariffPrice extends Endpoint<Params, Query, Body, ResponseBody> {
+export class RetrieveUitpasSocialTariffPricesEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
     bodyDecoder = UitpasPriceCheckRequest as Decoder<UitpasPriceCheckRequest>;
 
     protected doesMatch(request: Request): [true, Params] | [false] {
@@ -28,7 +28,7 @@ export class retrieveUitpasSocialTariffPrice extends Endpoint<Params, Query, Bod
     async handle(request: DecodedRequest<Params, Query, Body>) {
         if (request.body.uitpasEventId) {
             // OFFICIAL FLOW
-            if (!request.body.uitpasNumber) {
+            if (!request.body.uitpasNumbers) {
                 // STATIC CHECK
                 // request shouldn't include a reduced price
             }
@@ -44,7 +44,7 @@ export class retrieveUitpasSocialTariffPrice extends Endpoint<Params, Query, Bod
         }
         else {
             // NON-OFFICIAL FLOW
-            // request should include UiTPAS-number, reduced price AND base price
+            // request should include UiTPAS-numbers, reduced price AND base price
             if (!request.body.reducedPrice) {
                 throw new SimpleError({
                     code: 'missing_reduced_price',
@@ -52,16 +52,25 @@ export class retrieveUitpasSocialTariffPrice extends Endpoint<Params, Query, Bod
                     human: $t('Je moet een verlaagd tarief opgeven voor de UiTPAS.'),
                 });
             }
-            if (!request.body.uitpasNumber) {
+            const reducedPrice = request.body.reducedPrice;
+            if (!request.body.uitpasNumbers) {
                 throw new SimpleError({
-                    code: 'missing_uitpas_number',
-                    message: 'Uitpas number must be provided for non-official flow.',
-                    human: $t('Je moet een UiTPAS-nummer opgeven.'),
+                    code: 'missing_uitpas_numbers',
+                    message: 'Uitpas numbers must be provided for non-official flow.',
+                    human: $t('Je moet UiTPAS-nummers opgeven.'),
                 });
             }
-            await UitpasNumberValidator.checkUitpasNumber(request.body.uitpasNumber);
+            try {
+                await UitpasNumberValidator.checkUitpasNumbers(request.body.uitpasNumbers); // Throws if invalid
+            }
+            catch (e) {
+                if (isSimpleError(e) || isSimpleErrors(e)) {
+                    e.addNamespace('uitpasNumbers');
+                }
+                throw e;
+            }
             const uitpasPriceCheckResponse = UitpasPriceCheckResponse.create({
-                price: request.body.reducedPrice,
+                prices: request.body.uitpasNumbers.map(_ => reducedPrice), // All reduced prices are the same in this non-official flow
             });
             return new Response(uitpasPriceCheckResponse);
         }

package/src/helpers/MemberUserSyncer.ts

@@ -157,7 +157,6 @@ export class MemberUserSyncerStatic {
 
     async updateInheritedPermissions(user: User) {
         // Fetch all members for this user
-        
         const responsibilities = user.memberId ? (await this.getResponsibilitiesForMembers([user.memberId])) : [];
 
         // Check if the member has active registrations

package/src/helpers/PeriodHelper.ts

@@ -144,7 +144,12 @@ export class PeriodHelper {
                 );
 
                 for (const organization of organizations) {
-                    await this.moveOrganizationToPeriod(organization, period);
+                    try {
+                        await this.moveOrganizationToPeriod(organization, period);
+                    }
+                    catch (error) {
+                        console.error('Error moving organization to period', organization.id, error);
+                    }
                     lastId = organization.id;
                 }
 

package/src/helpers/UitpasNumberValidator.ts

@@ -1,4 +1,4 @@
-import { SimpleError } from '@simonbackx/simple-errors';
+import { isSimpleError, isSimpleErrors, SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
 import { UitpasTokenRepository } from './UitpasTokenRepository';
 import { DataValidator } from '@stamhoofd/utility';
 
@@ -152,6 +152,34 @@ export class UitpasNumberValidatorStatic {
         }
         // no errors -> the uitpas number is valid and social tariff is applicable
     }
+
+    /**
+     * Checks multiple uitpas numbers
+     * If any of the uitpas numbers is invalid, it will throw a SimpleErrors instance with all errors.
+     * The field of the error will be the index of the uitpas number in the array.
+     * @param uitpasNumbers The uitpas numbers to check
+     */
+    async checkUitpasNumbers(uitpasNumbers: string[]) {
+        const simpleErrors = new SimpleErrors();
+        for (let i = 0; i < uitpasNumbers.length; i++) {
+            const uitpasNumber = uitpasNumbers[i];
+            try {
+                await this.checkUitpasNumber(uitpasNumber); // Throws if invalid
+            }
+            catch (e) {
+                if (isSimpleError(e) || isSimpleErrors(e)) {
+                    e.addNamespace(i.toString());
+                    simpleErrors.addError(e);
+                }
+                else {
+                    throw e;
+                }
+            }
+        }
+        if (simpleErrors.errors.length > 0) {
+            throw simpleErrors;
+        }
+    }
 }
 
 export const UitpasNumberValidator = new UitpasNumberValidatorStatic();