@stamhoofd/backend 2.37.0 → 2.38.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.37.0",
+    "version": "2.38.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.37.0",
-        "@stamhoofd/backend-middleware": "2.37.0",
-        "@stamhoofd/email": "2.37.0",
-        "@stamhoofd/models": "2.37.0",
-        "@stamhoofd/queues": "2.37.0",
-        "@stamhoofd/sql": "2.37.0",
-        "@stamhoofd/structures": "2.37.0",
-        "@stamhoofd/utility": "2.37.0",
+        "@stamhoofd/backend-i18n": "2.38.0",
+        "@stamhoofd/backend-middleware": "2.38.0",
+        "@stamhoofd/email": "2.38.0",
+        "@stamhoofd/models": "2.38.0",
+        "@stamhoofd/queues": "2.38.0",
+        "@stamhoofd/sql": "2.38.0",
+        "@stamhoofd/structures": "2.38.0",
+        "@stamhoofd/utility": "2.38.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "^4.0.5",
         "stripe": "^16.6.0"
     },
-    "gitHead": "c01fc82d46188cc4e35a7edb90ee595ff7129e6f"
+    "gitHead": "4af6773c9729d690145d60993542452989d6219d"
 }

package/src/endpoints/admin/memberships/ChargeMembershipsEndpoint.ts

@@ -1,9 +1,8 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
-import { sleep } from '@stamhoofd/utility';
 import { Context } from '../../../helpers/Context';
 import { MembershipCharger } from '../../../helpers/MembershipCharger';
-import { SimpleError } from '@simonbackx/simple-errors';
 
 
 type Params = Record<string, never>;

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

