@stamhoofd/backend 2.74.0 → 2.75.1

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

@@ -5,7 +5,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, Group, Member, MemberWithRegistrations, MolliePayment, MollieToken, Organization, PayconiqPayment, Payment, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BalanceItem as BalanceItemStruct, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version, PaymentType } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItem as BalanceItemStruct, BalanceItemType, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PaymentType, PermissionLevel, PlatformFamily, PlatformMember, RegisterItem, RegisterResponse, Version } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
@@ -388,7 +388,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (!await Context.auth.canAccessRegistration(existingRegistration, PermissionLevel.Write)) {
                 throw new SimpleError({
                     code: 'forbidden',
-                    message: 'Je hebt geen toegaansrechten om deze inschrijving te verwijderen.',
+                    message: 'Je hebt geen toegangsrechten om deze inschrijving te verwijderen.',
                     statusCode: 403,
                 });
             }

package/src/endpoints/global/registration-periods/PatchRegistrationPeriodsEndpoint.ts

@@ -1,9 +1,9 @@
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { AuditLogSource, AuditLogType, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
+import { AuditLogSource, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Platform, RegistrationPeriod } from '@stamhoofd/models';
+import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { Context } from '../../../helpers/Context';
 import { PeriodHelper } from '../../../helpers/PeriodHelper';
 import { AuditLogService } from '../../../services/AuditLogService';
@@ -34,6 +34,24 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
         return [false];
     }
 
+    static async isCurrentRegistrationPeriod(organizationId: string | null, periodId: string) {
+        if (organizationId === null) {
+            const platform = await Platform.getSharedStruct();
+            return platform.period.id === periodId;
+        }
+
+        const organization = await Organization.getByID(organizationId);
+        if (!organization) {
+            throw new SimpleError({
+                code: 'not_found',
+                statusCode: 404,
+                message: 'Organization not found',
+            });
+        }
+
+        return organization.periodId === periodId;
+    }
+
     async handle(request: DecodedRequest<Params, Query, Body>) {
         const organization = await Context.setUserOrganizationScope();
         await Context.authenticate();
@@ -60,6 +78,20 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             period.locked = put.locked;
             period.settings = put.settings;
             period.organizationId = organization?.id ?? null;
+
+            if (put.locked === true) {
+                // current period cannot be locked
+                const isCurrentRegistrationPeriod = await PatchRegistrationPeriodsEndpoint.isCurrentRegistrationPeriod(period.organizationId, period.id);
+
+                if (isCurrentRegistrationPeriod) {
+                    throw new SimpleError({
+                        code: 'cannot_lock_current_period',
+                        message: 'Current registration period cannot be locked',
+                        human: 'Het huidige werkjaar kan niet vergrendeld worden',
+                    });
+                }
+            }
+
             await period.setPreviousPeriodId();
 
             await period.save();
@@ -76,6 +108,20 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                     message: 'Registration period not found',
                 });
             }
+
+            if (patch.locked === true) {
+                // current period cannot be locked
+                const isCurrentRegistrationPeriod = await PatchRegistrationPeriodsEndpoint.isCurrentRegistrationPeriod(model.organizationId, model.id);
+
+                if (isCurrentRegistrationPeriod) {
+                    throw new SimpleError({
+                        code: 'cannot_lock_current_period',
+                        message: 'Current registration period cannot be locked',
+                        human: 'Het huidige werkjaar kan niet vergrendeld worden',
+                    });
+                }
+            }
+
             if (patch.startDate !== undefined) {
                 model.startDate = patch.startDate;
             }

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

