@stamhoofd/backend 2.90.3 → 2.91.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.90.3",
+    "version": "2.91.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -45,14 +45,14 @@
         "@simonbackx/simple-encoding": "2.22.0",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.90.3",
-        "@stamhoofd/backend-middleware": "2.90.3",
-        "@stamhoofd/email": "2.90.3",
-        "@stamhoofd/models": "2.90.3",
-        "@stamhoofd/queues": "2.90.3",
-        "@stamhoofd/sql": "2.90.3",
-        "@stamhoofd/structures": "2.90.3",
-        "@stamhoofd/utility": "2.90.3",
+        "@stamhoofd/backend-i18n": "2.91.0",
+        "@stamhoofd/backend-middleware": "2.91.0",
+        "@stamhoofd/email": "2.91.0",
+        "@stamhoofd/models": "2.91.0",
+        "@stamhoofd/queues": "2.91.0",
+        "@stamhoofd/sql": "2.91.0",
+        "@stamhoofd/structures": "2.91.0",
+        "@stamhoofd/utility": "2.91.0",
         "archiver": "^7.0.1",
         "axios": "^1.8.2",
         "cookie": "^0.7.0",
@@ -70,5 +70,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "81248f4f4d578fb67e29c48c55ddb1a1beb12313"
+    "gitHead": "37ff6e89f07320c0736d32c9b911c8c1c35dc421"
 }

package/src/audit-logs/ModelLogger.ts

@@ -193,7 +193,6 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
 
                     if (log.patchList.length === 0 && !log.description) {
                         // No changes or all skipped
-                        console.log('No changes after secundary filtering');
                         return false;
                     }
                 }

package/src/crons/endFunctionsOfUsersWithoutRegistration.ts

@@ -1,5 +1,6 @@
 import { registerCron } from '@stamhoofd/crons';
 import { FlagMomentCleanup } from '../helpers/FlagMomentCleanup';
+import { Platform, RegistrationPeriod } from '@stamhoofd/models';
 
 // Only delete responsibilities when the server is running during a month change.
 // Chances are almost zero that we reboot during a month change
@@ -19,6 +20,19 @@ export async function endFunctionsOfUsersWithoutRegistration() {
         return;
     }
 
+    // Check if the current period is active for more than 2 months
+    const platform = await Platform.getShared();
+    const period = await RegistrationPeriod.getByID(platform.periodId);
+    if (!period) {
+        console.warn('No active registration period found, skipping cleanup.');
+        return;
+    }
+
+    if (period.startDate > new Date(Date.now() - 1000 * 60 * 60 * 24 * 55)) {
+        console.warn('Current registration period is less than 2 months old, skipping cleanup.');
+        return;
+    }
+
     await FlagMomentCleanup.endFunctionsOfUsersWithoutRegistration();
     lastCleanupYear = currentYear;
     lastCleanupMonth = currentMonth;

package/src/endpoints/admin/organizations/GetOrganizationsEndpoint.ts

@@ -94,6 +94,8 @@ export class GetOrganizationsEndpoint extends Endpoint<Params, Query, Body, Resp
             query.limit(q.limit);
         }
 
+        console.log('GetOrganizationsEndpoint query', query.getSQL());
+
         return query;
     }
 

package/src/endpoints/global/email/CreateEmailEndpoint.ts

@@ -1,10 +1,9 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Email, EmailTemplate, RateLimiter } from '@stamhoofd/models';
-import { EmailPreview, EmailStatus, Email as EmailStruct, Version, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
+import { Email, RateLimiter } from '@stamhoofd/models';
+import { EmailPreview, EmailStatus, Email as EmailStruct, EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context';
-import { SQL } from '@stamhoofd/sql';
 
 type Params = Record<string, never>;
 type Query = undefined;

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

@@ -3,7 +3,7 @@ import { AutoEncoderPatchType, ConvertArrayToPatchableArray, Decoder, isEmptyPat
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, EmergencyContact, GroupType, MemberDetails, MemberResponsibility, MembersBlob, MemberWithRegistrationsBlob, Parent, PermissionLevel } from '@stamhoofd/structures';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, EmergencyContact, GroupType, MemberDetails, MemberResponsibility, MembersBlob, MemberWithRegistrationsBlob, Parent, PermissionLevel, SetupStepType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
@@ -317,7 +317,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Invalid organization',
-                        human: Context.i18n.$t('d41cdbe3-57e3-4a2e-83bc-cb9e65c9c840'),
+                        human: platformResponsibility ? $t('ec6a555e-6bb1-4b5f-b17e-38eaa8a478b5') : $t('d41cdbe3-57e3-4a2e-83bc-cb9e65c9c840'),
                     });
                 }
 
