@stamhoofd/backend 2.53.0 → 2.54.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.53.0",
+    "version": "2.54.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.16.6",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.53.0",
-        "@stamhoofd/backend-middleware": "2.53.0",
-        "@stamhoofd/email": "2.53.0",
-        "@stamhoofd/models": "2.53.0",
-        "@stamhoofd/queues": "2.53.0",
-        "@stamhoofd/sql": "2.53.0",
-        "@stamhoofd/structures": "2.53.0",
-        "@stamhoofd/utility": "2.53.0",
+        "@stamhoofd/backend-i18n": "2.54.0",
+        "@stamhoofd/backend-middleware": "2.54.0",
+        "@stamhoofd/email": "2.54.0",
+        "@stamhoofd/models": "2.54.0",
+        "@stamhoofd/queues": "2.54.0",
+        "@stamhoofd/sql": "2.54.0",
+        "@stamhoofd/structures": "2.54.0",
+        "@stamhoofd/utility": "2.54.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -63,5 +63,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "d202fb8d4a234f7369c3da54ba15f2b10b82e74e"
+    "gitHead": "d895bc5e468a87792398ca4e762d1216bf750baf"
 }

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

@@ -1,7 +1,7 @@
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { Event, Group, Platform, RegistrationPeriod } from '@stamhoofd/models';
-import { Event as EventStruct, GroupType, NamedObject } from '@stamhoofd/structures';
+import { Event as EventStruct, GroupType, NamedObject, Group as GroupStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
@@ -218,6 +218,15 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                     event.groupId = group.id;
                 }
             }
+            else {
+                if (patch.startDate || patch.endDate) {
+                    // Correct period id if needed
+                    const period = await RegistrationPeriod.getByDate(event.startDate);
+                    if (event.groupId) {
+                        await PatchOrganizationRegistrationPeriodsEndpoint.patchGroup(GroupStruct.patch({ id: event.groupId }), period);
+                    }
+                }
+            }
 
             if (type.isLocationRequired === true) {
                 PatchEventsEndpoint.throwIfAddressIsMissing(event);

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

@@ -8,6 +8,7 @@ import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
 import { QueueHandler } from '@stamhoofd/queues';
+import { SQL, SQLWhereSign } from '@stamhoofd/sql';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../helpers/Context';
 import { MembershipCharger } from '../../../helpers/MembershipCharger';
@@ -440,10 +441,32 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 }
 
                 // Check duplicate memberships
-
-                // Check dates
-
-                // Calculate prices
+                const existing = await MemberPlatformMembership.select()
+                    .where('memberId', member.id)
+                    .where('membershipTypeId', put.membershipTypeId)
+                    .where('periodId', put.periodId)
+                    .where(
+                        SQL.where('startDate', SQLWhereSign.LessEqual, put.startDate)
+                            .and('endDate', SQLWhereSign.GreaterEqual, put.startDate),
+                    )
+                    .orWhere(
+                        SQL.where('startDate', SQLWhereSign.LessEqual, put.endDate)
+                            .and('endDate', SQLWhereSign.GreaterEqual, put.endDate),
+                    )
+                    .orWhere(
+                        SQL.where('startDate', SQLWhereSign.GreaterEqual, put.startDate)
+                            .and('endDate', SQLWhereSign.LessEqual, put.endDate),
+                    )
+                    .first(false);
+
+                if (existing) {
+                    throw new SimpleError({
+                        code: 'invalid_field',
+                        field: 'startDate',
+                        message: 'Invalid start date',
+                        human: 'Je kan geen aansluiting toevoegen die overlapt met een bestaande aansluiting van hetzelfde type',
+                    });
+                }
 
                 const membership = new MemberPlatformMembership();
                 membership.id = put.id;

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

@@ -408,7 +408,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem2.memberId = registration.memberId;
 
                 // If the paying organization hasn't paid yet, this should be hidden and move to pending as soon as the paying organization has paid
-                balanceItem2.status = shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+                balanceItem2.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
                 await balanceItem2.save();
 
                 // do not add to createdBalanceItems array because we don't want to add this to the payment if we create a payment
@@ -419,7 +419,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem.userId = user.id;
             }
 
-            balanceItem.status = shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
             balanceItem.pricePaid = 0;
 
             // Connect the 'pay back' balance item to this balance item. As soon as this balance item is paid, we'll mark the other one as pending so the outstanding balance for the member increases