@@ -43,6 +43,10 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
         const platform = await Platform.getShared()
 
         for (const id of request.body.getDeletes()) {
+            if (!Context.auth.hasPlatformFullAccess()) {
+                throw Context.auth.error('Enkel een platform hoofdbeheerder kan groepen verwijderen')
+            }
+
             const organization = await Organization.getByID(id);
             if (!organization) {
                 throw new SimpleError({ code: "not_found", message: "Organization not found", statusCode: 404 });
@@ -85,6 +89,10 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
 
         // Organization creation
         for (const {put} of request.body.getPuts()) {
+            if (!Context.auth.hasPlatformFullAccess()) {
+                throw Context.auth.error('Enkel een platform hoofdbeheerder kan nieuwe groepen aanmaken')
+            }
+
             if (put.name.length < 4) {
                 if (put.name.length == 0) {
                     throw new SimpleError({

package/src/endpoints/auth/CreateAdminEndpoint.ts

@@ -1,7 +1,7 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
 import { SimpleError } from "@simonbackx/simple-errors";
-import { PasswordToken, sendEmailTemplate, User } from '@stamhoofd/models';
+import { PasswordToken, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
 import { EmailTemplateType, Recipient, Replacement, UserPermissions, User as UserStruct, UserWithMembers } from "@stamhoofd/structures";
 import { Formatter } from '@stamhoofd/utility';
 
@@ -100,9 +100,10 @@ export class CreateAdminEndpoint extends Endpoint<Params, Query, Body, ResponseB
 
         const dateTime = Formatter.dateTime(validUntil)
         const recoveryUrl = await PasswordToken.getPasswordRecoveryUrl(admin, organization, request.i18n, validUntil)
+        const platformName =  ((await Platform.getSharedStruct()).config.name)
         
-        const name = organization?.name ?? request.i18n.t("shared.platformName")
-        const what = organization ? `de vereniging ${name} op ${request.i18n.t("shared.platformName")}` : `${request.i18n.t("shared.platformName")}`
+        const name = organization?.name ?? platformName
+        const what = organization ? `de vereniging ${name} op ${platformName}` : platformName
 
         const emailTo = admin.getEmailTo();
         const email: string = typeof emailTo === 'string' ? emailTo : emailTo[0]?.email;

package/src/endpoints/auth/PatchUserEndpoint.ts

@@ -79,7 +79,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                 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)?.hasFullAccess()) && STAMHOOFD.environment !== 'development') {
                         throw new SimpleError({
                             code: "permission_denied",
                             message: "Je kan jezelf niet verwijderen als hoofdbeheerder"
@@ -96,7 +96,7 @@ export class PatchUserEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                         editUser.permissions = null
                     }
 
-                    if (editUser.id === user.id && !editUser.permissions?.platform?.hasFullAccess()) {
+                    if (editUser.id === user.id && !editUser.permissions?.platform?.hasFullAccess() && STAMHOOFD.environment !== 'development') {
                         throw new SimpleError({
                             code: "permission_denied",
                             message: "Je kan jezelf niet verwijderen als hoofdbeheerder"

package/src/endpoints/global/events/PatchEventsEndpoint.ts

@@ -60,7 +60,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_data',
                     message: 'Invalid organizationId',
-                    human: 'Je kan geen activiteiten voor een specifieke organisatie aanmaken als je geen platform hoofdbeheerder bent',
+                    human: 'Je kan activiteiten aanmaken via het administratieportaal als je geen platform hoofdbeheerder bent',
                 })
             }
             

package/src/endpoints/global/files/ExportToExcelEndpoint.ts

@@ -1,24 +1,23 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import { Decoder, EncodableObject } from '@simonbackx/simple-encoding';
+import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Email } from '@stamhoofd/email';
 import { ArchiverWriterAdapter, exportToExcel, XlsxTransformerSheet, XlsxWriter } from '@stamhoofd/excel-writer';
-import { getEmailBuilderForTemplate, Platform, RateLimiter, sendEmailTemplate } from '@stamhoofd/models';
-import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, LimitedFilteredRequest, PaginatedResponse, Recipient, Replacement, Version } from '@stamhoofd/structures';
+import { Platform, RateLimiter, sendEmailTemplate } from '@stamhoofd/models';
+import { QueueHandler } from '@stamhoofd/queues';
+import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, IPaginatedResponse, LimitedFilteredRequest, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from "@stamhoofd/utility";
 import { Context } from '../../../helpers/Context';
 import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator';
 import { FileCache } from '../../../helpers/FileCache';
-import { QueueHandler } from '@stamhoofd/queues';
 
 type Params = { type: string };
 type Query = undefined;
 type Body = ExcelExportRequest;
 type ResponseBody = ExcelExportResponse;
 
-type ExcelExporter<T extends EncodableObject> = {
-    fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<T[], LimitedFilteredRequest>>
+type ExcelExporter<T> = {
+    fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T[], LimitedFilteredRequest>>
     sheets: XlsxTransformerSheet<T, unknown>[]
 }
 
@@ -36,7 +35,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
     bodyDecoder = ExcelExportRequest as Decoder<ExcelExportRequest>
 
     // Other endpoints can register exports here
-    static loaders: Map<ExcelExportType, ExcelExporter<EncodableObject>> = new Map()
+    static loaders: Map<ExcelExportType, ExcelExporter<unknown>> = new Map()
 
     protected doesMatch(request: Request): [true, Params] | [false] {
         if (request.method != "POST") {
@@ -52,7 +51,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOptionalOrganizationScope();
+        await Context.setOptionalOrganizationScope();
         const {user} = await Context.authenticate()
 
         if (user.isApiUser) {
@@ -138,7 +137,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
         }))
     }
 
-    async job(loader: ExcelExporter<EncodableObject>, request: ExcelExportRequest, type: string): Promise<string> {
+    async job(loader: ExcelExporter<unknown>, request: ExcelExportRequest, type: string): Promise<string> {
         // Only run 1 export per user at the same time
         return await QueueHandler.schedule('user-export-to-excel-' + Context.user!.id, async () => {
             // Allow maximum 2 running Excel jobs at the same time for all users

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

@@ -10,6 +10,8 @@ import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructure
 import { Context } from '../../../helpers/Context';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
 import { SetupStepUpdater } from '../../../helpers/SetupStepsUpdater';
+import { MembershipCharger } from '../../../helpers/MembershipCharger';
+import { QueueHandler } from '@stamhoofd/queues';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -73,6 +75,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         }
 
         const updateMembershipMemberIds = new Set<string>()
+        const updateMembershipsForOrganizations = new Set<string>()
 
         // Loop all members one by one
         for (const put of request.body.getPuts()) {
@@ -470,7 +473,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     })
                 }
 
-                if (!membership.canDelete()) {
+                if (!membership.canDelete() && !Context.auth.hasPlatformFullAccess()) {
                     throw new SimpleError({
                         code: "invalid_field",
                         message: "Invalid invoice",
@@ -478,8 +481,8 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     })
                 }
 
-                membership.deletedAt = new Date()
-                await membership.save()
+                await membership.doDelete();
+                updateMembershipsForOrganizations.add(membership.organizationId) // can influence free memberships in other members of same organization
                 updateMembershipMemberIds.add(member.id)
             }
 
@@ -496,6 +499,14 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             }
         }
 
+        if (updateMembershipsForOrganizations.size) {
+            QueueHandler.schedule('update-membership-prices', async () => {
+                for (const id of updateMembershipsForOrganizations) {
+                    await MembershipCharger.updatePrices(id)
+                }
+            }).catch(console.error);
+        }
+
         if(shouldUpdateSetupSteps && organization) {
             SetupStepUpdater.updateForOrganization(organization).catch(console.error);
         }

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

@@ -1,13 +1,15 @@
-import { AutoEncoderPatchType, Decoder, isPatch, isPatchableArray, patchObject } from "@simonbackx/simple-encoding";
+import { AutoEncoderPatchType, Decoder, isPatchableArray, patchObject } from "@simonbackx/simple-encoding";
 import { DecodedRequest, Endpoint, Request, Response } from "@simonbackx/simple-endpoints";
 import { Organization, Platform, RegistrationPeriod } from "@stamhoofd/models";
 import { MemberResponsibility, PlatformConfig, PlatformPremiseType, Platform as PlatformStruct } from "@stamhoofd/structures";
 
 import { SimpleError } from "@simonbackx/simple-errors";
+import { QueueHandler } from "@stamhoofd/queues";
 import { Context } from "../../../helpers/Context";
-import { SetupStepUpdater } from "../../../helpers/SetupStepsUpdater";
-import { PeriodHelper } from "../../../helpers/PeriodHelper";
+import { MembershipCharger } from "../../../helpers/MembershipCharger";
 import { MembershipHelper } from "../../../helpers/MembershipHelper";
+import { PeriodHelper } from "../../../helpers/PeriodHelper";
+import { SetupStepUpdater } from "../../../helpers/SetupStepsUpdater";
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -174,7 +176,12 @@ export class PatchPlatformEndpoint extends Endpoint<
         await platform.save();
 
         if (shouldUpdateMemberships) {
-            MembershipHelper.updateAll().catch(console.error)
+            if (!QueueHandler.isRunning('update-membership-prices')) {
+                QueueHandler.schedule('update-membership-prices', async () => {
+                    await MembershipCharger.updatePrices()
+                    await MembershipHelper.updateAll()
+                }).catch(console.error);
+            }
         }
 
         if (shouldMoveToPeriod) {

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

@@ -37,12 +37,22 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope();
-        const {user} = await Context.authenticate()
+        const organization = await Context.setOrganizationScope({allowInactive: true});
+        await Context.authenticate()
 
         if (!await Context.auth.hasSomeAccess(organization.id)) {
             throw Context.auth.error()
         }
+
+        if (!organization.active && !Context.auth.hasPlatformFullAccess()) {
+            throw new SimpleError({
+                code: "permission_denied",
+                message: "You do not have permissions to edit an inactive organization",
+                human: 'Je hebt geen toegangsrechten om een inactieve groep te bewerken',
+                statusCode: 403
+            })
+
+        }
         
         // check if organization ID matches
         if (request.body.id !== organization.id) {
@@ -295,6 +305,13 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 }
             }
 
+            if (request.body.active !== undefined) {
+                if (!Context.auth.hasPlatformFullAccess()) {
+                    throw Context.auth.error('Enkel een platform hoofdbeheerder kan een groep (in)actief maken')
+                }
+                organization.active = request.body.active;
+            }
+
             if (request.body.uri) {
                 if (!Context.auth.hasPlatformFullAccess()) {
                     throw Context.auth.error()

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

@@ -46,7 +46,7 @@ export class ExchangePaymentEndpoint extends Endpoint<Params, Query, Body, Respo
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        const organization = await Context.setOrganizationScope()
+        const organization = await Context.setOptionalOrganizationScope()
         if (!request.query.exchange) {
             await Context.authenticate()
         }
@@ -152,7 +152,7 @@ export class ExchangePaymentEndpoint extends Endpoint<Params, Query, Body, Respo
     /**
      * ID of payment is needed because of race conditions (need to fetch payment in a race condition save queue)
      */
-    static async pollStatus(paymentId: string, organization: Organization, cancel = false): Promise<Payment | undefined> {
+    static async pollStatus(paymentId: string, org: Organization|null, cancel = false): Promise<Payment | undefined> {
         // Prevent polling the same payment multiple times at the same time: create a queue to prevent races
         QueueHandler.cancel("payments/"+paymentId); // Prevent creating more than one queue item for the same payment
         return await QueueHandler.schedule("payments/"+paymentId, async () => {
@@ -162,6 +162,17 @@ export class ExchangePaymentEndpoint extends Endpoint<Params, Query, Body, Respo
                 return
             }
 
+            if (!payment.organizationId) {
+                console.error('Payment without organization not supported', payment.id)
+                return
+            }
+
+            const organization = org ?? await Organization.getByID(payment.organizationId)
+            if (!organization) {
+                console.error('Organization not found for payment', payment.id)
+                return
+            }
+
             const testMode = organization.privateMeta.useTestPayments ?? STAMHOOFD.environment != 'production'
 
             if (payment.status == PaymentStatus.Pending || payment.status == PaymentStatus.Created || (payment.provider === PaymentProvider.Buckaroo && payment.status == PaymentStatus.Failed)) {

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

@@ -26,7 +26,7 @@ export class GetPaymentEndpoint extends Endpoint<Params, Query, Body, ResponseBo
     }
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
-        await Context.setOrganizationScope()
+        await Context.setOptionalOrganizationScope()
         await Context.authenticate()
 
         const payment = await Payment.getByID(request.params.id);

package/src/excel-loaders/members.ts

@@ -1,16 +1,22 @@
 import { XlsxBuiltInNumberFormat } from "@stamhoofd/excel-writer";
-import { ExcelExportType, Gender, LimitedFilteredRequest, MemberWithRegistrationsBlob, PaginatedResponse, Platform } from "@stamhoofd/structures";
+import { Platform } from "@stamhoofd/models";
+import { ExcelExportType, Gender, GroupType, LimitedFilteredRequest, MemberWithRegistrationsBlob, PlatformFamily, PlatformMember, UnencodeablePaginatedResponse, Platform as PlatformStruct } from "@stamhoofd/structures";
 import { ExportToExcelEndpoint } from "../endpoints/global/files/ExportToExcelEndpoint";
 import { GetMembersEndpoint } from "../endpoints/global/members/GetMembersEndpoint";
 import { Context } from "../helpers/Context";
 import { XlsxTransformerColumnHelper } from "../helpers/xlsxAddressTransformerColumnFactory";
+import { Formatter } from "@stamhoofd/utility";
+import { AuthenticatedStructures } from "../helpers/AuthenticatedStructures";
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
     fetch: async (query: LimitedFilteredRequest) => {
         const result = await GetMembersEndpoint.buildData(query)
 
-        return new PaginatedResponse({
-            results: result.results.members,
+        return new UnencodeablePaginatedResponse({
+            results: PlatformFamily.createSingles(result.results, {
+                contextOrganization: Context.organization ? (await AuthenticatedStructures.organization(Context.organization)) : null,
+                platform: await Platform.getSharedStruct()
+            }),
             next: result.next
         });
     },
@@ -23,7 +29,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'id',
                     name: 'ID',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.id
                     })
                 },
@@ -31,7 +37,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'memberNumber',
                     name: 'Nummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.memberNumber
                     })
                 },
@@ -39,7 +45,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'firstName',
                     name: 'Voornaam',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.firstName
                     })
                 },
@@ -47,7 +53,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'lastName',
                     name: 'Achternaam',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.lastName
                     })
                 },