@@ -688,7 +688,9 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         }
 
         if (shouldUpdateSetupSteps && organization) {
-            SetupStepUpdater.updateForOrganization(organization).catch(console.error);
+            SetupStepUpdater.updateForOrganization(organization, { types: [
+                SetupStepType.Responsibilities,
+            ] }).catch(console.error);
         }
 
         return new Response(
@@ -957,7 +959,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             throw new SimpleError({
                 code: 'known_member_missing_rights',
                 message: 'Creating known member without sufficient access rights',
-                human: $t(`{member} is al gekend in ons systeem, maar jouw e-mailadres niet. Om toegang te krijgen heb je de beveiligingscode nodig.`, { member: member.details.firstName }),
+                human: $t(`510807a1-d4c7-45fa-9e3b-ddc8764d3f6e`, { member: member.details.firstName }),
                 statusCode: 400,
             });
         }

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

@@ -90,6 +90,10 @@ export class PatchPlatformEndpoint extends Endpoint<
                 throw Context.auth.error();
             }
 
+            if (request.body.config.organizationLevelRecordsConfiguration) {
+                shouldUpdateSetupSteps = true;
+            }
+
             const newConfig = request.body.config;
 
             // Update config
@@ -100,13 +104,11 @@ export class PatchPlatformEndpoint extends Endpoint<
                     platform.config = patchObject(platform.config, newConfig);
                     const currentConfig: PlatformConfig = platform.config;
 