@@ -434,24 +434,24 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             const { item, registration } = bundle;
             registration.reservedUntil = null;
 
-            if (shouldMarkValid) {
+            /* if (shouldMarkValid) {
                 await registration.markValid({ skipEmail: bundle.item.replaceRegistrations.length > 0 });
             }
-            else {
-                // Reserve registration for 30 minutes (if needed)
-                const group = groups.find(g => g.id === registration.groupId);
+            else { */
+            // Reserve registration for 30 minutes (if needed)
+            const group = groups.find(g => g.id === registration.groupId);
 
-                if (group && group.settings.maxMembers !== null) {
-                    registration.reservedUntil = new Date(new Date().getTime() + 1000 * 60 * 30);
-                }
-                await registration.save();
+            if (group && group.settings.maxMembers !== null) {
+                registration.reservedUntil = new Date(new Date().getTime() + 1000 * 60 * 30);
             }
+            await registration.save();
+            // }
 
             // Note: we should always create the balance items: even when the price is zero
             // Otherwise we don't know which registrations to activate after payment
 
             if (shouldMarkValid && item.calculatedPrice === 0) {
-                continue;
+                // continue;
             }
 
             // Create balance items
@@ -538,7 +538,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (oldestMember) {
                 balanceItem.memberId = oldestMember.id;
             }
-            balanceItem.status = shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
             await balanceItem.save();
             createdBalanceItems.push(balanceItem);
         }
@@ -563,7 +563,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 }
             }
 
-            balanceItem.status = shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
+            balanceItem.status = BalanceItemStatus.Hidden; // shouldMarkValid ? BalanceItemStatus.Pending : BalanceItemStatus.Hidden;
             await balanceItem.save();
 
             createdBalanceItems.push(balanceItem);
@@ -580,6 +580,16 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         let paymentUrl: string | null = null;
         let payment: Payment | null = null;
 
+        // Delaying markign as valid as late as possible so any errors will prevent creating valid balance items
+        async function markValidIfNeeded() {
+            if (shouldMarkValid) {
+                for (const balanceItem of [...createdBalanceItems, ...unrelatedCreatedBalanceItems]) {
+                    // Mark vlaid
+                    await balanceItem.markPaid(payment, organization);
+                }
+            }
+        }
+
         if (whoWillPayNow !== 'nobody') {
             const mappedBalanceItems = new Map<BalanceItem, number>();
 
@@ -606,6 +616,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     checkout: request.body,
                     members,
                 });
+                await markValidIfNeeded();
 
                 if (response) {
                     paymentUrl = response.paymentUrl;
@@ -618,6 +629,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
         }
         else {
+            await markValidIfNeeded();
             await BalanceItem.updateOutstanding([...createdBalanceItems, ...unrelatedCreatedBalanceItems]);
         }
 

package/src/excel-loaders/members.ts

@@ -96,7 +96,6 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
         },
         XlsxTransformerColumnHelper.createAddressColumns<PlatformMember>({
             matchId: 'address',
-            identifier: 'Adres',
             getAddress: ({ patchedMember: object }: PlatformMember) => {
                 // get member address if exists
                 const memberAddress = object.details.address;
@@ -227,7 +226,6 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
         },
         ...XlsxTransformerColumnHelper.createColumnsForAddresses<PlatformMember>({
             matchIdStart: 'unverifiedAddresses',
-            identifier: 'Niet-geverifieerd adres',
             getAddresses: object => object.patchedMember.details.unverifiedAddresses,
             limit: 2,
         }),
@@ -277,6 +275,153 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
                 }
             },
         },
