@stamhoofd/backend 2.58.0 → 2.60.0

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

@@ -209,6 +209,18 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             });
         }
 
+        // Who is going to pay?
+        let whoWillPayNow: 'member' | 'organization' | 'nobody' = 'member'; // if this is set to 'organization', there will also be created separate balance items so the member can pay back the paying organization
+
+        if (request.body.asOrganizationId && request.body.asOrganizationId === organization.id) {
+            // Will get added to the outstanding amount of the member / already paying organization
+            whoWillPayNow = 'nobody';
+        }
+        else if (request.body.asOrganizationId && request.body.asOrganizationId !== organization.id) {
+            // The organization will pay to the organizing organization, and it will get added to the outstanding amount of the member towards the paying organization
+            whoWillPayNow = 'organization';
+        }
+
         const registrationMemberRelation = new ManyToOneRelation(Member, 'member');
         registrationMemberRelation.foreignKey = 'memberId';
 
@@ -264,6 +276,19 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             registration.options = item.options;
             registration.recordAnswers = item.recordAnswers;
 
+            if (whoWillPayNow === 'organization' && request.body.asOrganizationId) {
+                registration.payingOrganizationId = request.body.asOrganizationId;
+            }
+
+            if (whoWillPayNow === 'nobody' && item.replaceRegistrations.length > 0) {
+                // If the replace registration was paid by an organization
+                // Make sure this updated registration will also be paid by the organization, not the member
+                const paidAsOrganization = item.replaceRegistrations[0].payingOrganizationId;
+                if (paidAsOrganization) {
+                    registration.payingOrganizationId = paidAsOrganization;
+                }
+            }
+
             payRegistrations.push({
                 registration,
                 item,
@@ -272,18 +297,6 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             registrations.push(registration);
         }
 
-        // Who is going to pay?
-        let whoWillPayNow: 'member' | 'organization' | 'nobody' = 'member'; // if this is set to 'organization', there will also be created separate balance items so the member can pay back the paying organization
-
-        if (request.body.asOrganizationId && request.body.asOrganizationId === organization.id) {
-            // Will get added to the outstanding amount of the member
-            whoWillPayNow = 'nobody';
-        }
-        else if (request.body.asOrganizationId && request.body.asOrganizationId !== organization.id) {
-            // The organization will pay to the organizing organization, and it will get added to the outstanding amount of the member towards the paying organization
-            whoWillPayNow = 'organization';
-        }
-
         // Validate payment method
         if (totalPrice > 0 && whoWillPayNow !== 'nobody') {
             const allowedPaymentMethods = organization.meta.registrationPaymentConfiguration.getAvailablePaymentMethods({
@@ -369,8 +382,13 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             deactivatedRegistrationGroupIds.push(existingRegistration.groupId);
         }
 
-        async function createBalanceItem({ registration, amount, unitPrice, description, type, relations }: { amount?: number; registration: RegistrationWithMemberAndGroup; unitPrice: number; description: string; relations: Map<BalanceItemRelationType, BalanceItemRelation>; type: BalanceItemType }) {
+        async function createBalanceItem({ registration, skipZero, amount, unitPrice, description, type, relations }: { amount?: number; skipZero?: boolean; registration: RegistrationWithMemberAndGroup; unitPrice: number; description: string; relations: Map<BalanceItemRelationType, BalanceItemRelation>; type: BalanceItemType }) {
             // NOTE: We also need to save zero-price balance items because for online payments, we need to know which registrations to activate after payment
+            if (skipZero === true) {
+                if (unitPrice === 0 || amount === 0) {
+                    return;
+                }
+            }
 
             // Create balance item
             const balanceItem = new BalanceItem();
@@ -386,11 +404,11 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             // Who is responsible for payment?
             let balanceItem2: BalanceItem | null = null;
-            if (whoWillPayNow === 'organization' && request.body.asOrganizationId) {
+            if (registration.payingOrganizationId) {
                 // Create a separate balance item for this meber to pay back the paying organization
                 // this is not yet associated with a payment but will be added to the outstanding balance of the member
 
-                balanceItem.payingOrganizationId = request.body.asOrganizationId;
+                balanceItem.payingOrganizationId = registration.payingOrganizationId;
 
                 balanceItem2 = new BalanceItem();
 
@@ -405,7 +423,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 balanceItem2.type = type;
 
                 // Who needs to receive this money?
-                balanceItem2.organizationId = request.body.asOrganizationId;
+                balanceItem2.organizationId = registration.payingOrganizationId;
 
                 // Who is responsible for payment?
                 balanceItem2.memberId = registration.memberId;
@@ -437,26 +455,19 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             const { item, registration } = bundle;
             registration.reservedUntil = null;
 
-            /* 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);
 
             if (group && group.settings.maxMembers !== null) {
                 registration.reservedUntil = new Date(new Date().getTime() + 1000 * 60 * 30);
             }
+
+            // Only now save the registration
             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;
-            }
-
             // Create balance items
             const sharedRelations: [BalanceItemRelationType, BalanceItemRelation][] = [
                 [
@@ -490,6 +501,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 registration,
                 unitPrice: item.groupPrice.price.forMember(item.member),
                 type: BalanceItemType.Registration,
+                skipZero: false, // Always create at least one balance item for each registration - even when the price is zero
                 description: `${item.member.patchedMember.name} bij ${item.group.settings.name}`,
                 relations: new Map([
                     ...sharedRelations,
@@ -502,6 +514,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     registration,
                     amount: option.amount,
                     unitPrice: option.option.price.forMember(item.member),
+                    skipZero: true, // Do not create for zero option prices
                     type: BalanceItemType.Registration,
                     description: `${option.optionMenu.name}: ${option.option.name}`,
                     relations: new Map([
@@ -583,10 +596,13 @@ 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
+        // Delay marking as valid as late as possible so any errors will prevent creating valid balance items
+        // Keep a copy because createdBalanceItems will be altered - and we don't want to mark added items as valid
+        const markValidList = [...createdBalanceItems, ...unrelatedCreatedBalanceItems];
+
         async function markValidIfNeeded() {
             if (shouldMarkValid) {
-                for (const balanceItem of [...createdBalanceItems, ...unrelatedCreatedBalanceItems]) {
+                for (const balanceItem of markValidList) {
                     // Mark valid
                     await BalanceItemService.markPaid(balanceItem, payment, organization);
                 }

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

@@ -63,11 +63,6 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
 
             await period.save();
             periods.push(period);
-
-            await AuditLogService.log({
-                type: AuditLogType.RegistrationPeriodAdded,
-                period,
-            });
         }
 
         for (const patch of request.body.getPatches()) {
@@ -80,8 +75,6 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                     message: 'Registration period not found',
                 });
             }
-            const initialStructure = model.getStructure().clone();
-
             if (patch.startDate !== undefined) {
                 model.startDate = patch.startDate;
             }
@@ -102,13 +95,6 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
 
             // Schedule patch of all groups in this period
             PeriodHelper.updateGroupsInPeriod(model).catch(console.error);
-
-            await AuditLogService.log({
-                type: AuditLogType.RegistrationPeriodEdited,
-                period: model,
-                patch,
-                oldData: initialStructure,
-            });
         }
 
         for (const id of request.body.getDeletes()) {
@@ -123,11 +109,6 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             }
 
             await model.delete();
-
-            await AuditLogService.log({
-                type: AuditLogType.RegistrationPeriodDeleted,
-                period: model,
-            });
         }
 
         // Clear platform cache

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

@@ -1,8 +1,8 @@
 import { AutoEncoderPatchType, cloneObject, Decoder, isPatchableArray, ObjectData, PatchableArrayAutoEncoder, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
-import { Organization, OrganizationRegistrationPeriod, PayconiqPayment, Platform, RegistrationPeriod, SetupStepUpdater, StripeAccount, Webshop } from '@stamhoofd/models';
-import { AuditLogType, BuckarooSettings, Company, OrganizationMetaData, OrganizationPatch, Organization as OrganizationStruct, PayconiqAccount, PaymentMethod, PaymentMethodHelper, PermissionLevel, PlatformConfig } from '@stamhoofd/structures';
+import { Organization, OrganizationRegistrationPeriod, PayconiqPayment, Platform, RegistrationPeriod, StripeAccount, Webshop } from '@stamhoofd/models';
+import { BuckarooSettings, Company, OrganizationMetaData, OrganizationPatch, Organization as OrganizationStruct, PayconiqAccount, PaymentMethod, PaymentMethodHelper, PermissionLevel, PlatformConfig } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
@@ -10,7 +10,7 @@ import { BuckarooHelper } from '../../../../helpers/BuckarooHelper';
 import { Context } from '../../../../helpers/Context';
 import { TagHelper } from '../../../../helpers/TagHelper';
 import { ViesHelper } from '../../../../helpers/ViesHelper';
-import { AuditLogService } from '../../../../services/AuditLogService';
+import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -63,8 +63,6 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             });
         }
 
-        const initialStruct = (await AuthenticatedStructures.organization(organization)).clone();
-
         const errors = new SimpleErrors();
         let shouldUpdateSetupSteps = false;
         let updateTags = false;
@@ -387,14 +385,6 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
             await TagHelper.updateOrganizations();
         }
         const struct = await AuthenticatedStructures.organization(organization);
-
-        await AuditLogService.log({
-            type: AuditLogType.OrganizationSettingsChanged,
-            organization,
-            oldData: initialStruct,
-            patch: struct,
-        });
-
         return new Response(struct);
     }
 

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

@@ -1,12 +1,12 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { AuditLogType, GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
+import { GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, PermissionLevel, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, Member, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, SetupStepUpdater } from '@stamhoofd/models';
+import { Group, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
-import { AuditLogService } from '../../../../services/AuditLogService';
+import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -81,6 +81,20 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
 
             let deleteUnreachable = false;
             const allowedIds: string[] = [];
+            let wasInvalid = false;
+
+            // Check if have an initial invalid state
+            if (patch.settings) {
+                // Already clean up the categories (not yet delete the groups)
+                const groups = await Group.getAll(organization.id, organizationPeriod.periodId);
+                await organizationPeriod.cleanCategories(groups);
+
+                for (const category of organizationPeriod.settings.categories) {
+                    if (category.groupIds.length && category.categoryIds.length) {
+                        wasInvalid = true;
+                    }
+                }
+            }
 
             // #region prevent patch category lock if no full platform access
             const originalCategories = organizationPeriod.settings.categories;
@@ -90,7 +104,7 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
                     if (patch.settings.categories) {
                         deleteUnreachable = true;
                     }
-                    organizationPeriod.settings.patchOrPut(patch.settings);
+                    organizationPeriod.settings = organizationPeriod.settings.patch(patch.settings);
                 }
             }
             else {
@@ -123,7 +137,7 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             }
 
             // Check if we have a category with groups and categories combined
-            if (patch.settings) {
+            if (patch.settings && !wasInvalid) {
                 for (const category of organizationPeriod.settings.categories) {
                     if (category.groupIds.length && category.categoryIds.length) {
                         throw new SimpleError({
@@ -281,12 +295,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
 
         model.deletedAt = new Date();
         await model.save();
-        Member.updateMembershipsForGroupId(id);
-
-        await AuditLogService.log({
-            type: AuditLogType.GroupDeleted,
-            group: model,
-        });
     }
 
     static async patchGroup(struct: AutoEncoderPatchType<GroupStruct>, period?: RegistrationPeriod | null) {
@@ -295,12 +303,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         if (!model || !await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
             throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen');
         }
-        const originalStruct = (await AuthenticatedStructures.group(model)).clone(); // Clone is required for deep changes
-
-        const previousProperties = {
-            deletedAt: model.deletedAt,
-            defaultAgeGroupId: model.defaultAgeGroupId,
-        };
 
         if (struct.settings) {
             struct.settings.period = undefined; // Not allowed to patch manually
@@ -416,26 +418,8 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             }
         }
 
-        await model.updateOccupancy({
-            previousProperties,
-        });
+        await model.updateOccupancy();
         await model.save();
-
-        if (struct.deletedAt !== undefined || struct.defaultAgeGroupId !== undefined) {
-            Member.updateMembershipsForGroupId(model.id);
-        }
-
-        if (Object.keys(struct).length === 1 && struct.id) {
-            // Nothing changed
-            return;
-        }
-
-        await AuditLogService.log({
-            type: AuditLogType.GroupEdited,
-            group: model,
-            oldData: originalStruct,
-            patch,
-        });
     }
 
     static async createGroup(struct: GroupStruct, organizationId: string, period: RegistrationPeriod, options?: { allowedIds?: string[] }): Promise<Group> {
@@ -515,13 +499,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         }
 
         await model.save();
-        await model.updateOccupancy({ isNew: true }); // Force update steps
-
-        await AuditLogService.log({
-            type: AuditLogType.GroupAdded,
-            group: model,
-        });
-
         return model;
     }
 }

package/src/endpoints/organization/dashboard/stripe/ConnectStripeEndpoint.ts

@@ -92,12 +92,6 @@ export class ConnectMollieEndpoint extends Endpoint<Params, Query, Body, Respons
         model.setMetaFromStripeAccount(account);
         await model.save();
 
-        // Track audit log
-        await AuditLogService.log({
-            type: AuditLogType.StripeAccountAdded,
-            stripeAccount: model,
-        });
-
         // Return information about the Stripe Account
 
         return new Response(StripeAccountStruct.create(model));

package/src/endpoints/organization/dashboard/stripe/DeleteStripeAccountEndpoint.ts

@@ -64,12 +64,6 @@ export class DeleteStripeAccountEndpoint extends Endpoint<Params, Query, Body, R
         model.status = 'deleted';
         await model.save();
 
-        // Track audit log
-        await AuditLogService.log({
-            type: AuditLogType.StripeAccountDeleted,
-            stripeAccount: model,
-        });
-
         return new Response(undefined);
     }
 }

package/src/endpoints/organization/dashboard/stripe/UpdateStripeAccountEndpoint.ts

@@ -1,11 +1,10 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { StripeAccount } from '@stamhoofd/models';
-import { AuditLogType, PermissionLevel, StripeAccount as StripeAccountStruct } from '@stamhoofd/structures';
+import { AuditLogSource, PermissionLevel, StripeAccount as StripeAccountStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
 import { StripeHelper } from '../../../../helpers/StripeHelper';
 import { AuditLogService } from '../../../../services/AuditLogService';
-import { Model } from '@simonbackx/simple-database';
 
 type Params = { id: string };
 type Body = undefined;
@@ -45,19 +44,11 @@ export class UpdateStripeAccountEndpoint extends Endpoint<Params, Query, Body, R
         // Get account
         const stripe = StripeHelper.getInstance();
         const account = await stripe.accounts.retrieve(model.accountId);
-        const beforeMeta = model.meta;
-        model.setMetaFromStripeAccount(account);
-
-        if (await model.save()) {
-            // Track audit log
-            await AuditLogService.log({
-                type: AuditLogType.StripeAccountEdited,
-                stripeAccount: model,
-                oldData: beforeMeta,
-                patch: model.meta,
-            });
-        }
 
+        await AuditLogService.setContext({ userId: null, source: AuditLogSource.System }, async () => {
+            model.setMetaFromStripeAccount(account);
+            await model.save();
+        });
         return new Response(StripeAccountStruct.create(model));
     }
 }

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

@@ -3,9 +3,10 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, BalanceItemPayment, Order, Payment, Token, Webshop } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, PrivatePayment, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentMethod, PaymentStatus, PermissionLevel, PrivateOrder, PrivatePayment, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
+import { AuditLogService } from '../../../../services/AuditLogService';
 
 type Params = { id: string };
 type Query = undefined;
@@ -131,7 +132,7 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                 order.data.validate(webshopGetter.struct, organization.meta, request.i18n, true);
 
                 try {
-                    await order.updateStock();
+                    await order.updateStock(null, true);
                     const totalPrice = order.data.totalPrice;
 
                     if (totalPrice == 0) {
@@ -286,9 +287,11 @@ export class PatchWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Re
                     }
                 }
 
+                await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+                    await model.setRelation(Order.webshop, webshop).updateStock(previousData, true);
+                    await model.setRelation(Order.webshop, webshop).updateTickets();
+                });
                 await model.save();
-                await model.setRelation(Order.webshop, webshop).updateStock(previousData);
-                await model.setRelation(Order.webshop, webshop).updateTickets();
             }
 
             const mapped = orders.map(order => order.setRelation(Order.webshop, webshop));

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

@@ -6,12 +6,13 @@ 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 } from '@stamhoofd/structures';
+import { BalanceItemStatus, Order as OrderStruct, OrderData, OrderResponse, Payment as PaymentStruct, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Version, Webshop as WebshopStruct, WebshopAuthType, BalanceItemType, BalanceItemRelationType, BalanceItemRelation, AuditLogSource } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { BuckarooHelper } from '../../../helpers/BuckarooHelper';
 import { Context } from '../../../helpers/Context';
 import { StripeHelper } from '../../../helpers/StripeHelper';
+import { AuditLogService } from '../../../services/AuditLogService';
 
 type Params = { id: string };
 type Query = undefined;
@@ -140,7 +141,12 @@ export class PlaceOrderEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             order.userId = Context.user?.id ?? null;
 
             // Always reserve the stock
-            await order.updateStock();
+            await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+                await order.updateStock(null, true);
+            });
+
+            await order.save();
+
             return { webshop, order, organization };
         });
 

package/src/helpers/AuthenticatedStructures.ts

@@ -1,6 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog, BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AuditLog as AuditLogStruct, Document as DocumentStruct, Event as EventStruct, 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 { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, Document as DocumentStruct, Event as EventStruct, 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 { Formatter } from '@stamhoofd/utility';
 import { Context } from './Context';
@@ -645,6 +645,8 @@ export class AuthenticatedStructures {
 
         const userIds = Formatter.uniqueArray(logs.map(l => l.userId).filter(id => id !== null));
         const users = await User.getByIDs(...userIds);
+        const organizationsIds = Formatter.uniqueArray(logs.map(l => l.organizationId).filter(id => id !== null));
+        const organizations = await Organization.getByIDs(...organizationsIds);
 
         for (const log of logs) {
             const user = log.userId ? (users.find(u => u.id === log.userId) ?? null) : null;
@@ -673,9 +675,22 @@ export class AuthenticatedStructures {
                 }
             }
 
+            let replacements = log.replacements;
+
+            if (log.organizationId && log.organizationId !== Context.organization?.id) {
+                replacements = new Map(log.replacements);
+                const org = organizations.find(o => o.id === log.organizationId);
+                replacements.set('org', AuditLogReplacement.create({
+                    id: log.organizationId,
+                    value: org?.name ?? 'verwijderde vereniging',
+                    type: AuditLogReplacementType.Organization,
+                }));
+            }
+
             structs.push(
                 AuditLogStruct.create({
                     ...log,
+                    replacements,
                     user: userStruct,
                 }),
             );

package/src/helpers/Context.ts

@@ -46,9 +46,15 @@ export class ContextInstance {
 
     static asyncLocalStorage = new AsyncLocalStorage<ContextInstance>();
 
-    static get current(): ContextInstance {
+    static get optional(): ContextInstance | null {
         const c = this.asyncLocalStorage.getStore();
 
+        return c ?? null;
+    }
+
+    static get current(): ContextInstance {
+        const c = this.optional;
+
         if (!c) {
             throw new SimpleError({
                 code: 'no_context',
@@ -220,7 +226,7 @@ export class ContextInstance {
 export const Context = new Proxy(ContextInstance, {
     get(target, prop, receiver) {
         const c = target.current[prop];
-        if (c && typeof c == 'function') {
+        if (c && typeof c === 'function') {
             return c.bind(target.current);
         }
         return c;