@@ -55,7 +61,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'birthDay',
                     name: 'Geboortedatum',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.birthDay,
                         style: {
                             numberFormat: {
@@ -68,7 +74,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'age',
                     name: 'Leeftijd',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.age,
                     })
                 },
@@ -76,7 +82,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'gender',
                     name: 'Geslacht',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => {
+                    getValue: ({patchedMember: object}: PlatformMember) => {
                         const gender = object.details.gender;
 
                         return ({
@@ -88,7 +94,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'phone',
                     name: 'Telefoonnummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.phone,
                     })
                 },
@@ -96,14 +102,14 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'email',
                     name: 'E-mailadres',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.email,
                     })
                 },
-                XlsxTransformerColumnHelper.createAddressColumns<MemberWithRegistrationsBlob>({
+                XlsxTransformerColumnHelper.createAddressColumns<PlatformMember>({
                     matchId: 'address',
                     identifier: 'Adres',
-                    getAddress: (object) => {
+                    getAddress: ({patchedMember: object}: PlatformMember) => {
                         // get member address if exists
                         const memberAddress = object.details.address;
                         if(memberAddress) {
@@ -124,7 +130,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'securityCode',
                     name: 'Beveiligingscode',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.securityCode,
                     })
                 },
@@ -132,7 +138,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'uitpasNumber',
                     name: 'UiTPAS-nummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.uitpasNumber,
                     })
                 },
@@ -141,7 +147,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     // todo: use correct term
                     name: 'Financiële ondersteuning',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: XlsxTransformerColumnHelper.formatBoolean(object.details.requiresFinancialSupport?.value),
                     })
                 },