-                    if (shouldCheckSteps) {
-                        shouldUpdateSetupSteps = this.shouldUpdateSetupSteps(
-                            currentConfig,
-                            newConfig,
-                            oldConfig,
-                        );
-                    }
+                    shouldUpdateSetupSteps = shouldUpdateSetupSteps || this.shouldUpdateSetupSteps(
+                        currentConfig,
+                        newConfig,
+                        oldConfig,
+                    );
                 }
                 else {
                     platform.config = patchObject(platform.config, newConfig);

package/src/endpoints/global/registration/RegisterMembersEndpoint.ts

@@ -14,6 +14,7 @@ import { Context } from '../../../helpers/Context';
 import { StripeHelper } from '../../../helpers/StripeHelper';
 import { BalanceItemService } from '../../../services/BalanceItemService';
 import { RegistrationService } from '../../../services/RegistrationService';
+import { PaymentService } from '../../../services/PaymentService';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = IDRegisterCheckout;
@@ -1047,120 +1048,126 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
         let paymentUrl: string | null = null;
 
-        // Update balance items
-        if (payment.method === PaymentMethod.Transfer) {
-            // Send a small reminder email
-            try {
-                await Registration.sendTransferEmail(user, organization, payment);
-            }
-            catch (e) {
-                console.error('Failed to send transfer email');
-                console.error(e);
-            }
-        }
-        else if (payment.method !== PaymentMethod.PointOfSale && payment.method !== PaymentMethod.Unknown) {
-            if (!checkout.redirectUrl || !checkout.cancelUrl) {
-                throw new Error('Should have been caught earlier');
+        try {
+            // Update balance items
+            if (payment.method === PaymentMethod.Transfer) {
+                // Send a small reminder email
+                try {
+                    await Registration.sendTransferEmail(user, organization, payment);
+                }
+                catch (e) {
+                    console.error('Failed to send transfer email');
+                    console.error(e);
+                }
             }
+            else if (payment.method !== PaymentMethod.PointOfSale && payment.method !== PaymentMethod.Unknown) {
+                if (!checkout.redirectUrl || !checkout.cancelUrl) {
+                    throw new Error('Should have been caught earlier');
+                }
 
-            const _redirectUrl = new URL(checkout.redirectUrl);
-            _redirectUrl.searchParams.set('paymentId', payment.id);
-            _redirectUrl.searchParams.set('organizationId', organization.id); // makes sure the client uses the token associated with this organization when fetching payment polling status
-
-            const _cancelUrl = new URL(checkout.cancelUrl);
-            _cancelUrl.searchParams.set('paymentId', payment.id);
-            _cancelUrl.searchParams.set('cancel', 'true');
-            _cancelUrl.searchParams.set('organizationId', organization.id); // makes sure the client uses the token associated with this organization when fetching payment polling status
-
-            const redirectUrl = _redirectUrl.href;
-            const cancelUrl = _cancelUrl.href;
-
-            const webhookUrl = 'https://' + organization.getApiHost() + '/v' + Version + '/payments/' + encodeURIComponent(payment.id) + '?exchange=true';
-
-            if (payment.provider === PaymentProvider.Stripe) {
-                const stripeResult = await StripeHelper.createPayment({
-                    payment,
-                    stripeAccount,
-                    redirectUrl,
-                    cancelUrl,
-                    statementDescriptor: organization.name,
-                    metadata: {
-                        organization: organization.id,
-                        user: user.id,
-                        payment: payment.id,
-                    },
-                    i18n: Context.i18n,
-                    lineItems: balanceItemPayments,
-                    organization,
-                    customer: {
-                        name: user.name ?? payMembers[0]?.details.name ?? $t(`bd1e59c8-3d4c-4097-ab35-0ce7b20d0e50`),
-                        email: user.email,
-                    },
-                });
-                paymentUrl = stripeResult.paymentUrl;
-            }
-            else if (payment.provider === PaymentProvider.Mollie) {
-                // Mollie payment
-                const token = await MollieToken.getTokenFor(organization.id);
-                if (!token) {
-                    throw new SimpleError({
-                        code: '',
-                        message: $t(`b77e1f68-8928-42a2-802b-059fa73bedc3`, { method: PaymentMethodHelper.getName(payment.method) }),
+                const _redirectUrl = new URL(checkout.redirectUrl);
+                _redirectUrl.searchParams.set('paymentId', payment.id);
+                _redirectUrl.searchParams.set('organizationId', organization.id); // makes sure the client uses the token associated with this organization when fetching payment polling status
+
+                const _cancelUrl = new URL(checkout.cancelUrl);
+                _cancelUrl.searchParams.set('paymentId', payment.id);
+                _cancelUrl.searchParams.set('cancel', 'true');
+                _cancelUrl.searchParams.set('organizationId', organization.id); // makes sure the client uses the token associated with this organization when fetching payment polling status
+
+                const redirectUrl = _redirectUrl.href;
+                const cancelUrl = _cancelUrl.href;
+
+                const webhookUrl = 'https://' + organization.getApiHost() + '/v' + Version + '/payments/' + encodeURIComponent(payment.id) + '?exchange=true';
+
+                if (payment.provider === PaymentProvider.Stripe) {
+                    const stripeResult = await StripeHelper.createPayment({
+                        payment,
+                        stripeAccount,
+                        redirectUrl,
+                        cancelUrl,
+                        statementDescriptor: organization.name,
+                        metadata: {
+                            organization: organization.id,
+                            user: user.id,
+                            payment: payment.id,
+                        },
+                        i18n: Context.i18n,
+                        lineItems: balanceItemPayments,
+                        organization,
+                        customer: {
+                            name: user.name ?? payMembers[0]?.details.name ?? $t(`bd1e59c8-3d4c-4097-ab35-0ce7b20d0e50`),
+                            email: user.email,
+                        },
                     });
+                    paymentUrl = stripeResult.paymentUrl;
                 }
-                const profileId = organization.privateMeta.mollieProfile?.id ?? await token.getProfileId(organization.getHost());
-                if (!profileId) {
-                    throw new SimpleError({
-                        code: '',
-                        message: $t(`5574469f-8eee-47fe-9fb6-1b097142ac75`, { method: PaymentMethodHelper.getName(payment.method) }),
+                else if (payment.provider === PaymentProvider.Mollie) {
+                    // Mollie payment
+                    const token = await MollieToken.getTokenFor(organization.id);
+                    if (!token) {
+                        throw new SimpleError({
+                            code: '',
+                            message: $t(`b77e1f68-8928-42a2-802b-059fa73bedc3`, { method: PaymentMethodHelper.getName(payment.method) }),
+                        });
+                    }
+                    const profileId = organization.privateMeta.mollieProfile?.id ?? await token.getProfileId(organization.getHost());
+                    if (!profileId) {
+                        throw new SimpleError({
+                            code: '',
+                            message: $t(`5574469f-8eee-47fe-9fb6-1b097142ac75`, { method: PaymentMethodHelper.getName(payment.method) }),
+                        });
+                    }
+                    const mollieClient = createMollieClient({ accessToken: await token.getAccessToken() });
+                    const locale = Context.i18n.locale.replace('-', '_');
+                    const molliePayment = await mollieClient.payments.create({
+                        amount: {
+                            currency: 'EUR',
+                            value: (totalPrice / 100).toFixed(2),
+                        },
+                        method: payment.method == PaymentMethod.Bancontact ? molliePaymentMethod.bancontact : (payment.method == PaymentMethod.iDEAL ? molliePaymentMethod.ideal : molliePaymentMethod.creditcard),
+                        testmode: organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production',
+                        profileId,
+                        description,
+                        redirectUrl,
+                        webhookUrl,
+                        metadata: {
+                            paymentId: payment.id,
+                        },
+                        locale: ['en_US', 'en_GB', 'nl_NL', 'nl_BE', 'fr_FR', 'fr_BE', 'de_DE', 'de_AT', 'de_CH', 'es_ES', 'ca_ES', 'pt_PT', 'it_IT', 'nb_NO', 'sv_SE', 'fi_FI', 'da_DK', 'is_IS', 'hu_HU', 'pl_PL', 'lv_LV', 'lt_LT'].includes(locale) ? (locale as any) : null,
                     });
-                }
-                const mollieClient = createMollieClient({ accessToken: await token.getAccessToken() });
-                const locale = Context.i18n.locale.replace('-', '_');
-                const molliePayment = await mollieClient.payments.create({
-                    amount: {
-                        currency: 'EUR',
-                        value: (totalPrice / 100).toFixed(2),
-                    },
-                    method: payment.method == PaymentMethod.Bancontact ? molliePaymentMethod.bancontact : (payment.method == PaymentMethod.iDEAL ? molliePaymentMethod.ideal : molliePaymentMethod.creditcard),
-                    testmode: organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production',
-                    profileId,
-                    description,
-                    redirectUrl,
-                    webhookUrl,
-                    metadata: {
-                        paymentId: payment.id,
-                    },
-                    locale: ['en_US', 'en_GB', 'nl_NL', 'nl_BE', 'fr_FR', 'fr_BE', 'de_DE', 'de_AT', 'de_CH', 'es_ES', 'ca_ES', 'pt_PT', 'it_IT', 'nb_NO', 'sv_SE', 'fi_FI', 'da_DK', 'is_IS', 'hu_HU', 'pl_PL', 'lv_LV', 'lt_LT'].includes(locale) ? (locale as any) : null,
-                });
-                paymentUrl = molliePayment.getCheckoutUrl();
+                    paymentUrl = molliePayment.getCheckoutUrl();
 
-                // Save payment
-                const dbPayment = new MolliePayment();
-                dbPayment.paymentId = payment.id;
-                dbPayment.mollieId = molliePayment.id;
-                await dbPayment.save();
-            }
-            else if (payment.provider === PaymentProvider.Payconiq) {
-                paymentUrl = await PayconiqPayment.createPayment(payment, organization, description, redirectUrl, webhookUrl);
-            }
-            else if (payment.provider == PaymentProvider.Buckaroo) {
-                // Increase request timeout because buckaroo is super slow (in development)
-                Context.request.request?.setTimeout(60 * 1000);
-                const buckaroo = new BuckarooHelper(organization.privateMeta?.buckarooSettings?.key ?? '', organization.privateMeta?.buckarooSettings?.secret ?? '', organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
-                const ip = Context.request.getIP();
-                paymentUrl = await buckaroo.createPayment(payment, ip, description, redirectUrl, webhookUrl);
-                await payment.save();
-
-                // TypeScript doesn't understand that the status can change and isn't a const....
-                if ((payment.status as any) === PaymentStatus.Failed) {
-                    throw new SimpleError({
-                        code: 'payment_failed',
-                        message: $t(`b77e1f68-8928-42a2-802b-059fa73bedc3`, { method: PaymentMethodHelper.getName(payment.method) }),
-                    });
+                    // Save payment
+                    const dbPayment = new MolliePayment();
+                    dbPayment.paymentId = payment.id;
+                    dbPayment.mollieId = molliePayment.id;
+                    await dbPayment.save();
+                }
+                else if (payment.provider === PaymentProvider.Payconiq) {
+                    paymentUrl = await PayconiqPayment.createPayment(payment, organization, description, redirectUrl, webhookUrl);
+                }
+                else if (payment.provider == PaymentProvider.Buckaroo) {
+                    // Increase request timeout because buckaroo is super slow (in development)
+                    Context.request.request?.setTimeout(60 * 1000);
+                    const buckaroo = new BuckarooHelper(organization.privateMeta?.buckarooSettings?.key ?? '', organization.privateMeta?.buckarooSettings?.secret ?? '', organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production');
+                    const ip = Context.request.getIP();
+                    paymentUrl = await buckaroo.createPayment(payment, ip, description, redirectUrl, webhookUrl);
+                    await payment.save();
+
+                    // TypeScript doesn't understand that the status can change and isn't a const....
+                    if ((payment.status as any) === PaymentStatus.Failed) {
+                        throw new SimpleError({
+                            code: 'payment_failed',
+                            message: $t(`b77e1f68-8928-42a2-802b-059fa73bedc3`, { method: PaymentMethodHelper.getName(payment.method) }),
+                        });
+                    }
                 }
             }
         }
+        catch (e) {
+            await PaymentService.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
+            throw e;
+        }
 
         return {
             payment,

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -303,7 +303,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'You cannot set the uitpasClientCredentialsStatus manually',
-                        human: $t('Je kan de status van de UiTPAS-credentials niet handmatig instellen'),
+                        human: $t('d8937ba8-6689-4c76-9841-d5a00c99074b'),
                     });
                 }
 

package/src/endpoints/organization/dashboard/organization/SetUitpasClientCredentialsEndpoint.ts

@@ -51,7 +51,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You must provide a client id',
                 code: 'missing_client_id',
-                human: $t('Je moet een client id opgeven.'),
+                human: $t('9b9ec483-63b8-4696-ade6-0eb18f9008e6'),
                 field: 'clientId',
             });
         }
@@ -59,7 +59,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You must provide a client secret',
                 code: 'missing_client_secret',
-                human: $t('Je moet een client secret opgeven.'),
+                human: $t('58de00fb-3b0a-45a6-9214-7d11b4175779'),
                 field: 'clientSecret',
             });
         }
@@ -67,7 +67,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'You cannot use the placeholder client secret for a different client id',
                 code: 'invalid_client_secret',
-                human: $t('Je kan niet enkel de client id wijzigen. Geef ook de client secret in.'),
+                human: $t('bbc79280-7ae2-4b8d-a900-2d7cbb552428'),
                 field: 'clientSecret',
             });
         }
@@ -77,7 +77,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
             throw new SimpleError({
                 message: 'This organization does not have a uitpas organizer id set',
                 code: 'missing_uitpas_organizer_id',
-                human: $t('Stel eerst een UiTPAS-organisator in.'),
+                human: $t('80fcde9c-c8c7-4fe1-b9a6-51684a23d850'),
             });
         }
 