+
+        // Registration records
+        {
+            match(id) {
+                if (id.startsWith('groups.')) {
+                    const splitted = id.split('.');
+                    if (splitted.length < 3) {
+                        return;
+                    }
+
+                    const groupId = splitted[1];
+                    const recordName = splitted[2];
+
+                    function getRegistration(object: PlatformMember) {
+                        return object.filterRegistrations({ groupIds: [groupId] })[0] ?? null;
+                    }
+
+                    if (recordName === 'price') {
+                        // Tarief
+                        return [
+                            {
+                                id: `groups.${groupId}.${recordName}`,
+                                name: 'Tarief',
+                                width: 30,
+                                getValue: (member: PlatformMember) => {
+                                    const registration = getRegistration(member);
+                                    if (!registration) {
+                                        return {
+                                            value: '',
+                                        };
+                                    }
+
+                                    return {
+                                        value: registration.groupPrice.name,
+                                    };
+                                },
+                            },
+                        ];
+                    }
+
+                    if (recordName === 'optionMenu') {
+                        if (splitted.length < 4) {
+                            return;
+                        }
+
+                        const menuId = splitted[3];
+
+                        if (splitted.length > 4) {
+                            const optionId = splitted[4];
+                            const returnAmount = splitted.length > 5 && splitted[5] === 'amount';
+
+                            // Option menu
+                            return [
+                                {
+                                    id: `groups.${groupId}.${recordName}.${menuId}.${optionId}${returnAmount ? '.amount' : ''}`,
+                                    name: 'Keuzemenu aantal',
+                                    width: 30,
+                                    getValue: (member: PlatformMember) => {
+                                        const registration = getRegistration(member);
+                                        if (!registration) {
+                                            return {
+                                                value: '',
+                                            };
+                                        }
+                                        const options = registration.options.filter(o => o.optionMenu.id === menuId && o.option.id === optionId);
+
+                                        if (!options.length) {
+                                            return {
+                                                value: '',
+                                            };
+                                        }
+
+                                        return {
+                                            style: options.length === 1 && returnAmount
+                                                ? {
+                                                        numberFormat: {
+                                                            id: XlsxBuiltInNumberFormat.Number,
+                                                        },
+                                                    }
+                                                : {},
+                                            value: options.length === 1 && returnAmount ? options[0].amount : options.map(option => returnAmount ? option.amount : option).join(', '),
+                                        };
+                                    },
+                                },
+                            ];
+                        }
+
+                        // Option menu
+                        return [
+                            {
+                                id: `groups.${groupId}.${recordName}.${menuId}`,
+                                name: 'Keuzemenu',
+                                width: 30,
+                                getValue: (member: PlatformMember) => {
+                                    const registration = getRegistration(member);
+                                    if (!registration) {
+                                        return {
+                                            value: '',
+                                        };
+                                    }
+                                    const options = registration.options.filter(o => o.optionMenu.id === menuId);
+
+                                    if (!options.length) {
+                                        return {
+                                            value: '',
+                                        };
+                                    }
+
+                                    return {
+                                        value: options.map(option => (option.amount > 1 ? `${option.amount}x ` : '') + option.option.name).join(', '),
+                                    };
+                                },
+                            },
+                        ];
+                    }
+
+                    if (recordName === 'recordAnswers') {
+                        if (splitted.length < 4) {
+                            return;
+                        }
+
+                        const recordId = splitted[3];
+                        return [
+                            {
+                                id: `groups.${groupId}.${recordName}.${recordId}`,
+                                name: 'Vraag',
+                                width: 35,
+                                getValue: (member: PlatformMember) => {
+                                    const registration = getRegistration(member);
+                                    if (!registration) {
+                                        return {
+                                            value: '',
+                                        };
+                                    }
+
+                                    return {
+                                        value: registration.recordAnswers.get(recordId)?.excelValues[0]?.value ?? '',
+                                    };
+                                },
+                            },
+                        ];
+                    }
+
+                    return;
+                }
+            },
+        },
     ],
 };
 

package/src/excel-loaders/organizations.ts

