@stamhoofd/backend 2.137.3 → 2.137.5

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

@@ -585,7 +585,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 membership.locked = false;
 
                 // Correct price and dates
-                await membership.calculatePrice(member);
+                await PlatformMembershipService.calculatePrice(membership, member);
 
                 const incompatible = await MemberPlatformMembership.select()
                     .where('memberId', member.id)

package/src/endpoints/global/organizations/CreateOrganizationEndpoint.ts

@@ -12,6 +12,7 @@ import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 import { AuditLogService } from '../../../services/AuditLogService.js';
 import { ReferralService } from '../../../services/ReferralService.js';
+import { VerificationCodeService } from '../../../services/VerificationCodeService.js';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
 
@@ -160,7 +161,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         await AuditLog.update().where('type', AuditLogType.OrganizationAdded).where('objectId', organization.id).set('userId', user.id).set('source', AuditLogSource.User).update();
 
         const code = await EmailVerificationCode.createFor(user, user.email);
-        code.send(user, organization, request.i18n).catch(console.error);
+        VerificationCodeService.send(code, user, organization, request.i18n).catch(console.error);
 
         for (const email of delayEmails) {
             Email.send({

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

@@ -4,6 +4,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { DocumentTemplate } from '@stamhoofd/models';
 
 import { Context } from '../../../../helpers/Context.js';
+import { DocumentRenderService } from '../../../../services/DocumentRenderService.js';
 
 type Params = { id: string };
 type Query = undefined;
@@ -42,7 +43,7 @@ export class GetDocumentTemplateXMLEndpoint extends Endpoint<Params, Query, Body
         }
 
         // Update documents
-        const xml = await template.getRenderedXml(organization);
+        const xml = await DocumentRenderService.getRenderedXml(template, organization);
         if (!xml) {
             throw new SimpleError({
                 code: 'failed_generating',

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

@@ -9,6 +9,7 @@ import NodeRSA from 'node-rsa';
 import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';
+import { OrganizationDNSService } from '../../../../services/OrganizationDNSService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -169,7 +170,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
                 }));
             } else {
                 if (oldMailDomain) {
-                    organization.deleteAWSMailIdenitity(oldMailDomain).catch(console.error);
+                    OrganizationDNSService.deleteAWSMailIdenitity(organization, oldMailDomain).catch(console.error);
                 }
 
                 if (organization.serverMeta.privateDKIMKey && organization.serverMeta.publicDKIMKey) {
@@ -188,7 +189,7 @@ export class SetOrganizationDomainEndpoint extends Endpoint<Params, Query, Body,
         } else {
             // Validate DNS-records if not empty
             console.log('Validating domains');
-            await organization.updateDNSRecords();
+            await OrganizationDNSService.updateDNSRecords(organization);
         }
 
         console.log('Done.');

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

@@ -3,7 +3,7 @@ import { isPatch } from '@simonbackx/simple-encoding';
 import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Token, User } from '@stamhoofd/models';
+import { Platform, Token, User } from '@stamhoofd/models';
 import { ApiUser, PermissionLevel, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { Context } from '../../../../helpers/Context.js';
 
@@ -58,10 +58,12 @@ export class PatchApiUserEndpoint extends Endpoint<Params, Query, Body, Response
             }
 
             if (request.body.permissions) {
+                const platform = await Platform.getSharedStruct();
+
                 if (organization) {
                     editUser.permissions = UserPermissions.limitedPatch(editUser.permissions, request.body.permissions, organization.id);
 
-                    if (editUser.id === user.id && (!editUser.permissions || !editUser.permissions.forOrganization(organization)?.hasFullAccess())) {
+                    if (editUser.id === user.id && (!editUser.permissions || !editUser.permissions.forOrganization(organization, platform, { inheritFromPlatform: false })?.hasFullAccess())) {
                         throw new SimpleError({
                             code: 'permission_denied',
                             message: 'Je kan jezelf niet verwijderen als hoofdbeheerder',
@@ -74,7 +76,7 @@ export class PatchApiUserEndpoint extends Endpoint<Params, Query, Body, Response
                         editUser.permissions = request.body.permissions.isPut() ? request.body.permissions : null;
                     }
 
-                    if (editUser.id === user.id && !editUser.permissions?.platform?.hasFullAccess()) {
+                    if (editUser.id === user.id && !editUser.permissions?.forPlatform(platform)?.hasFullAccess()) {
                         throw new SimpleError({
                             code: 'permission_denied',
                             message: 'Je kan jezelf niet verwijderen als hoofdbeheerder',

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

@@ -10,6 +10,7 @@ import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceIt
 import { Context } from '../../../../helpers/Context.js';
 import { ServiceFeeHelper } from '../../../../helpers/ServiceFeeHelper.js';
 import { AuditLogService } from '../../../../services/AuditLogService.js';
+import { OrderService } from '../../../../services/OrderService.js';
 import { PaymentService } from '../../../../services/PaymentService.js';
 import { shouldReserveUitpasNumbers, UitpasService } from '../../../../services/uitpas/UitpasService.js';
 
@@ -151,7 +152,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         order.data.paymentMethod = PaymentMethod.Unknown;
 
                         // Mark this order as paid
-                        await order.markPaid(null, organization, webshop);
+                        await OrderService.markPaid(order, null, organization, webshop);
                         await order.save();
                     } else {
                         const payment = new Payment();
@@ -217,12 +218,12 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                         await balanceItemPayment.save();
 
                         if (payment.method === PaymentMethod.Transfer) {
-                            await order.markValid(payment, []);
+                            await OrderService.markValid(order, payment, []);
                             await payment.save();
                             await order.save();
                         } else if (payment.method === PaymentMethod.PointOfSale) {
                             // Not really paid, but needed to create the tickets if needed
-                            await order.markPaid(payment, organization, webshop);
+                            await OrderService.markPaid(order, payment, organization, webshop);
                             await payment.save();
                             await order.save();
                         } else {

package/src/endpoints/organization/shared/GetDocumentHtml.ts

@@ -5,6 +5,7 @@ import { signInternal } from '@stamhoofd/backend-env';
 import { Document, Organization } from '@stamhoofd/models';
 
 import { Context } from '../../../helpers/Context.js';
+import { DocumentRenderService } from '../../../services/DocumentRenderService.js';
 type Params = { id: string };
 type Query = undefined;
 type Body = undefined;
@@ -45,7 +46,7 @@ export class GetDocumentHtml extends Endpoint<Params, Query, Body, ResponseBody>
             });
         }
 
-        const html = await document.getRenderedHtml(organization);
+        const html = await DocumentRenderService.getRenderedHtml(document, organization);
         if (!html) {
             throw new SimpleError({
                 code: 'failed_generating',

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

@@ -16,6 +16,7 @@ import { ServiceFeeHelper } from '../../../helpers/ServiceFeeHelper.js';
 import { StripeHelper } from '../../../helpers/StripeHelper.js';
 import { AuditLogService } from '../../../services/AuditLogService.js';
 import { MollieService } from '../../../services/MollieService.js';
+import { OrderService } from '../../../services/OrderService.js';
 import { PaymentService } from '../../../services/PaymentService.js';
 import { UitpasService } from '../../../services/uitpas/UitpasService.js';
 import { WebshopAuthHelper } from './WebshopAuthHelper.js';
@@ -171,7 +172,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 order.data.paymentMethod = PaymentMethod.Unknown;
 
                 // Mark this order as paid
-                await order.markPaid(null, organization, webshop);
+                await OrderService.markPaid(order, null, organization, webshop);
                 await order.save();
             } else {
                 const payment = new Payment();
@@ -242,7 +243,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 const description = webshop.meta.name + ' - ' + organization.name;
 
                 if (payment.method === PaymentMethod.Transfer) {
-                    await order.markValid(payment, []);
+                    await OrderService.markValid(order, payment, []);
 
                     if (order.number) {
                         balanceItem.description = order.generateBalanceDescription(webshop);
@@ -253,7 +254,7 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     await payment.save();
                 } else if (payment.method === PaymentMethod.PointOfSale) {
                     // Not really paid, but needed to create the tickets if needed
-                    await order.markPaid(payment, organization, webshop);
+                    await OrderService.markPaid(order, payment, organization, webshop);
 
                     if (order.number) {
                         balanceItem.description = order.generateBalanceDescription(webshop);

package/src/excel-loaders/balance-items.ts

@@ -16,7 +16,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.BalanceItems, {
             results: await BalanceItem.getStructureWithPayments(data.results),
         });
     },
-    sheets: [
+    getSheets: () => [
         {
             id: 'balanceItems',
             name: $t(`%1LA`),

package/src/excel-loaders/event-notifications.ts

@@ -1,14 +1,14 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
-import type { EventNotification, LimitedFilteredRequest } from '@stamhoofd/structures';
-import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, Platform as PlatformStruct } from '@stamhoofd/structures';
+import type { EventNotification, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<EventNotification, EventNotification> => ({
     id: 'event-notifications',
     name: $t(`%1FR`),
     columns: [
@@ -118,18 +118,17 @@ const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
             matchId: 'recordAnswers',
             getRecordAnswers: (notification: EventNotification) => notification.recordAnswers,
             getRecordCategories: () => {
-                const platform = PlatformStruct.shared;
                 return platform.config.eventNotificationTypes.flatMap(r => r.recordCategories);
             },
         }),
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.EventNotifications, {
     fetch: async (query: LimitedFilteredRequest) => {
         return await GetEventNotificationsEndpoint.buildData(query);
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });

package/src/excel-loaders/members.test.ts

@@ -1,7 +1,7 @@
 import type { XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
 import type { PlatformMember } from '@stamhoofd/structures';
 import { EmergencyContact, MemberDetails, MembersBlob, MemberWithRegistrationsBlob, Organization, Platform, PlatformFamily } from '@stamhoofd/structures';
-import { baseMemberColumns } from './members.js';
+import { getBaseMemberColumns } from './members.js';
 
 describe('Member excel export', () => {
     describe('emergencyContacts column', () => {
@@ -21,7 +21,7 @@ describe('Member excel export', () => {
         }
 
         function getColumn() {
-            const column = baseMemberColumns.find(c => 'id' in c && c.id === 'emergencyContacts') as XlsxTransformerConcreteColumn<PlatformMember> | undefined;
+            const column = getBaseMemberColumns(Platform.create({})).find(c => 'id' in c && c.id === 'emergencyContacts') as XlsxTransformerConcreteColumn<PlatformMember> | undefined;
 
             if (!column) {
                 throw new Error('Column emergencyContacts not found');

package/src/excel-loaders/members.ts

@@ -1,8 +1,8 @@
 import type { XlsxTransformerColumn, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, PlatformMember } from '@stamhoofd/structures';
-import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';
@@ -10,7 +10,7 @@ import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
 import { Context } from '../helpers/Context.js';
 import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
 
-export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
+export const getBaseMemberColumns = (platform: PlatformStruct): XlsxTransformerColumn<PlatformMember>[] => [
     {
         id: 'id',
         name: $t(`%d`),
@@ -244,7 +244,6 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
         matchId: 'recordAnswers',
         getRecordAnswers: ({ patchedMember: object }: PlatformMember) => object.details.recordAnswers,
         getRecordCategories: () => {
-            const platform = PlatformStruct.shared;
             const organization = Context.organization;
 
             return [
@@ -256,11 +255,11 @@ export const baseMemberColumns: XlsxTransformerColumn<PlatformMember>[] = [
 ];
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<PlatformMember, PlatformMember> => ({
     id: 'members',
     name: $t(`%1EH`),
     columns: [
-        ...baseMemberColumns,
+        ...getBaseMemberColumns(platform),
         {
             id: 'group',
             name: $t(`%wH`),
@@ -281,7 +280,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
             getValue: (member: PlatformMember) => {
                 const groups = member.filterRegistrations({ currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id });
                 const defaultAgeGroupIds = Formatter.uniqueArray(groups.filter(o => o.group.defaultAgeGroupId));
-                const defaultAgeGroups = defaultAgeGroupIds.map(o => PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`%wJ`));
+                const defaultAgeGroups = defaultAgeGroupIds.map(o => platform.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? $t(`%wJ`));
                 const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' ' + $t(`%M1`) + ' ') || Context.i18n.$t('%5D');
 
                 return {
@@ -472,7 +471,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
             },
         },
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -486,8 +485,8 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
             next: result.next,
         });
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });
 

package/src/excel-loaders/organizations.ts

@@ -1,8 +1,8 @@
 import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
-import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
-import type { LimitedFilteredRequest, Premise } from '@stamhoofd/structures';
-import { ExcelExportType, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { Group, Member, MemberResponsibilityRecord, Platform } from '@stamhoofd/models';
+import type { LimitedFilteredRequest, Platform as PlatformStruct, Premise } from '@stamhoofd/structures';
+import { ExcelExportType, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
@@ -27,7 +27,7 @@ class MemberResponsibilityRecordWithMemberAndOrganization extends MemberResponsi
 type Object = OrganizationWithResponsibilities;
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<Object, Object> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, Object> => ({
     id: 'organizations',
     name: $t(`%wP`),
     columns: [
@@ -60,8 +60,6 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
             name: $t(`%13`),
             width: 50,
             getValue: (object: Object) => {
-                const platform = PlatformStruct.shared;
-
                 return {
                     value: object.meta.tags.map(tag => platform.config.tags.find(t => t.id === tag)?.name ?? $t(`%Gr`)).join(', '),
                 };
@@ -76,17 +74,15 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
             matchId: 'recordAnswers',
             getRecordAnswers: (object: Object) => object.getRecordAnswers(),
             getRecordCategories: () => {
-                const platform = PlatformStruct.shared;
-
                 return [
                     ...platform.config.organizationLevelRecordsConfiguration.recordCategories,
                 ];
             },
         }),
     ],
-};
+});
 
-const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordWithMemberAndOrganization> = {
+const getResponsibilitiesSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, MemberResponsibilityRecordWithMemberAndOrganization> => ({
     id: 'responsibilities',
     name: $t(`%7D`),
     transform(organization) {
@@ -125,7 +121,6 @@ const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordW
             name: $t(`%H2`),
             width: 50,
             getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => {
-                const platform = PlatformStruct.shared;
                 const responsibility = platform.config.responsibilities.find(r => r.id === object.responsibilityId) ?? object.organization.privateMeta?.responsibilities.find(r => r.id === object.responsibilityId);
 
                 if (!responsibility) {
@@ -168,10 +163,10 @@ const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordW
             getAddress: object => object.member.details.address ?? object.member.details.parents[0]?.address ?? object.member.details.parents[1]?.address ?? null,
         }),
     ],
-};
+});
 
 type PremiseWithOrganization = { organization: Object; premise: Premise };
-const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
+const getPremisesSheet = (platform: PlatformStruct): XlsxTransformerSheet<Object, PremiseWithOrganization> => ({
     id: 'premises',
     name: $t(`%6c`),
     transform(organization) {
@@ -219,7 +214,6 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
             width: 20,
             getValue: (object: PremiseWithOrganization) => {
                 const ids = object.premise.premiseTypeIds;
-                const platform = PlatformStruct.shared;
                 return {
                     value: ids.map(id => platform.config.premiseTypes.find(t => t.id === id)?.name ?? $t(`%Gr`)).join(', '),
                 };
@@ -230,7 +224,7 @@ const premises: XlsxTransformerSheet<Object, PremiseWithOrganization> = {
             getAddress: object => object.premise.address,
         }),
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -253,7 +247,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
         const groups = await Group.getByIDs(...groupIds);
         const memberStructs = await AuthenticatedStructures.members(members);
         const groupStructs = await AuthenticatedStructures.groups(groups);
-        const platform = PlatformStruct.shared;
+        const platform = await Platform.getSharedStruct();
 
         const mappedOrganizations = organizations.results.map((o) => {
             const resp = responsibilities.filter(r => r.organizationId === o.id);
@@ -295,9 +289,9 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
             next: organizations.next,
         });
     },
-    sheets: [
-        sheet,
-        responsibilities,
-        premises,
+    getSheets: platform => [
+        getSheet(platform),
+        getResponsibilitiesSheet(platform),
+        getPremisesSheet(platform),
     ],
 });

package/src/excel-loaders/payments.ts

@@ -62,7 +62,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Payments, {
             }),
         });
     },
-    sheets: [
+    getSheets: () => [
         {
             id: 'payments',
             name: $t(`%1JH`),

package/src/excel-loaders/platform-memberships.ts

@@ -1,12 +1,12 @@
 import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
-import type { LimitedFilteredRequest, PlatformMembership } from '@stamhoofd/structures';
-import { ExcelExportType, PaginatedResponse, Platform } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMembership, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { ExcelExportType, PaginatedResponse } from '@stamhoofd/structures';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetPlatformMembershipsEndpoint } from '../endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<PlatformMembership> = {
+const getSheet = (platform: PlatformStruct): XlsxTransformerSheet<PlatformMembership> => ({
     id: 'platform-memberships',
     name: $t('%1EI'),
     columns: [
@@ -23,7 +23,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             name: $t('%1LP'),
             width: 40,
             getValue: (membership: PlatformMembership) => {
-                const membershipType = Platform.shared.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
+                const membershipType = platform.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
                 const value = membershipType ? membershipType.name : '';
                 return { value };
             },
@@ -244,7 +244,7 @@ const sheet: XlsxTransformerSheet<PlatformMembership> = {
             }),
         },
     ],
-};
+});
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -255,7 +255,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
             next: data.next,
         });
     },
-    sheets: [
-        sheet,
+    getSheets: platform => [
+        getSheet(platform),
     ],
 });

package/src/excel-loaders/platform-sheets.test.ts

@@ -0,0 +1,113 @@
+import type { XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import { isXlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import { EventNotificationType, ExcelExportType, Organization, OrganizationMetaData, OrganizationTag, Platform, PlatformConfig, PlatformMembership, PlatformMembershipMemberDetails, PlatformMembershipOrganizationDetails, PlatformMembershipType, RecordCategory, RecordSettings, RecordType, TranslatedString } from '@stamhoofd/structures';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import './index.js';
+
+/**
+ * The sheets are built per export request, so every callback should read the platform it was built
+ * with instead of a process wide singleton.
+ */
+describe('Excel loaders platform argument', () => {
+    function getColumns(type: ExcelExportType, platform: Platform, sheetId: string): XlsxTransformerColumn<unknown>[] {
+        const loader = ExportToExcelEndpoint.loaders.get(type);
+
+        if (!loader) {
+            throw new Error('Loader ' + type + ' not registered');
+        }
+
+        const sheet = loader.getSheets(platform).find(s => s.id === sheetId);
+
+        if (!sheet) {
+            throw new Error('Sheet ' + sheetId + ' not found');
+        }
+
+        return sheet.columns;
+    }
+
+    function getColumn(type: ExcelExportType, platform: Platform, sheetId: string, columnId: string): XlsxTransformerConcreteColumn<unknown> {
+        const column = getColumns(type, platform, sheetId).find(c => isXlsxTransformerConcreteColumn(c) && c.id === columnId);
+
+        if (!column || !isXlsxTransformerConcreteColumn(column)) {
+            throw new Error('Column ' + columnId + ' not found');
+        }
+
+        return column;
+    }
+
+    function createPlatformWithTag(tagName: string) {
+        return Platform.create({
+            config: PlatformConfig.create({
+                tags: [
+                    OrganizationTag.create({ id: 'tag-1', name: tagName }),
+                ],
+            }),
+        });
+    }
+
+    it('reads the organization tags from the platform the sheets were built with', () => {
+        const organization = Organization.create({
+            meta: OrganizationMetaData.create({ tags: ['tag-1'] }),
+        });
+
+        const first = getColumn(ExcelExportType.Organizations, createPlatformWithTag('Gewest Noord'), 'organizations', 'tags');
+        expect(first.getValue(organization).value).toBe('Gewest Noord');
+
+        // Building the sheets again with another platform should not reuse the first platform
+        const second = getColumn(ExcelExportType.Organizations, createPlatformWithTag('Gewest Zuid'), 'organizations', 'tags');
+        expect(second.getValue(organization).value).toBe('Gewest Zuid');
+    });
+
+    it('reads the membership type from the platform the sheets were built with', () => {
+        const platform = Platform.create({
+            config: PlatformConfig.create({
+                membershipTypes: [
+                    PlatformMembershipType.create({ id: 'type-1', name: 'Aansluiting' }),
+                ],
+            }),
+        });
+
+        const membership = PlatformMembership.create({
+            memberId: 'member-1',
+            membershipTypeId: 'type-1',
+            organizationId: 'organization-1',
+            periodId: 'period-1',
+            member: PlatformMembershipMemberDetails.create({ firstName: 'John', lastName: 'Doe', memberNumber: null }),
+            organization: PlatformMembershipOrganizationDetails.create({}),
+            balanceItem: null,
+        });
+
+        const column = getColumn(ExcelExportType.PlatformMemberships, platform, 'platform-memberships', 'type');
+        expect(column.getValue(membership).value).toBe('Aansluiting');
+    });
+
+    it('reads the record categories of an event notification from the platform the sheets were built with', () => {
+        const platform = Platform.create({
+            config: PlatformConfig.create({
+                eventNotificationTypes: [
+                    EventNotificationType.create({
+                        recordCategories: [
+                            RecordCategory.create({
+                                name: new TranslatedString('Kamp'),
+                                records: [
+                                    RecordSettings.create({
+                                        id: 'record-1',
+                                        name: new TranslatedString('Aantal deelnemers'),
+                                        type: RecordType.Text,
+                                    }),
+                                ],
+                            }),
+                        ],
+                    }),
+                ],
+            }),
+        });
+
+        const columns = getColumns(ExcelExportType.EventNotifications, platform, 'event-notifications');
+        const matched = columns.flatMap(c => isXlsxTransformerConcreteColumn(c) ? [] : (c.match('recordAnswers.record-1') ?? []));
+
+        expect(matched).toHaveLength(1);
+        expect(matched[0].name).toBe('Aantal deelnemers');
+        expect(matched[0].category).toBe('Kamp');
+    });
+});

package/src/excel-loaders/receivable-balances.ts

@@ -19,7 +19,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.ReceivableBalances, {
             ...data,
         });
     },
-    sheets: [
+    getSheets: () => [
         {
             id: 'receivableBalances',
             name: $t(`%99`),