@@ -149,11 +155,69 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'notes',
                     name: 'Notities',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.notes,
                     })
                 },
 
+                {
+                    id: 'organization',
+                    name: 'Groep',
+                    width: 40,
+                    getValue: (member: PlatformMember) => {
+                        const organizations =  member.filterOrganizations({currentPeriod: true, types: [GroupType.Membership]})
+                        const str = Formatter.joinLast(organizations.map(o => o.name).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'uri',
+                    name: 'Groepsnummer',
+                    width: 30,
+                    getValue: (member: PlatformMember) => {
+                        const organizations =  member.filterOrganizations({currentPeriod: true, types: [GroupType.Membership]})
+                        const str = Formatter.joinLast(organizations.map(o => o.uri).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'group',
+                    name: 'Leeftijdsgroep',
+                    width: 40,
+                    getValue: (member: PlatformMember) => {
+                        const groups =  member.filterRegistrations({currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id})
+                        const str = Formatter.joinLast(Formatter.uniqueArray(groups.map(o => o.group.settings.name)).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'defaultAgeGroup',
+                    name: 'Standaard leeftijdsgroep',
+                    width: 40,
+                    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 ?? 'verwijderde leeftijdsgroep')
+                        const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
                 ...XlsxTransformerColumnHelper.creatColumnsForParents(),
 
                 // unverified data
@@ -161,7 +225,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedPhones',
                     name: 'Niet-geverifieerde telefoonnummers',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedPhones.join(', '),
                     })
                 },
@@ -169,7 +233,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedEmails',
                     name: 'Niet-geverifieerde e-mailadressen',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedEmails.join(', '),
                     })
                 },