@@ -88,7 +88,7 @@ export class SetUitpasClientCredentialsEndpoint extends Endpoint<Params, Query,
                 throw new SimpleError({
                     message: 'The provided client credentials are not valid',
                     code: 'invalid_client_credentials',
-                    human: $t('De opgegeven client credentials zijn niet geldig.'),
+                    human: $t('42bbd5c0-8789-4ca1-b667-1c9ecf4d0190'),
                 });
             }
         }

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

@@ -1,5 +1,5 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
+import { GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, SetupStepType, Version } from '@stamhoofd/structures';
 
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';

package/src/endpoints/organization/dashboard/webshops/SearchUitpasEventsEndpoint.ts

@@ -41,7 +41,7 @@ export class SearchUitpasEventsEndpoint extends Endpoint<Params, Query, Body, Re
             throw new SimpleError({
                 code: 'no_uitpas_organizer_id',
                 message: `No UiTPAS organizer ID set for organization`,
-                human: $t(`Deze organisatie heeft nog geen UiTPAS-organisatie ingesteld. Stel dit in via de algemene instellingen.`),
+                human: $t(`aaf56535-c13b-4f92-9ba4-7309cae3e078`),
             });
         }
         const uitpasOrganizersResponse = await UitpasService.searchUitpasEvents(organization.id, organization.meta.uitpasOrganizerId, request.query.text);

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.ts

