@stamhoofd/backend 2.59.0 → 2.60.0

package/index.ts

@@ -16,6 +16,8 @@ import { ContextMiddleware } from './src/middleware/ContextMiddleware';
 import { Platform } from '@stamhoofd/models';
 import { AuditLogService } from './src/services/AuditLogService';
 import { PlatformMembershipService } from './src/services/PlatformMembershipService';
+import { DocumentService } from './src/services/DocumentService';
+import { SetupStepUpdater } from './src/helpers/SetupStepUpdater';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -189,6 +191,8 @@ const start = async () => {
 
     AuditLogService.listen();
     PlatformMembershipService.listen();
+    DocumentService.listen();
+    SetupStepUpdater.listen();
 };
 
 start().catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.59.0",
+    "version": "2.60.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -37,14 +37,14 @@
         "@simonbackx/simple-encoding": "2.18.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.59.0",
-        "@stamhoofd/backend-middleware": "2.59.0",
-        "@stamhoofd/email": "2.59.0",
-        "@stamhoofd/models": "2.59.0",
-        "@stamhoofd/queues": "2.59.0",
-        "@stamhoofd/sql": "2.59.0",
-        "@stamhoofd/structures": "2.59.0",
-        "@stamhoofd/utility": "2.59.0",
+        "@stamhoofd/backend-i18n": "2.60.0",
+        "@stamhoofd/backend-middleware": "2.60.0",
+        "@stamhoofd/email": "2.60.0",
+        "@stamhoofd/models": "2.60.0",
+        "@stamhoofd/queues": "2.60.0",
+        "@stamhoofd/sql": "2.60.0",
+        "@stamhoofd/structures": "2.60.0",
+        "@stamhoofd/utility": "2.60.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "a7043be8f8fde4fd1c91943495132a21921ebbe1"
+    "gitHead": "94ec449bbd82a2e3f49471e66136b04b902587bd"
 }

package/src/audit-logs/DocumentTemplateLogger.ts

@@ -0,0 +1,22 @@
+import { DocumentTemplate } from '@stamhoofd/models';
+import { getDefaultGenerator, ModelLogger } from './ModelLogger';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
+
+export const DocumentTemplateLogger = new ModelLogger(DocumentTemplate, {
+    skipKeys: ['html'],
+    optionsGenerator: getDefaultGenerator({
+        created: AuditLogType.DocumentTemplateAdded,
+        updated: AuditLogType.DocumentTemplateEdited,
+        deleted: AuditLogType.DocumentTemplateDeleted,
+    }),
+
+    createReplacements(model) {
+        return new Map([
+            ['d', AuditLogReplacement.create({
+                id: model.id,
+                value: model.settings.name,
+                type: AuditLogReplacementType.DocumentTemplate,
+            })],
+        ]);
+    },
+});

package/src/audit-logs/MemberPlatformMembershipLogger.ts

@@ -1,5 +1,5 @@
-import { Member, MemberPlatformMembership } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLogType, uuidToName } from '@stamhoofd/structures';
+import { Member, MemberPlatformMembership, Platform } from '@stamhoofd/models';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { getDefaultGenerator, ModelLogger } from './ModelLogger';
 
@@ -29,6 +29,7 @@ export const MemberPlatformMembershipLogger = new ModelLogger(MemberPlatformMemb
             ...result,
             data: {
                 member,
+                platform: await Platform.getSharedStruct(),
             },
             objectId: event.model.memberId,
         };
@@ -39,10 +40,12 @@ export const MemberPlatformMembershipLogger = new ModelLogger(MemberPlatformMemb
     },
 
     createReplacements(model, options) {
+        const name = options.data.platform.config.membershipTypes.find(r => r.id === model.membershipTypeId)?.name;
+
         const map = new Map([
             ['pm', AuditLogReplacement.create({
                 id: model.membershipTypeId,
-                value: uuidToName(model.membershipTypeId) || undefined,
+                value: name,
                 type: AuditLogReplacementType.PlatformMembershipType,
             })],
             ['m', AuditLogReplacement.create({

package/src/audit-logs/ModelLogger.ts

@@ -3,7 +3,7 @@ import { AuditLog } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
 import { ContextInstance } from '../helpers/Context';
 import { AuditLogService } from '../services/AuditLogService';
-import { createUnknownChangeHandler } from '../services/explainPatch';
+import { diffUnknown } from '../services/diff';
 
 export type ModelEventLogOptions<D> = {
     type: AuditLogType;
@@ -150,9 +150,10 @@ export class ModelLogger<ModelType extends typeof Model, M extends InstanceType<
                             // Ignore relations
                             continue;
                         }
-                        log.patchList.push(...createUnknownChangeHandler(key)(
+                        log.patchList.push(...diffUnknown(
                             key in oldModel ? oldModel[key] : undefined,
                             key in event.model ? event.model[key] : undefined,
+                            AuditLogReplacement.key(key),
                         ));
                     }
 

package/src/audit-logs/OrderLogger.ts

@@ -46,7 +46,7 @@ export const OrderLogger = new ModelLogger(Order, {
                 value: options.data.webshop.meta.name,
                 type: AuditLogReplacementType.Webshop,
             })],
-            ['org', AuditLogReplacement.create({
+            ['o', AuditLogReplacement.create({
                 id: model.id,
                 value: model.number ? `bestelling #${model.number}` : `bestelling van ${model.data.customer.name}`,
                 type: AuditLogReplacementType.Order,

package/src/audit-logs/OrganizationLogger.ts

@@ -1,6 +1,6 @@
 import { Organization } from '@stamhoofd/models';
+import { AuditLogType } from '@stamhoofd/structures';
 import { getDefaultGenerator, ModelLogger } from './ModelLogger';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLogType } from '@stamhoofd/structures';
 
 export const OrganizationLogger = new ModelLogger(Organization, {
     skipKeys: ['searchIndex'],
@@ -10,16 +10,6 @@ export const OrganizationLogger = new ModelLogger(Organization, {
         deleted: AuditLogType.OrganizationDeleted,
     }),
 
-    createReplacements(model) {
-        return new Map([
-            ['o', AuditLogReplacement.create({
-                id: model.id,
-                value: model.name,
-                type: AuditLogReplacementType.Organization,
-            })],
-        ]);
-    },
-
     postProcess(event, options, log) {
         log.organizationId = event.model.id;
     },

package/src/crons/updateSetupSteps.ts

@@ -1,4 +1,4 @@
-import { SetupStepUpdater } from '@stamhoofd/models';
+import { SetupStepUpdater } from '../helpers/SetupStepUpdater.js';
 
 export async function updateSetupSteps() {
     if (STAMHOOFD.userMode !== 'platform') {

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/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) {