@stamhoofd/backend 2.59.0 → 2.61.0

package/src/crons.ts

@@ -1,25 +1,13 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Database } from '@simonbackx/simple-database';
-import { Email, EmailAddress } from '@stamhoofd/email';
 import { Group, Organization, Payment, Registration, STPackage, Webshop } from '@stamhoofd/models';
 import { PaymentMethod, PaymentProvider, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
-import AWS from 'aws-sdk';
-import { DateTime } from 'luxon';
 
 import { registerCron } from '@stamhoofd/crons';
-import { clearExcelCache } from './crons/clearExcelCache';
-import { endFunctionsOfUsersWithoutRegistration } from './crons/endFunctionsOfUsersWithoutRegistration';
-import { ExchangePaymentEndpoint } from './endpoints/organization/shared/ExchangePaymentEndpoint';
 import { checkSettlements } from './helpers/CheckSettlements';
-import { ForwardHandler } from './helpers/ForwardHandler';
 import { PaymentService } from './services/PaymentService';
 import { RegistrationService } from './services/RegistrationService';
 
-// Importing postmark returns undefined (this is a bug, so we need to use require)
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const postmark = require('postmark');
-
 let lastDNSCheck: Date | null = null;
 let lastDNSId = '';
 async function checkDNS() {
@@ -133,303 +121,6 @@ async function checkWebshopDNS() {
     lastWebshopDNSId = webshops[webshops.length - 1].id;
 }
 
-async function checkReplies() {
-    if (STAMHOOFD.environment !== 'production' || !STAMHOOFD.AWS_ACCESS_KEY_ID) {
-        return;
-    }
-
-    console.log('Checking replies from AWS SQS');
-    const sqs = new AWS.SQS();
-    const messages = await sqs.receiveMessage({ QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-email-forwarding', MaxNumberOfMessages: 10 }).promise();
-    if (messages.Messages) {
-        for (const message of messages.Messages) {
-            console.log('Received message from forwarding queue');
-
-            if (message.ReceiptHandle) {
-                if (STAMHOOFD.environment === 'production') {
-                    await sqs.deleteMessage({
-                        QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-email-forwarding',
-                        ReceiptHandle: message.ReceiptHandle,
-                    }).promise();
-                    console.log('Deleted from queue');
-                }
-            }
-
-            try {
-                if (message.Body) {
-                    // decode the JSON value
-                    const bounce = JSON.parse(message.Body);
-
-                    if (bounce.Message) {
-                        const message = JSON.parse(bounce.Message);
-
-                        // Read message content
-                        if (message.mail && message.content && message.receipt) {
-                            const content = message.content;
-                            const receipt = message.receipt as {
-                                recipients: string[];
-                                spamVerdict: { status: 'PASS' | string };
-                                virusVerdict: { status: 'PASS' | string };
-                                spfVerdict: { status: 'PASS' | string };
-                                dkimVerdict: { status: 'PASS' | string };
-                                dmarcVerdict: { status: 'PASS' | string };
-                            };
-
-                            const options = await ForwardHandler.handle(content, receipt);
-                            if (options) {
-                                if (STAMHOOFD.environment === 'production') {
-                                    Email.send(options);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (e) {
-                console.error(e);
-            }
-        }
-    }
-}
-
-let lastPostmarkCheck: Date | null = null;
-let lastPostmarkId: string | null = null;
-async function checkPostmarkBounces() {
-    if (STAMHOOFD.environment !== 'production') {
-        return;
-    }
-
-    const token = STAMHOOFD.POSTMARK_SERVER_TOKEN;
-    if (!token) {
-        console.log('[POSTMARK BOUNCES] No postmark token, skipping postmark bounces');
-        return;
-    }
-    const fromDate = (lastPostmarkCheck ?? new Date(new Date().getTime() - 24 * 60 * 60 * 1000 * 2));
-    const ET = DateTime.fromJSDate(fromDate).setZone('EST').toISO({ includeOffset: false });
-    console.log('[POSTMARK BOUNCES] Checking bounces from Postmark since', fromDate, ET);
-    const client = new postmark.ServerClient(token);
-
-    const bounces = await client.getBounces({
-        fromdate: ET,
-        todate: DateTime.now().setZone('EST').toISO({ includeOffset: false }),
-        count: 500,
-        offset: 0,
-    });
-
-    if (bounces.TotalCount == 0) {
-        console.log('[POSTMARK BOUNCES] No Postmark bounces at this time');
-        return;
-    }
-
-    let lastId: string | null = null;
-
-    for (const bounce of bounces.Bounces) {
-        // Try to get the organization, if possible, else default to global blocking: "null", which is not visible for an organization, but it is applied
-        const source = bounce.From;
-        const organization = source ? await Organization.getByEmail(source) : undefined;
-
-        if (bounce.Type === 'HardBounce' || bounce.Type === 'BadEmailAddress' || bounce.Type === 'Blocked') {
-            // Block for everyone, but not visible
-            console.log('[POSTMARK BOUNCES] Postmark ' + bounce.Type + ' for: ', bounce.Email, 'from', source, 'organization', organization?.name);
-            const emailAddress = await EmailAddress.getOrCreate(bounce.Email, organization?.id ?? null);
-            emailAddress.hardBounce = true;
-            await emailAddress.save();
-        }
-        else if (bounce.Type === 'SpamComplaint' || bounce.Type === 'SpamNotification' || bounce.Type === 'VirusNotification') {
-            console.log('[POSTMARK BOUNCES] Postmark ' + bounce.Type + ' for: ', bounce.Email, 'from', source, 'organization', organization?.name);
-            const emailAddress = await EmailAddress.getOrCreate(bounce.Email, organization?.id ?? null);
-            emailAddress.markedAsSpam = true;
-            await emailAddress.save();
-        }
-        else {
-            console.log('[POSTMARK BOUNCES] Unhandled Postmark ' + bounce.Type + ': ', bounce.Email, 'from', source, 'organization', organization?.name);
-            console.error('[POSTMARK BOUNCES] Unhandled Postmark ' + bounce.Type + ': ', bounce.Email, 'from', source, 'organization', organization?.name);
-        }
-
-        const bouncedAt = new Date(bounce.BouncedAt);
-        lastPostmarkCheck = lastPostmarkCheck ? new Date(Math.max(bouncedAt.getTime(), lastPostmarkCheck.getTime())) : bouncedAt;
-
-        lastId = bounce.ID;
-    }
-
-    if (lastId && lastPostmarkId) {
-        if (lastId === lastPostmarkId) {
-            console.log('[POSTMARK BOUNCES] Postmark has no new bounces');
-            // Increase timestamp by one second to avoid refetching it every time
-            if (lastPostmarkCheck) {
-                lastPostmarkCheck = new Date(lastPostmarkCheck.getTime() + 1000);
-            }
-        }
-    }
-    lastPostmarkId = lastId;
-}
-
-async function checkBounces() {
-    if (STAMHOOFD.environment !== 'production' || !STAMHOOFD.AWS_ACCESS_KEY_ID) {
-        return;
-    }
-
-    console.log('[AWS BOUNCES] Checking bounces from AWS SQS');
-    const sqs = new AWS.SQS();
-    const messages = await sqs.receiveMessage({ QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-bounces-queue', MaxNumberOfMessages: 10 }).promise();
-    if (messages.Messages) {
-        for (const message of messages.Messages) {
-            console.log('[AWS BOUNCES] Received bounce message');
-            console.log('[AWS BOUNCES]', message);
-
-            if (message.ReceiptHandle) {
-                if (STAMHOOFD.environment === 'production') {
-                    await sqs.deleteMessage({
-                        QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-bounces-queue',
-                        ReceiptHandle: message.ReceiptHandle,
-                    }).promise();
-                    console.log('[AWS BOUNCES] Deleted from queue');
-                }
-            }
-
-            try {
-                if (message.Body) {
-                    // decode the JSON value
-                    const bounce = JSON.parse(message.Body);
-
-                    if (bounce.Message) {
-                        const message = JSON.parse(bounce.Message);
-
-                        if (message.bounce) {
-                            const b = message.bounce;
-                            // Block all receivers that generate a permanent bounce
-                            const type = b.bounceType;
-
-                            const source = message.mail.source;
-
-                            // try to find organization that is responsible for this e-mail address
-
-                            for (const recipient of b.bouncedRecipients) {
-                                const email = recipient.emailAddress;
-
-                                if (
-                                    type === 'Permanent'
-                                    || (
-                                        recipient.diagnosticCode && (
-                                            (recipient.diagnosticCode as string).toLowerCase().includes('invalid domain')
-                                            || (recipient.diagnosticCode as string).toLowerCase().includes('unable to lookup dns')
-                                        )
-                                    )
-                                ) {
-                                    const organization: Organization | undefined = source ? await Organization.getByEmail(source) : undefined;
-                                    if (organization) {
-                                        const emailAddress = await EmailAddress.getOrCreate(email, organization.id);
-                                        emailAddress.hardBounce = true;
-                                        await emailAddress.save();
-                                    }
-                                    else {
-                                        console.error('[AWS BOUNCES] Unknown organization for email address ' + source);
-                                    }
-                                }
-                            }
-                            console.log('[AWS BOUNCES] For domain ' + source);
-                        }
-                        else {
-                            console.log("[AWS BOUNCES] 'bounce' field missing in bounce message");
-                        }
-                    }
-                    else {
-                        console.log("[AWS BOUNCES] 'Message' field missing in bounce message");
-                    }
-                }
-                else {
-                    console.log('[AWS BOUNCES] Message Body missing in bounce');
-                }
-            }
-            catch (e) {
-                console.log('[AWS BOUNCES] Bounce message processing failed:');
-                console.error('[AWS BOUNCES] Bounce message processing failed:');
-                console.error('[AWS BOUNCES]', e);
-            }
-        }
-    }
-}
-
-async function checkComplaints() {
-    if (STAMHOOFD.environment !== 'production' || !STAMHOOFD.AWS_ACCESS_KEY_ID) {
-        return;
-    }
-
-    console.log('[AWS COMPLAINTS] Checking complaints from AWS SQS');
-    const sqs = new AWS.SQS();
-    const messages = await sqs.receiveMessage({ QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-complaints-queue', MaxNumberOfMessages: 10 }).promise();
-    if (messages.Messages) {
-        for (const message of messages.Messages) {
-            console.log('[AWS COMPLAINTS] Received complaint message');
-            console.log('[AWS COMPLAINTS]', message);
-
-            if (message.ReceiptHandle) {
-                if (STAMHOOFD.environment === 'production') {
-                    await sqs.deleteMessage({
-                        QueueUrl: 'https://sqs.eu-west-1.amazonaws.com/118244293157/stamhoofd-complaints-queue',
-                        ReceiptHandle: message.ReceiptHandle,
-                    }).promise();
-                    console.log('[AWS COMPLAINTS] Deleted from queue');
-                }
-            }
-
-            try {
-                if (message.Body) {
-                    // decode the JSON value
-                    const complaint = JSON.parse(message.Body);
-                    console.log('[AWS COMPLAINTS]', complaint);
-
-                    if (complaint.Message) {
-                        const message = JSON.parse(complaint.Message);
-
-                        if (message.complaint) {
-                            const b = message.complaint;
-                            const source = message.mail.source;
-                            const organization: Organization | undefined = source ? await Organization.getByEmail(source) : undefined;
-
-                            const type: 'abuse' | 'auth-failure' | 'fraud' | 'not-spam' | 'other' | 'virus' = b.complaintFeedbackType;
-
-                            if (organization) {
-                                for (const recipient of b.complainedRecipients) {
-                                    const email = recipient.emailAddress;
-                                    const emailAddress = await EmailAddress.getOrCreate(email, organization.id);
-                                    emailAddress.markedAsSpam = type !== 'not-spam';
-                                    await emailAddress.save();
-                                }
-                            }
-                            else {
-                                console.error('[AWS COMPLAINTS] Unknown organization for email address ' + source);
-                            }
-
-                            if (type == 'virus' || type == 'fraud') {
-                                console.error('[AWS COMPLAINTS] Received virus / fraud complaint!');
-                                console.error('[AWS COMPLAINTS]', complaint);
-                                if (STAMHOOFD.environment === 'production') {
-                                    Email.sendWebmaster({
-                                        subject: 'Received a ' + type + ' email notification',
-                                        text: 'We received a ' + type + ' notification for an e-mail from the organization: ' + organization?.name + '. Please check and adjust if needed.\n',
-                                    });
-                                }
-                            }
-                        }
-                        else {
-                            console.log('[AWS COMPLAINTS] Missing complaint field');
-                        }
-                    }
-                    else {
-                        console.log('[AWS COMPLAINTS] Missing message field in complaint');
-                    }
-                }
-            }
-            catch (e) {
-                console.log('[AWS COMPLAINTS] Complain message processing failed:');
-                console.error('[AWS COMPLAINTS] Complain message processing failed:');
-                console.error('[AWS COMPLAINTS]', e);
-            }
-        }
-    }
-}
-
 // Keep checking pending paymetns for 3 days
 async function checkPayments() {
     if (STAMHOOFD.environment === 'development') {
@@ -658,14 +349,11 @@ async function checkDrips() {
 
 registerCron('checkSettlements', checkSettlements);
 registerCron('checkExpirationEmails', checkExpirationEmails);
-registerCron('checkPostmarkBounces', checkPostmarkBounces);
 registerCron('checkReservedUntil', checkReservedUntil);
-registerCron('checkComplaints', checkComplaints);
-registerCron('checkReplies', checkReplies);
-registerCron('checkBounces', checkBounces);
 registerCron('checkDNS', checkDNS);
 registerCron('checkWebshopDNS', checkWebshopDNS);
 registerCron('checkPayments', checkPayments);
 registerCron('checkDrips', checkDrips);
-registerCron('clearExcelCache', clearExcelCache);
-registerCron('endFunctionsOfUsersWithoutRegistration', endFunctionsOfUsersWithoutRegistration);
+
+// Register other crons
+import './crons/index.js';

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

@@ -2,8 +2,8 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, SetupStepUpdater, User } from '@stamhoofd/models';
-import { AuditLogType, GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
+import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
+import { GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Email } from '@stamhoofd/email';
@@ -13,9 +13,9 @@ import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructure
 import { Context } from '../../../helpers/Context';
 import { MembershipCharger } from '../../../helpers/MembershipCharger';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
-import { AuditLogService } from '../../../services/AuditLogService';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
 import { RegistrationService } from '../../../services/RegistrationService';
+import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;

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

@@ -1,6 +1,6 @@
 import { AutoEncoderPatchType, Decoder, isPatchableArray, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Organization, Platform, RegistrationPeriod, SetupStepUpdater } from '@stamhoofd/models';
+import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { MemberResponsibility, PlatformConfig, PlatformPremiseType, Platform as PlatformStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
@@ -10,6 +10,7 @@ import { MembershipCharger } from '../../../helpers/MembershipCharger';
 import { PeriodHelper } from '../../../helpers/PeriodHelper';
 import { TagHelper } from '../../../helpers/TagHelper';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
+import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;

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([

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

@@ -1,7 +1,7 @@
 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 { 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';
 
@@ -10,6 +10,7 @@ import { BuckarooHelper } from '../../../../helpers/BuckarooHelper';
 import { Context } from '../../../../helpers/Context';
 import { TagHelper } from '../../../../helpers/TagHelper';
 import { ViesHelper } from '../../../../helpers/ViesHelper';
+import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;

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

@@ -3,9 +3,10 @@ import { GroupPrivateSettings, Group as GroupStruct, GroupType, OrganizationRegi
 
 import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, 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 { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -303,11 +304,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             throw Context.auth.error('Je hebt geen toegangsrechten om deze groep te wijzigen');
         }
 
-        const previousProperties = {
-            deletedAt: model.deletedAt,
-            defaultAgeGroupId: model.defaultAgeGroupId,
-        };
-
         if (struct.settings) {
             struct.settings.period = undefined; // Not allowed to patch manually
             model.settings.patchOrPut(struct.settings);
@@ -422,9 +418,7 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             }
         }
 
-        await model.updateOccupancy({
-            previousProperties,
-        });
+        await model.updateOccupancy();
         await model.save();
     }
 
@@ -505,8 +499,6 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         }
 
         await model.save();
-        await model.updateOccupancy({ isNew: true }); // Force update steps
-
         return model;
     }
 }

package/src/helpers/MemberUserSyncer.ts

@@ -187,7 +187,6 @@ export class MemberUserSyncerStatic {
 
         if (user.memberId === member.id) {
             user.memberId = null;
-            await user.save();
         }
 
         // Update model relation to correct response
@@ -239,11 +238,7 @@ export class MemberUserSyncerStatic {
                 await this.updateInheritedPermissions(user);
             }
             else {
-                if (user.memberId === member.id) {
-                    // Unlink: parents are never 'equal' to the member
-                    user.memberId = null;
-                    await this.updateInheritedPermissions(user);
-                }
+                let shouldSave = false;
 
                 if (!user.firstName && !user.lastName) {
                     const parents = member.details.parents.filter(p => p.email === email);
@@ -252,13 +247,22 @@ export class MemberUserSyncerStatic {
                             user.firstName = parents[0].firstName;
                             user.lastName = parents[0].lastName;
                         }
-                        await user.save();
+                        shouldSave = true;
                     }
                 }
 
                 if (user.firstName === member.details.firstName && user.lastName === member.details.lastName) {
                     user.firstName = null;
                     user.lastName = null;
+                    shouldSave = true;
+                }
+
+                if (user.memberId === member.id) {
+                    // Unlink: parents are never 'equal' to the member
+                    user.memberId = null;
+                    await this.updateInheritedPermissions(user);
+                }
+                if (shouldSave) {
                     await user.save();
                 }
             }

package/src/helpers/PeriodHelper.ts

@@ -1,11 +1,12 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, SetupStepUpdater } from '@stamhoofd/models';
+import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 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';
 import { AuditLogService } from '../services/AuditLogService';
+import { SetupStepUpdater } from './SetupStepUpdater';
 
 export class PeriodHelper {
     static async moveOrganizationToPeriod(organization: Organization, period: RegistrationPeriod) {