@@ -183,7 +247,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedAddresses',
                     name: 'Niet-geverifieerde adressen',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedAddresses.map(a => a.toString()).join('; '),
                     })
                 },
@@ -191,9 +255,8 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                 // Dynamic records
                 {
                     match(id) {
-                        console.log('match', id)
                         if (id.startsWith('recordAnswers.')) {
-                            const platform = Platform.shared
+                            const platform = PlatformStruct.shared
                             const organization = Context.organization
 
                             const recordSettings = [
@@ -219,7 +282,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                                     id: `recordAnswers.${recordSettingId}.${index}`,
                                     name: columnName,
                                     width: 20,
-                                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                                    getValue: ({patchedMember: object}: PlatformMember) => ({
                                         value: object.details.recordAnswers.get(recordSettingId)?.excelValues[index]?.value ?? ''
                                     })
                                 }

package/src/helpers/Context.ts

@@ -133,8 +133,8 @@ export class ContextInstance {
         return await this.setOrganizationScope()
     }
 
-    async setOrganizationScope() {
-        const organization = await Organization.fromApiHost(this.request.host);
+    async setOrganizationScope(options?: {allowInactive?: boolean}) {
+        const organization = await Organization.fromApiHost(this.request.host, options);
 
         this.organization = organization
         this.i18n.switchToLocale({ country: organization.address.country })

package/src/helpers/MembershipCharger.ts

@@ -27,6 +27,7 @@ export const MembershipCharger = {
 
         let createdCount = 0;
         let createdPrice = 0;
+        const chunkSize = 100;
 
         // eslint-disable-next-line no-constant-condition
         while (true) {
@@ -35,7 +36,7 @@ export const MembershipCharger = {
                 .where('balanceItemId', null)
                 .where('deletedAt', null)
                 .whereNot('organizationId', chargeVia)
-                .limit(100)
+                .limit(chunkSize)
                 .orderBy(
                     new SQLOrderBy({
                         column: SQL.column('id'),
@@ -57,6 +58,7 @@ export const MembershipCharger = {
                 if (membership.balanceItemId) {
                     continue;
                 }
+
                 const type = getType(membership.membershipTypeId);
                 if (!type) {
                     console.error('Unknown membership type id ', membership.membershipTypeId)
@@ -74,6 +76,14 @@ export const MembershipCharger = {
                     continue;
                 }
 
+                // Force price update (required because could have changed - especially for free memberships in combination with deletes)
+                try {
+                    await membership.calculatePrice(member)
+                } catch (e) {
+                    console.error('Failed to update price for membership. Not charged.', membership.id, e)
+                    continue;
+                }
+
                 const balanceItem = new BalanceItem();
                 balanceItem.unitPrice = membership.price
                 balanceItem.amount = 1
@@ -101,6 +111,7 @@ export const MembershipCharger = {
 
                 await balanceItem.save();
                 membership.balanceItemId = balanceItem.id;
+                membership.maximumFreeAmount = membership.freeAmount;
                 await membership.save()
 
                 createdBalanceItems.push(balanceItem)
@@ -111,7 +122,7 @@ export const MembershipCharger = {
 
             await BalanceItem.updateOutstanding(createdBalanceItems)
 
-            if (memberships.length < 100) {
+            if (memberships.length < chunkSize) {
                 break;
             }
             
@@ -124,5 +135,76 @@ export const MembershipCharger = {
         }
 
         console.log('Charged ' + Formatter.integer(createdCount) +'  memberships, for a total value of ' + Formatter.price(createdPrice))
+    },
+
+    async updatePrices(organizationId?: string) {
+        console.log('Update prices...')
+        
+        // Loop all
+        let lastId = "";
+        let createdCount = 0;
+        const chunkSize = 100;
+
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const q = MemberPlatformMembership.select()
+                .where('id', SQLWhereSign.Greater, lastId)
+                .where('balanceItemId', null)
+                .where('deletedAt', null);
+
+            if (organizationId) {
+                q.where('organizationId', organizationId)
+            }
+                
+            const memberships = await q
+                .limit(chunkSize)
+                .orderBy(
+                    new SQLOrderBy({
+                        column: SQL.column('id'),
+                        direction: 'ASC'
+                    })
+                )
+                .fetch();
+        
+            if (memberships.length === 0) {
+                break;
+            }
+
+            const memberIds = Formatter.uniqueArray(memberships.map(m => m.memberId))
+            const members = await Member.getByIDs(...memberIds)
+
+            for (const membership of memberships) {
+                const member = members.find(m => m.id === membership.memberId)
+
+                if (!member) {
+                    console.error('Unexpected missing member id ', membership.memberId, 'for membership', membership.id)
+                    continue;
+                }
+
+                // Force price update (required because could have changed - especially for free memberships in combination with deletes)
+                try {
+                    await membership.calculatePrice(member)
+                    await membership.save()
+                } catch (e) {
+                    console.error('Failed to update price for membership', membership.id, e)
+                    continue;
+                }
+                console.log('Updated price for membership', membership.id, membership.price)
+                createdCount += 1;
+            }
+
+            if (memberships.length < chunkSize) {
+                break;
+            }
+            
+            const z = lastId;
+            lastId = memberships[memberships.length - 1].id;
+
+            if (lastId === z) {
+                throw new Error('Unexpected infinite loop found in MembershipCharger')
+            }
+        }
+
+        console.log('Updated prices of ' + Formatter.integer(createdCount) +'  memberships')
     }
 };

package/src/helpers/fetchToAsyncIterator.ts

@@ -1,10 +1,9 @@
-import { EncodableObject } from "@simonbackx/simple-encoding";
-import { LimitedFilteredRequest, PaginatedResponse } from "@stamhoofd/structures";
+import { IPaginatedResponse, LimitedFilteredRequest } from "@stamhoofd/structures";
 
-export function fetchToAsyncIterator<T extends EncodableObject>(
+export function fetchToAsyncIterator<T>(
     initialFilter: LimitedFilteredRequest, 
     loader: {
-        fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<T, LimitedFilteredRequest>>
+        fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T, LimitedFilteredRequest>>
     }
 ): AsyncIterable<T> {
     return {