@@ -1,18 +1,40 @@
 import { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
-import { ExcelExportType, LimitedFilteredRequest, Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { Platform as PlatformStruct, ExcelExportType, LimitedFilteredRequest, Organization as OrganizationStruct, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, PaginatedResponse, MemberWithRegistrationsBlob, Premise } from '@stamhoofd/structures';
 import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
+import { XlsxTransformerColumnHelper } from '../helpers/xlsxAddressTransformerColumnFactory';
+import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
+import { Formatter, Sorter } from '@stamhoofd/utility';
+import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
+import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
+
+class MemberResponsibilityRecordWithMember extends MemberResponsibilityRecordStruct {
+    @field({ decoder: MemberWithRegistrationsBlob })
+    member: MemberWithRegistrationsBlob;
+}
+
+class OrganizationWithResponsibilities extends OrganizationStruct {
+    @field({ decoder: new ArrayDecoder(MemberResponsibilityRecordWithMember) })
+    responsibilities: MemberResponsibilityRecordWithMember[];
+}
+
+class MemberResponsibilityRecordWithMemberAndOrganization extends MemberResponsibilityRecordWithMember {
+    @field({ decoder: OrganizationWithResponsibilities })
+    organization: OrganizationWithResponsibilities;
+}
+
+type Object = OrganizationWithResponsibilities;
 
 // Assign to a typed variable to assure we have correct type checking in place
-const sheet: XlsxTransformerSheet<OrganizationStruct, OrganizationStruct> = {
+const sheet: XlsxTransformerSheet<Object, Object> = {
     id: 'organizations',
-    name: 'Leden',
+    name: 'Groepen',
     columns: [
         {
             id: 'id',
             name: 'ID',
-            width: 20,
-            getValue: (object: OrganizationStruct) => ({
+            width: 35,
+            getValue: (object: Object) => ({
                 value: object.id,
             }),
         },
@@ -20,7 +42,7 @@ const sheet: XlsxTransformerSheet<OrganizationStruct, OrganizationStruct> = {
             id: 'uri',
             name: 'Groepsnummer',
             width: 20,
-            getValue: (object: OrganizationStruct) => ({
+            getValue: (object: Object) => ({
                 value: object.uri,
             }),
         },
@@ -28,20 +50,241 @@ const sheet: XlsxTransformerSheet<OrganizationStruct, OrganizationStruct> = {
             id: 'name',
             name: 'Naam',
             width: 50,
-            getValue: (object: OrganizationStruct) => ({
+            getValue: (object: Object) => ({
                 value: object.name,
             }),
         },
+        {
+            id: 'tags',
+            name: 'Tags',
+            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 ?? 'Onbekend').join(', '),
+                };
+            },
+        },
+        XlsxTransformerColumnHelper.createAddressColumns<OrganizationStruct>({
+            matchId: 'address',
+            getAddress: object => object.address,
+        }),
+    ],
+};
+
+const responsibilities: XlsxTransformerSheet<Object, MemberResponsibilityRecordWithMemberAndOrganization> = {
+    id: 'responsibilities',
+    name: 'Functies',
+    transform(organization) {
+        return organization.responsibilities.map(r => MemberResponsibilityRecordWithMemberAndOrganization.create({
+            ...r,
+            organization,
+        }));
+    },
+    columns: [
+        {
+            id: 'organization.id',
+            name: 'ID',
+            width: 35,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.organization.id,
+            }),
+        },
+        {
+            id: 'organization.uri',
+            name: 'Groepsnummer',
+            width: 20,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.organization.uri,
+            }),
+        },
+        {
+            id: 'organization.name',
+            name: 'Groepsnaam',
+            width: 50,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.organization.name,
+            }),
+        },
+        {
+            id: 'responsibility.name',
+            name: 'Functie',
+            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) {
+                    return {
+                        value: 'Onbekende functie',
+                    };
+                }
+
+                return {
+                    value: responsibility.name + (responsibility.isGroupBased ? ' van ' + (object.group?.settings.name ?? 'Onbekende groep') : ''),
+                };
+            },
+        },
+        {
+            id: 'responsibility.member.firstName',
+            name: 'Voornaam',
+            width: 30,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.member.firstName,
+            }),
+        },
+        {
+            id: 'responsibility.member.lastName',
+            name: 'Achternaam',
+            width: 30,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.member.details.lastName,
+            }),
+        },
+        {
+            id: 'responsibility.member.email',
+            name: 'E-mailadres lid',
+            width: 50,
+            getValue: (object: MemberResponsibilityRecordWithMemberAndOrganization) => ({
+                value: object.member.details.email,
+            }),
+        },
+        XlsxTransformerColumnHelper.createAddressColumns<MemberResponsibilityRecordWithMemberAndOrganization>({
+            matchId: 'responsibility.member.address',
+            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> = {
+    id: 'premises',
+    name: 'Lokalen',
+    transform(organization) {
+        return organization.privateMeta?.premises.map(r => ({
+            organization,
+            premise: r,
+        })) ?? [];
+    },
+    columns: [
+        {
+            id: 'organization.id',
+            name: 'ID',
+            width: 35,
+            getValue: (object: PremiseWithOrganization) => ({
+                value: object.organization.id,
+            }),
+        },
+        {
+            id: 'organization.uri',
+            name: 'Groepsnummer',
+            width: 20,
+            getValue: (object: PremiseWithOrganization) => ({
+                value: object.organization.uri,
+            }),
+        },
+        {
+            id: 'organization.name',
+            name: 'Groepsnaam',
+            width: 50,
+            getValue: (object: PremiseWithOrganization) => ({
+                value: object.organization.name,
+            }),
+        },
+        {
+            id: 'premise.name',
+            name: 'Naam',
+            width: 20,
+            getValue: (object: PremiseWithOrganization) => ({
+                value: object.premise.name,
+            }),
+        },
+        {
+            id: 'premise.type',
+            name: 'Type',
+            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 ?? 'Onbekend').join(', '),
+                };
+            },
+        },
+        XlsxTransformerColumnHelper.createAddressColumns<PremiseWithOrganization>({
+            matchId: 'premise.address',
+            getAddress: object => object.premise.address,
+        }),
     ],
 };
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Organizations, {
     fetch: async (query: LimitedFilteredRequest) => {
-        const result = await GetOrganizationsEndpoint.buildData(query);
+        const organizations = await GetOrganizationsEndpoint.buildData(query);
+
+        // Now load all responsibilities with members with an active responsibility for theses organizations
+        const organizationIds = organizations.results.map(o => o.id);
+        const responsibilities = organizationIds.length
+            ? await MemberResponsibilityRecord.select()
+                .where('organizationId', organizationIds)
+                .where('endDate', null)
+                .fetch()
+            : [];
+
+        // Load groups and members
+        const groupIds = Formatter.uniqueArray(responsibilities.map(o => o.groupId).filter(g => g !== null));
+        const memberIds = Formatter.uniqueArray(responsibilities.map(o => o.memberId).filter(m => m !== null));
+
+        const members = await Member.getBlobByIds(...memberIds);
+        const groups = await Group.getByIDs(...groupIds);
+        const memberStructs = await AuthenticatedStructures.members(members);
+        const groupStructs = await AuthenticatedStructures.groups(groups);
+        const platform = PlatformStruct.shared;
+
+        const mappedOrganizations = organizations.results.map((o) => {
+            const resp = responsibilities.filter(r => r.organizationId === o.id);
+
+            const mappedResponsibilities = resp.map((r) => {
+                const member = memberStructs.find(m => m.id === r.memberId);
+                const group = groupStructs.find(g => g.id === r.groupId);
+
+                return MemberResponsibilityRecordWithMember.create({
+                    ...r,
+                    member: member,
+                    group: group ? group : null,
+                });
+            });
+
+            // Sort responsibilites by index in platform config
+            // and, if the same, sort by order of default age group id if it has a group
+            mappedResponsibilities.sort((a, b) => {
+                const aIndex = platform.config.responsibilities.findIndex(r => r.id === a.responsibilityId);
+                const bIndex = platform.config.responsibilities.findIndex(r => r.id === b.responsibilityId);
+
+                const groupAIndex = platform.config.defaultAgeGroups.findIndex(g => g.id === a.group?.defaultAgeGroupId);
+                const groupBIndex = platform.config.defaultAgeGroups.findIndex(g => g.id === b.group?.defaultAgeGroupId);
+
+                return Sorter.stack(
+                    aIndex - bIndex,
+                    groupAIndex - groupBIndex,
+                );
+            });
+
+            return OrganizationWithResponsibilities.create({
+                ...o,
+                responsibilities: mappedResponsibilities,
+            });
+        });
 
-        return result;
+        return new PaginatedResponse({
+            results: mappedOrganizations,
+            next: organizations.next,
+        });
     },
     sheets: [
         sheet,
+        responsibilities,
+        premises,
     ],
 });