@@ -179,7 +179,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                         throw new SimpleError({
                             code: 'uitpas_social_tariff_price_mismatch',
                             message: 'UiTPAS wrong number of prices retruned',
-                            human: $t('Het kansentarief voor sommige UiTPAS-nummers kon niet worden opgehaald.'),
+                            human: $t('2d1983fa-2224-422f-9ea0-fdae77cb4914'),
                             field: 'cart.items.uitpasNumbers',
                         });
                     }
@@ -188,7 +188,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                             throw new SimpleError({
                                 code: 'uitpas_social_tariff_price_mismatch',
                                 message: 'UiTPAS social tariff have a different price',
-                                human: $t('Het kansentarief voor deze UiTPAS is {correctPrice} in plaats van {orderPrice}.', { correctPrice: Formatter.price(reducedPrices[i].price), orderPrice: Formatter.price(expectedReducedPrices[i].price) }),
+                                human: $t('2f4b9572-4b9c-42e0-91f1-b0984624d225', { correctPrice: Formatter.price(reducedPrices[i].price), orderPrice: Formatter.price(expectedReducedPrices[i].price) }),
                                 field: 'uitpasNumbers.' + i.toString(),
                             });
                         }

package/src/helpers/AdminPermissionChecker.ts

@@ -379,11 +379,6 @@ export class AdminPermissionChecker {
             return false;
         }
 