@@ -3,7 +3,7 @@ import { Document } from '@stamhoofd/models';
 import { assertSort, CountFilteredRequest, Document as DocumentStruct, getSortFilter, LimitedFilteredRequest, PaginatedResponse, SearchFilterFactory, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { Decoder } from '@simonbackx/simple-encoding';
-import { compileToSQLFilter, compileToSQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { compileToSQLFilter, applySQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
 import { LimitedFilteredRequestHelper } from '../../../../helpers/LimitedFilteredRequestHelper';
@@ -68,7 +68,7 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
-            query.orderBy(compileToSQLSorter(q.sort, sorters));
+            applySQLSorter(query, q.sort, sorters);
             query.limit(q.limit);
         }
 

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

@@ -346,7 +346,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             await organization.save();
         }
         else {
-            if (request.body.name || request.body.address) {
+            if (request.body.name || request.body.address || request.body.website || request.body.meta?.companies || request.body.meta?.recordsConfiguration || request.body.meta?.registrationPaymentConfiguration) {
                 throw new SimpleError({
                     code: 'permission_denied',
                     message: 'You do not have permissions to edit the organization settings',

package/src/endpoints/organization/dashboard/payments/GetPaymentsEndpoint.ts

@@ -2,7 +2,7 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Payment } from '@stamhoofd/models';
-import { SQL, compileToSQLFilter, compileToSQLSorter } from '@stamhoofd/sql';
+import { SQL, compileToSQLFilter, applySQLSorter } from '@stamhoofd/sql';
 import { CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, PaymentGeneral, StamhoofdFilter, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
@@ -152,7 +152,7 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
-            query.orderBy(compileToSQLSorter(q.sort, sorters));
+            applySQLSorter(query, q.sort, sorters);
             query.limit(q.limit);
         }
 

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.ts

@@ -2,7 +2,7 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { CachedBalance } from '@stamhoofd/models';
-import { compileToSQLFilter, compileToSQLSorter } from '@stamhoofd/sql';
+import { compileToSQLFilter, applySQLSorter } from '@stamhoofd/sql';
 import { assertSort, CountFilteredRequest, DetailedReceivableBalance, getSortFilter, LimitedFilteredRequest, PaginatedResponse, ReceivableBalance as ReceivableBalanceStruct, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
@@ -100,7 +100,7 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
-            query.orderBy(compileToSQLSorter(q.sort, sorters));
+            applySQLSorter(query, q.sort, sorters);
             query.limit(q.limit);
         }
 

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

@@ -452,6 +452,14 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             }
         }
 
+        if (period.locked) {
+            throw new SimpleError({
+                code: 'invalid_period',
+                message: 'Period is locked',
+                human: Context.i18n.$t('f544b972-416c-471d-8836-d7f3b16f947d'),
+            });
+        }
+
         const user = Context.auth.user;
 
         const model = new Group();

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

@@ -1,9 +1,9 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { User } from '@stamhoofd/models';
-import { OrganizationAdmins, User as UserStruct } from '@stamhoofd/structures';
+import { OrganizationAdmins } from '@stamhoofd/structures';
 
-import { Context } from '../../../../helpers/Context';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
+import { Context } from '../../../../helpers/Context';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = undefined;
@@ -33,7 +33,7 @@ export class GetOrganizationAdminsEndpoint extends Endpoint<Params, Query, Body,
         }
 
         // Get all admins
-        const admins = await User.getAdmins([organization.id]);
+        const admins = await User.getAdmins(organization.id);
 
         return new Response(OrganizationAdmins.create({
             users: await AuthenticatedStructures.usersWithMembers(admins),

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

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { assertSort, CountFilteredRequest, getOrderSearchFilter, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PrivateOrder, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { Order } from '@stamhoofd/models';
-import { compileToSQLFilter, compileToSQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { compileToSQLFilter, applySQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
 import { parsePhoneNumber } from 'libphonenumber-js/max';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
@@ -69,7 +69,7 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
-            query.orderBy(compileToSQLSorter(q.sort, sorters));
+            applySQLSorter(query, q.sort, sorters);
             query.limit(q.limit);
         }
 

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

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { Ticket } from '@stamhoofd/models';
 import { assertSort, CountFilteredRequest, getSortFilter, LimitedFilteredRequest, PaginatedResponse, TicketPrivate } from '@stamhoofd/structures';
 
-import { compileToSQLFilter, compileToSQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { compileToSQLFilter, applySQLSorter, SQL, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
 import { LimitedFilteredRequestHelper } from '../../../../helpers/LimitedFilteredRequestHelper';
@@ -60,7 +60,7 @@ export class GetWebshopTicketsEndpoint extends Endpoint<Params, Query, Body, Res
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
-            query.orderBy(compileToSQLSorter(q.sort, sorters));
+            applySQLSorter(query, q.sort, sorters);
             query.limit(q.limit);
         }
 

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

@@ -2,11 +2,10 @@ import { createMollieClient, PaymentMethod as molliePaymentMethod } from '@molli
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
 import { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, MolliePayment, MollieToken, Order, PayconiqPayment, Payment, RateLimiter, Webshop, WebshopDiscountCode } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { BalanceItemStatus, Order as OrderStruct, OrderData, OrderResponse, Payment as PaymentStruct, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Version, Webshop as WebshopStruct, WebshopAuthType, BalanceItemType, BalanceItemRelationType, BalanceItemRelation, AuditLogSource, PaymentCustomer } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderData, OrderResponse, Order as OrderStruct, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, Version, WebshopAuthType, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper';

package/src/helpers/AdminPermissionChecker.ts

@@ -1,6 +1,6 @@
 import { AutoEncoderPatchType, PatchMap } from '@simonbackx/simple-encoding';
-import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, CachedBalance, Document, EmailTemplate, Event, Group, Member, MemberPlatformMembership, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from '@stamhoofd/models';
+import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
+import { BalanceItem, CachedBalance, Document, EmailTemplate, Event, EventNotification, Group, Member, MemberPlatformMembership, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from '@stamhoofd/models';
 import { AccessRight, EventPermissionChecker, FinancialSupportSettings, GroupCategory, GroupStatus, MemberWithRegistrationsBlob, PermissionLevel, PermissionsResourceType, Platform as PlatformStruct, RecordCategory } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { addTemporaryMemberAccess, hasTemporaryMemberAccess } from './TemporaryMemberAccess';
@@ -206,6 +206,38 @@ export class AdminPermissionChecker {
         });
     }
 
+    async canAccessEvent(event: Event): Promise<boolean> {
+        try {
+            await this.checkEventAccess(event);
+            return true;
+        }
+        catch (e) {
+            if (isSimpleError(e) || isSimpleErrors(e)) {
+                return false;
+            }
+            throw e;
+        }
+    }
+
+    async canAccessEventNotification(notification: EventNotification, permissionLevel: PermissionLevel = PermissionLevel.Read) {
+        // todo: check if user has access to this notification
+        const events = EventNotification.events.isLoaded(notification) ? notification.events : await EventNotification.events.load(notification);
+        for (const event of events) {
+            if (!await this.canAccessEvent(event)) {
+                return false;
+            }
+        }
+
+        if (events.length === 0 || permissionLevel === PermissionLevel.Full) {
+            // Requires `OrganizationEventNotificationReviewer` access right for the organization
+            if (!await this.canReviewEventNotification(notification)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     async canAccessArchivedGroups(organizationId: string) {
         return await this.hasFullAccess(organizationId);
     }
@@ -785,6 +817,23 @@ export class AdminPermissionChecker {
         return !this.user.isApiUser && (await this.hasFullAccess(organizationId));
     }
 
+    async canReviewEventNotification(eventNotification: { organizationId: string }) {
+        if (!this.checkScope(eventNotification.organizationId)) {
+            return false;
+        }
+
+        const organizationPermissions = await this.getOrganizationPermissions(eventNotification.organizationId);
+
+        if (!organizationPermissions) {
+            return false;
+        }
+
+        if (organizationPermissions.hasAccessRight(AccessRight.OrganizationEventNotificationReviewer)) {
+            return true;
+        }
+        return false;
+    }
+
     async hasFullAccess(organizationId: string, level = PermissionLevel.Full): Promise<boolean> {
         const organizationPermissions = await this.getOrganizationPermissions(organizationId);
 
@@ -1340,6 +1389,35 @@ export class AdminPermissionChecker {
         return tags;
     }
 
+    getOrganizationTagsWithAccessRight(right: AccessRight): string[] | 'all' {
+        if (!this.hasSomePlatformAccess()) {
+            return [];
+        }
+
+        if (this.hasPlatformFullAccess()) {
+            return 'all';
+        }
+
+        if (this.platformPermissions?.hasResourceAccessRight(PermissionsResourceType.OrganizationTags, '', right)) {
+            return 'all';
+        }
+
+        const allTags = this.platform.config.tags;
+        const tags: string[] = [];
+
+        for (const tag of allTags) {
+            if (this.platformPermissions?.hasResourceAccessRight(PermissionsResourceType.OrganizationTags, tag.id, right)) {
+                tags.push(tag.id);
+            }
+        }
+
+        if (tags.length === allTags.length) {
+            return 'all';
+        }
+
+        return tags;
+    }
+
     hasSomePlatformAccess(): boolean {
         return !!this.platformPermissions && !this.platformPermissions.isEmpty;
     }

package/src/helpers/AuthenticatedStructures.ts

@@ -1,7 +1,8 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { AuditLog, BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, DetailedReceivableBalance, Document as DocumentStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLog, BalanceItem, CachedBalance, Document, Event, EventNotification, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, DetailedReceivableBalance, Document as DocumentStruct, EventNotification as EventNotificationStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
+import { SQL } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
 import { Context } from './Context';
 
@@ -479,6 +480,91 @@ export class AuthenticatedStructures {
         return result;
     }
 
+    static async eventNotification(eventNotification: EventNotification): Promise<EventNotificationStruct> {
+        return (await this.eventNotifications([eventNotification]))[0];
+    }
+
+    static async eventNotifications(eventNotifications: EventNotification[]): Promise<EventNotificationStruct[]> {
+        if (eventNotifications.length === 0) {
+            return [];
+        }
+
+        // Load events
+        const rows = await SQL.select()
+            .from('_event_notifications_events')
+            .where('event_notificationsId', eventNotifications.map(n => n.id))
+            .fetch();
+
+        const eventIdsMapping = new Map<string, string[]>();
+        const allEvents = new Set<string>();
+
+        for (const row of rows) {
+            const notificationId = row['_event_notifications_events']['event_notificationsId'];
+            const eventId = row['_event_notifications_events']['eventsId'];
+
+            if (typeof eventId !== 'string') {
+                console.error('Invalid event id', eventId);
+                continue;
+            }
+
+            if (typeof notificationId !== 'string') {
+                console.error('Invalid notification id', notificationId);
+                continue;
+            }
+
+            const array = eventIdsMapping.get(notificationId);
+            if (array) {
+                array.push(eventId);
+            }
+            else {
+                eventIdsMapping.set(notificationId, [eventId]);
+            }
+
+            allEvents.add(eventId);
+        }
+
+        const events = allEvents.size > 0 ? await Event.getByIDs(...Array.from(allEvents)) : [];
+        const eventStructs = await this.events(events);
+        const organizationIds = Formatter.uniqueArray(eventNotifications.map(n => n.organizationId));
+        const organizationModels = organizationIds.length > 0 ? await Organization.getByIDs(...organizationIds) : [];
+        const userIds = Formatter.uniqueArray(eventNotifications.flatMap(n => [n.createdBy, n.submittedBy]).filter(id => id !== null));
+        const users = userIds.length > 0 ? await User.getByIDs(...userIds) : [];
+        const userStructs = users.map((user) => {
+            return NamedObject.create({
+                id: user.id,
+                name: user.name ?? user.email,
+            });
+        });
+
+        const result: EventNotificationStruct[] = [];
+
+        for (const notification of eventNotifications) {
+            const thisEventStructs = eventIdsMapping.get(notification.id)?.map(id => eventStructs.find(e => e.id === id)).filter(e => !!e) ?? [];
+            const organizationModel = organizationModels.find(o => o.id === notification.organizationId);
+            if (!organizationModel) {
+                throw new SimpleError({
+                    code: 'organization_not_found',
+                    message: 'Organization not found',
+                    human: 'Organisatie niet gevonden',
+                });
+            }
+
+            const organizationStruct = organizationModel.getBaseStructure();
+
+            const struct = EventNotificationStruct.create({
+                ...notification,
+                organization: organizationStruct,
+                createdBy: notification.createdBy ? userStructs.find(u => u.id === notification.createdBy) : null,
+                submittedBy: notification.submittedBy ? userStructs.find(u => u.id === notification.submittedBy) : null,
+                events: thisEventStructs,
+            });
+
+            result.push(struct);
+        }
+
+        return result;
+    }
+
     static async orders(orders: Order[]): Promise<PrivateOrder[]> {
         const result: PrivateOrder[] = [];
         const webshopIds = new Set(orders.map(o => o.webshopId));

package/src/helpers/FlagMomentCleanup.ts

@@ -22,17 +22,10 @@ export class FlagMomentCleanup {
     static async getActiveMemberResponsibilityRecordsForOrganizationWithoutRegistrationInCurrentPeriod() {
         const currentPeriodId = (await Platform.getShared()).periodId;
 
-        const now = new Date();
-
         return await MemberResponsibilityRecord.select()
             .whereNot('organizationId', null)
             .where(
-                SQL.where('startDate', SQLWhereSign.LessEqual, now)
-                    .or('startDate', null),
-            )
-            .where(
-                SQL.where('endDate', SQLWhereSign.GreaterEqual, now)
-                    .or('endDate', null),
+                MemberResponsibilityRecord.whereActive,
             )
             .whereNot(
                 new SQLWhereExists(

package/src/helpers/GlobalHelper.ts

@@ -0,0 +1,15 @@
+import { I18n } from '@stamhoofd/backend-i18n';
+import { FileSignService } from '../services/FileSignService';
+import { Context } from './Context';
+
+export class GlobalHelper {
+    static async load() {
+        await I18n.load();
+        this.loadGlobalTranslateFunction();
+        await FileSignService.load();
+    }
+
+    private static loadGlobalTranslateFunction() {
+        (global as any).$t = (key: string, replace?: Record<string, string>) => Context.i18n.$t(key, replace);
+    }
+}

package/src/helpers/MembershipCharger.ts

@@ -154,7 +154,8 @@ export const MembershipCharger = {
             const q = MemberPlatformMembership.select()
                 .where('id', SQLWhereSign.Greater, lastId)
                 .where('balanceItemId', null)
-                .where('deletedAt', null);
+                .where('deletedAt', null)
+                .where('locked', false);
 
             if (organizationId) {
                 q.where('organizationId', organizationId);