package/src/excel-loaders/payments.ts

@@ -479,7 +479,6 @@ function getPayingOrganizationColumns(): XlsxTransformerColumn<PaymentGeneral>[]
         XlsxTransformerColumnHelper.createAddressColumns<PaymentGeneralWithStripeAccount>({
             matchId: 'payingOrganization.address',
             getAddress: object => object.payingOrganization?.address,
-            identifier: 'Adres betalende groep',
         }),
     ];
 }
@@ -539,7 +538,6 @@ function getInvoiceColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
         XlsxTransformerColumnHelper.createAddressColumns<PaymentGeneralWithStripeAccount>({
             matchId: 'customer.company.address',
             getAddress: object => object.customer?.company?.address,
-            identifier: 'Adres',
         }),
         {
             id: 'customer.company.administrationEmail',

package/src/helpers/AdminPermissionChecker.ts

@@ -131,7 +131,10 @@ export class AdminPermissionChecker {
         if (organizationId) {
             // If request is scoped to a different organization
             if (this.organization && organizationId !== this.organization.id) {
-                return false;
+                if (STAMHOOFD.userMode === 'organization') {
+                    return false;
+                }
+                // Otherwise allow for convenience
             }
 
             // If user is limited to scope

package/src/helpers/AuthenticatedStructures.ts

@@ -315,6 +315,10 @@ export class AuthenticatedStructures {
         return structs;
     }
 
+    static async members(members: MemberWithRegistrations[]): Promise<MemberWithRegistrationsBlob[]> {
+        return (await this.membersBlob(members, false)).members;
+    }
+
     static async membersBlob(members: MemberWithRegistrations[], includeContextOrganization = false, includeUser?: User): Promise<MembersBlob> {
         if (members.length === 0 && !includeUser) {
             return MembersBlob.create({ members: [], organizations: [] });

package/src/helpers/xlsxAddressTransformerColumnFactory.ts

@@ -1,5 +1,5 @@
 import { XlsxTransformerColumn } from '@stamhoofd/excel-writer';
-import { Address, CountryHelper, MemberWithRegistrationsBlob, Parent, ParentTypeHelper, PlatformMember } from '@stamhoofd/structures';
+import { Address, CountryHelper, Parent, ParentTypeHelper, PlatformMember } from '@stamhoofd/structures';
 
 export class XlsxTransformerColumnHelper {
     static formatBoolean(value: boolean | undefined | null): string {
@@ -21,14 +21,13 @@ export class XlsxTransformerColumnHelper {
         ];
     }
 
-    static createColumnsForAddresses<T>({ limit, getAddresses, matchIdStart, identifier }: { limit: number; getAddresses: (object: T) => Address[]; matchIdStart: string; identifier: string }): XlsxTransformerColumn<T>[] {
+    static createColumnsForAddresses<T>({ limit, getAddresses, matchIdStart }: { limit: number; getAddresses: (object: T) => Address[]; matchIdStart: string }): XlsxTransformerColumn<T>[] {
         const result: XlsxTransformerColumn<unknown>[] = [];
 
         for (let i = 0; i <= limit; i++) {
             const column = this.createAddressColumns({
                 matchId: `${matchIdStart}.${i}`,
                 getAddress: (object: T) => getAddresses(object)[i],
-                identifier: `${identifier} ${i + 1}`,
             });
 
             result.push(column);
@@ -94,18 +93,12 @@ export class XlsxTransformerColumnHelper {
             XlsxTransformerColumnHelper.createAddressColumns<PlatformMember>({
                 matchId: getId('address'),
                 getAddress: member => getParent(member)?.address,
-                identifier: getName('Adres'),
             }),
         ];
     }
 
-    static createAddressColumns<T>({ matchId, identifier, getAddress }: { matchId: string; identifier?: string; getAddress: (object: T) => Address | null | undefined }): XlsxTransformerColumn<T> {
+    static createAddressColumns<T>({ matchId, getAddress }: { matchId: string; getAddress: (object: T) => Address | null | undefined }): XlsxTransformerColumn<T> {
         const getId = (value: string) => matchId + '.' + value;
-        const identifierText = identifier ? `${identifier} - ` : '';
-        const getName = (value: string) => {
-            const name = `${identifierText}${value}`;
-            return name[0].toUpperCase() + name.slice(1);
-        };
 
         return {
             match: (id) => {
@@ -113,7 +106,7 @@ export class XlsxTransformerColumnHelper {
                     return [
                         {
                             id: getId('street'),
-                            name: getName(`Straat`),
+                            name: `Straat`,
                             width: 30,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -124,7 +117,7 @@ export class XlsxTransformerColumnHelper {
                         },
                         {
                             id: getId('number'),
-                            name: getName('Nummer'),
+                            name: 'Nummer',
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -135,7 +128,7 @@ export class XlsxTransformerColumnHelper {
                         },
                         {
                             id: getId('postalCode'),
-                            name: getName('Postcode'),
+                            name: 'Postcode',
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -146,7 +139,7 @@ export class XlsxTransformerColumnHelper {
                         },
                         {
                             id: getId('city'),
-                            name: getName('Stad'),
+                            name: 'Stad',
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -157,7 +150,7 @@ export class XlsxTransformerColumnHelper {
                         },
                         {
                             id: getId('country'),
-                            name: getName('Land'),
+                            name: 'Land',
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);