@stamhoofd/backend 2.58.0 → 2.59.0

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

@@ -2,7 +2,7 @@ import { AutoEncoderPatchType, cloneObject, Decoder, isPatchableArray, ObjectDat
 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 { 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,6 @@ 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';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -63,8 +62,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 +384,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,11 @@
 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, SetupStepUpdater } from '@stamhoofd/models';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
-import { AuditLogService } from '../../../../services/AuditLogService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -81,6 +80,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 +103,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 +136,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 +294,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,7 +302,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,
@@ -420,22 +426,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             previousProperties,
         });
         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> {
@@ -517,11 +507,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;

package/src/helpers/MemberUserSyncer.ts

@@ -1,8 +1,9 @@
 import { Member, MemberResponsibilityRecord, MemberWithRegistrations, User } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { MemberDetails, Permissions, UserPermissions } from '@stamhoofd/structures';
+import { AuditLogSource, MemberDetails, Permissions, UserPermissions } from '@stamhoofd/structures';
 import crypto from 'crypto';
 import basex from 'base-x';
+import { AuditLogService } from '../services/AuditLogService';
 
 const ALPHABET = '123456789ABCDEFGHJKMNPQRSTUVWXYZ'; // Note: we removed 0, O, I and l to make it easier for humans
 const customBase = basex(ALPHABET);
@@ -26,61 +27,63 @@ export class MemberUserSyncerStatic {
      * - email addresses have changed
      */
     async onChangeMember(member: MemberWithRegistrations, unlinkUsers: boolean = false) {
-        const { userEmails, parentAndUnverifiedEmails } = this.getMemberAccessEmails(member.details);
+        await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+            const { userEmails, parentAndUnverifiedEmails } = this.getMemberAccessEmails(member.details);
 
-        // Make sure all these users have access to the member
-        for (const email of userEmails) {
+            // Make sure all these users have access to the member
+            for (const email of userEmails) {
             // Link users that are found with these email addresses.
-            await this.linkUser(email, member, false, true);
-        }
-
-        for (const email of parentAndUnverifiedEmails) {
-            if (userEmails.includes(email)) {
-                continue;
+                await this.linkUser(email, member, false, true);
             }
 
-            // Link parents and unverified emails
-            // Now we add the responsibility permissions to the parent if there are no userEmails
-            const asParent = userEmails.length > 0 || !member.details.unverifiedEmails.includes(email) || member.details.defaultAge < 16;
-            await this.linkUser(email, member, asParent, true);
-        }
+            for (const email of parentAndUnverifiedEmails) {
+                if (userEmails.includes(email)) {
+                    continue;
+                }
+
+                // Link parents and unverified emails
+                // Now we add the responsibility permissions to the parent if there are no userEmails
+                const asParent = userEmails.length > 0 || !member.details.unverifiedEmails.includes(email) || member.details.defaultAge < 16;
+                await this.linkUser(email, member, asParent, true);
+            }
 
-        if (unlinkUsers && !member.details.parentsHaveAccess) {
+            if (unlinkUsers && !member.details.parentsHaveAccess) {
             // Remove access of users that are not in this list
             // NOTE: we should only do this once a year (preferably on the birthday of the member)
             // only once because otherwise users loose the access to a member during the creation of the member, or when they have changed their email address
             // users can regain access to a member after they have lost control by using the normal verification flow when detecting duplicate members
 
-            for (const user of member.users) {
-                if (!userEmails.includes(user.email) && !parentAndUnverifiedEmails.includes(user.email)) {
-                    await this.unlinkUser(user, member);
+                for (const user of member.users) {
+                    if (!userEmails.includes(user.email) && !parentAndUnverifiedEmails.includes(user.email)) {
+                        await this.unlinkUser(user, member);
+                    }
                 }
             }
-        }
-        else {
+            else {
             // Only auto unlink users that do not have an account
-            for (const user of member.users) {
-                if (!userEmails.includes(user.email) && !parentAndUnverifiedEmails.includes(user.email)) {
-                    if (!user.hasAccount()) {
-                        await this.unlinkUser(user, member);
-                    }
-                    else {
+                for (const user of member.users) {
+                    if (!userEmails.includes(user.email) && !parentAndUnverifiedEmails.includes(user.email)) {
+                        if (!user.hasAccount()) {
+                            await this.unlinkUser(user, member);
+                        }
+                        else {
                         // Make sure only linked as a parent, not as user self
                         // This makes sure we don't inherit permissions and aren't counted as 'being' the member
-                        await this.linkUser(user.email, member, true);
+                            await this.linkUser(user.email, member, true);
+                        }
                     }
                 }
             }
-        }
 
-        if (member.details.securityCode === null) {
-            console.log('Generating security code for member ' + member.id);
+            if (member.details.securityCode === null) {
+                console.log('Generating security code for member ' + member.id);
 
-            const length = 16;
-            const code = customBase.encode(await randomBytes(100)).toUpperCase().substring(0, length);
-            member.details.securityCode = code;
-            await member.save();
-        }
+                const length = 16;
+                const code = customBase.encode(await randomBytes(100)).toUpperCase().substring(0, length);
+                member.details.securityCode = code;
+                await member.save();
+            }
+        });
     }
 
     getMemberAccessEmails(details: MemberDetails) {
@@ -106,10 +109,12 @@ export class MemberUserSyncerStatic {
     }
 
     async onDeleteMember(member: MemberWithRegistrations) {
-        for (const u of member.users) {
-            console.log('Unlinking user ' + u.email + ' from deleted member ' + member.id);
-            await this.unlinkUser(u, member);
-        }
+        await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+            for (const u of member.users) {
+                console.log('Unlinking user ' + u.email + ' from deleted member ' + member.id);
+                await this.unlinkUser(u, member);
+            }
+        });
     }
 
     async getResponsibilitiesForMembers(memberIds: string[]) {

package/src/helpers/PeriodHelper.ts

@@ -1,7 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, SetupStepUpdater } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { Group as GroupStruct, PermissionLevel } from '@stamhoofd/structures';
+import { AuditLogSource, Group as GroupStruct, PermissionLevel } from '@stamhoofd/structures';
 import { PatchOrganizationRegistrationPeriodsEndpoint } from '../endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint';
 import { AuthenticatedStructures } from './AuthenticatedStructures';
 import { MemberUserSyncer } from './MemberUserSyncer';
@@ -9,9 +9,8 @@ import { AuditLogService } from '../services/AuditLogService';
 
 export class PeriodHelper {
     static async moveOrganizationToPeriod(organization: Organization, period: RegistrationPeriod) {
-        await AuditLogService.disable(async () => {
+        await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
             console.log('moveOrganizationToPeriod', organization.id, period.id);
-
             await this.createOrganizationPeriodForPeriod(organization, period);
             organization.periodId = period.id;
             await organization.save();
@@ -172,7 +171,7 @@ export class PeriodHelper {
 
         const batchSize = 100;
         await QueueHandler.schedule(tag, async () => {
-            await AuditLogService.disable(async () => {
+            await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
                 let lastId = '';
 
                 while (true) {

package/src/helpers/TagHelper.ts

@@ -1,38 +1,41 @@
 import { Organization, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { OrganizationTag, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
+import { AuditLogSource, OrganizationTag, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
 import { ModelHelper } from './ModelHelper';
+import { AuditLogService } from '../services/AuditLogService';
 
 export class TagHelper extends SharedTagHelper {
     static async updateOrganizations() {
         const queueId = 'update-tags-on-organizations';
         QueueHandler.cancel(queueId);
 
-        await QueueHandler.schedule(queueId, async () => {
-            let platform = await Platform.getShared();
+        await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+            await QueueHandler.schedule(queueId, async () => {
+                let platform = await Platform.getShared();
 
-            const tagCounts = new Map<string, number>();
-            await this.loopOrganizations(async (organizations) => {
-                for (const organization of organizations) {
-                    organization.meta.tags = this.getAllTagsFromHierarchy(organization.meta.tags, platform.config.tags);
+                const tagCounts = new Map<string, number>();
+                await this.loopOrganizations(async (organizations) => {
+                    for (const organization of organizations) {
+                        organization.meta.tags = this.getAllTagsFromHierarchy(organization.meta.tags, platform.config.tags);
 
-                    for (const tag of organization.meta.tags) {
-                        tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
+                        for (const tag of organization.meta.tags) {
+                            tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
+                        }
                     }
-                }
 
-                await Promise.all(organizations.map(organization => organization.save()));
-            });
+                    await Promise.all(organizations.map(organization => organization.save()));
+                });
 
-            // Reload platform to avoid race conditions
-            platform = await Platform.getShared();
-            for (const [tag, count] of tagCounts.entries()) {
-                const tagObject = platform.config.tags.find(t => t.id === tag);
-                if (tagObject) {
-                    tagObject.organizationCount = count;
+                // Reload platform to avoid race conditions
+                platform = await Platform.getShared();
+                for (const [tag, count] of tagCounts.entries()) {
+                    const tagObject = platform.config.tags.find(t => t.id === tag);
+                    if (tagObject) {
+                        tagObject.organizationCount = count;
+                    }
                 }
-            }
-            await platform.save();
+                await platform.save();
+            });
         });
     }
 

package/src/seeds/1722344162-update-membership.ts

@@ -1,5 +1,5 @@
 import { Migration } from '@simonbackx/simple-database';
-import { MembershipHelper } from '../helpers/MembershipHelper';
+import { PlatformMembershipService } from '../services/PlatformMembershipService';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment == 'test') {
@@ -13,5 +13,5 @@ export default new Migration(async () => {
     }
 
     process.stdout.write('\n');
-    await MembershipHelper.updateAll();
+    await PlatformMembershipService.updateAll();
 });

package/src/seeds/1726572303-schedule-stock-updates.ts

@@ -1,5 +1,6 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Registration } from '@stamhoofd/models';
+import { RegistrationService } from '../services/RegistrationService';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment == 'test') {
@@ -27,7 +28,7 @@ export default new Migration(async () => {
         const registrations = await Registration.getByIDs(...rawRegistrations.map(g => g.id));
 
         for (const registration of registrations) {
-            registration.scheduleStockUpdate();
+            RegistrationService.scheduleStockUpdate(registration.id);
 
             c++;