-        // Check permissions aren't scoped to a specific organization, and they mismatch
-        if (!this.checkScope(registration.organizationId)) {
-            return false;
-        }
-
         const organizationPermissions = await this.getOrganizationPermissions(registration.organizationId);
 
         if (!organizationPermissions) {

package/src/helpers/FlagMomentCleanup.ts

@@ -26,7 +26,9 @@ export class FlagMomentCleanup {
     }
 
     static async getActiveMemberResponsibilityRecordsForOrganizationWithoutRegistrationInCurrentPeriod() {
-        const currentPeriodId = (await Platform.getShared()).periodId;
+        const platform = await Platform.getShared();
+        const currentPeriodId = platform.periodId;
+        const platformResponsibilityIds = platform.config.responsibilities.map(r => r.id);
 
         return await MemberResponsibilityRecord.select()
             .whereNot('organizationId', null)
@@ -62,6 +64,16 @@ export class FlagMomentCleanup {
                         ).where(
                             SQL.column(Group.table, 'type'),
                             GroupType.Membership,
+                        ).where(
+                            SQL.where(
+                                SQL.column(Group.table, 'defaultAgeGroupId'),
+                                '!=',
+                                null,
+                            ).or(
+                                SQL.column(MemberResponsibilityRecord.table, 'responsibilityId'),
+                                '!=',
+                                platformResponsibilityIds,
+                            ),
                         ).where(
                             SQL.column(Group.table, 'deletedAt'),
                             null,

package/src/helpers/GroupedThrottledQueue.ts

@@ -15,13 +15,15 @@ export class GroupedThrottledQueue<T> {
      * In milliseconds.
      */
     maxDelay: number | null = 10_000;
+    itemDelay: number | null = null;
 
     constructor(
         handler: (group: string, items: T[]) => Promise<void> | void,
-        options: { maxDelay?: number | null } = {},
+        options: { maxDelay?: number | null; itemDelay?: number | null } = {},
     ) {
         this.handler = handler;
-        this.maxDelay = options.maxDelay ?? 10_000;
+        this.maxDelay = options.maxDelay !== null ? (options.maxDelay ?? 10_000) : null;
+        this.itemDelay = options.itemDelay ?? null;
     }
 
     addItems(group: string, items: T[]): void {
@@ -32,7 +34,7 @@ export class GroupedThrottledQueue<T> {
             return;
         }
         const newQueue = new ThrottledQueue<T>(items => this.handler(group, items), {
-            maxDelay: null,
+            maxDelay: this.itemDelay,
             emptyHandler: () => {
                 this.queues.delete(group);
             },