@stamhoofd/backend 2.119.0 → 2.120.1

package/src/seeds/1754560914-groups-prices.ts

@@ -1,6 +1,7 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Group, OrganizationRegistrationPeriod } from '@stamhoofd/models';
-import { BundleDiscount, BundleDiscountGroupPriceSettings, GroupCategory, GroupPrice, GroupPriceDiscount, GroupPriceDiscountType, GroupStatus, GroupType, OldGroupPrice, OldGroupPrices, ReduceablePrice, TranslatedString } from '@stamhoofd/structures';
+import type { GroupCategory} from '@stamhoofd/structures';
+import { BundleDiscount, BundleDiscountGroupPriceSettings, GroupPrice, GroupPriceDiscount, GroupPriceDiscountType, GroupStatus, GroupType, OldGroupPrice, OldGroupPrices, ReduceablePrice, TranslatedString } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 const UNNASSIGNED_KEY = 'unassigned';

package/src/seeds/1755876819-remove-duplicate-members.ts

@@ -1,4 +1,5 @@
-import { Migration, SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import { Migration } from '@simonbackx/simple-database';
 import { Member, mergeTwoMembers } from '@stamhoofd/models';
 import { SQL, SQLSelect } from '@stamhoofd/sql';
 import { PatchOrganizationMembersEndpoint } from '../endpoints/global/members/PatchOrganizationMembersEndpoint.js';

package/src/seeds/1765896674-document-update-year.test.ts

@@ -1,4 +1,5 @@
-import { DocumentTemplate, DocumentTemplateFactory, GroupFactory, OrganizationFactory, RegistrationPeriod, RegistrationPeriodFactory } from '@stamhoofd/models';
+import type { RegistrationPeriod} from '@stamhoofd/models';
+import { DocumentTemplate, DocumentTemplateFactory, GroupFactory, OrganizationFactory, RegistrationPeriodFactory } from '@stamhoofd/models';
 import { migrateDocumentYears } from './1765896674-document-update-year.js';
 
 describe('migration.document-update-year', () => {

package/src/seeds/1773754928-force-save-members.ts

@@ -0,0 +1,15 @@
+import { Migration } from '@simonbackx/simple-database';
+import { Member, Registration } from '@stamhoofd/models';
+
+export default new Migration(async () => {
+    process.stdout.write('\n');
+    for await (const member of Member.select().all()) {
+        member.forceSaveProperty('details');
+        await member.save();
+    }
+
+    for await (const registration of Registration.select().all()) {
+        registration.forceSaveProperty('groupPrice');
+        await registration.save();
+    }
+});

package/src/services/AuditLogService.ts

@@ -1,5 +1,6 @@
-import { Model, ModelEvent } from '@simonbackx/simple-database';
-import { AuditLogSource } from '@stamhoofd/structures';
+import type { ModelEvent } from '@simonbackx/simple-database';
+import { Model } from '@simonbackx/simple-database';
+import type { AuditLogSource } from '@stamhoofd/structures';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
 export type AuditLogContextSettings = {

package/src/services/BalanceItemPaymentService.ts

@@ -1,5 +1,5 @@
-import { ManyToOneRelation } from '@simonbackx/simple-database';
-import { BalanceItemPayment, Organization } from '@stamhoofd/models';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import type { BalanceItemPayment, Organization } from '@stamhoofd/models';
 import { BalanceItemService } from './BalanceItemService.js';
 
 type Loaded<T> = (T) extends ManyToOneRelation<infer Key, infer Model> ? Record<Key, Model> : never;

package/src/services/BalanceItemService.ts

@@ -1,5 +1,6 @@
 import { Model } from '@simonbackx/simple-database';
-import { BalanceItem, CachedBalance, Document, MemberUser, Order, Organization, Payment, Webshop } from '@stamhoofd/models';
+import type { Organization, Payment} from '@stamhoofd/models';
+import { BalanceItem, CachedBalance, Document, MemberUser, Order, Webshop } from '@stamhoofd/models';
 import { AuditLogSource, BalanceItemStatus, BalanceItemType, OrderStatus, PaymentStatus, ReceivableBalanceType } from '@stamhoofd/structures';
 import { GroupedThrottledQueue } from '../helpers/GroupedThrottledQueue.js';
 import { ThrottledQueue } from '../helpers/ThrottledQueue.js';

package/src/services/BootChecksService.test.ts

@@ -0,0 +1,33 @@
+import { TestUtils } from '@stamhoofd/test-utils';
+import { BootChecksService } from './BootChecksService.js';
+import { DatabaseCollationService } from './DatabaseCollationService.js';
+import { StartupHealthService } from './StartupHealthService.js';
+
+describe('BootChecksService', () => {
+    beforeEach(() => {
+        vi.restoreAllMocks();
+        StartupHealthService.clearForTesting();
+    });
+
+    afterEach(() => {
+        vi.restoreAllMocks();
+        StartupHealthService.clearForTesting();
+    });
+
+    test('Throws outside production when collation mismatches', async () => {
+        TestUtils.setEnvironment('environment', 'development');
+
+        vi.spyOn(DatabaseCollationService, 'getMismatchError').mockResolvedValue('MySQL collation mismatch test error');
+
+        await expect(BootChecksService.checkDatabaseCollation()).rejects.toThrow('MySQL collation mismatch test error');
+    });
+
+    test('Marks startup unhealthy in production when collation mismatches', async () => {
+        TestUtils.setEnvironment('environment', 'production');
+
+        vi.spyOn(DatabaseCollationService, 'getMismatchError').mockResolvedValue('MySQL collation mismatch test error');
+
+        await expect(BootChecksService.checkDatabaseCollation()).resolves.toBeUndefined();
+        expect(StartupHealthService.getErrors()).toContain('MySQL collation mismatch test error');
+    });
+});

package/src/services/BootChecksService.ts

@@ -0,0 +1,21 @@
+import { DatabaseCollationService } from './DatabaseCollationService.js';
+import { StartupHealthService } from './StartupHealthService.js';
+
+export class BootChecksService {
+    static async checkDatabaseCollation() {
+        const collationMismatchError = await DatabaseCollationService.getMismatchError();
+
+        if (!collationMismatchError) {
+            return;
+        }
+
+        if (STAMHOOFD.environment === 'production') {
+            console.error(collationMismatchError);
+            console.error('Health endpoint will keep returning a non-2xx status until the process is restarted with a fixed database collation.');
+            StartupHealthService.markUnhealthy(collationMismatchError);
+            return;
+        }
+
+        throw new Error(collationMismatchError);
+    }
+}

package/src/services/DatabaseCollationService.test.ts

@@ -0,0 +1,18 @@
+import { Database } from '@simonbackx/simple-database';
+import { DatabaseCollationService } from './DatabaseCollationService.js';
+
+describe('DatabaseCollationService', () => {
+    test('Detects collation_connection mismatch', async () => {
+        await Database.statement('SET collation_connection = \'utf8mb4_general_ci\'');
+
+        try {
+            const error = await DatabaseCollationService.getMismatchError();
+            expect(error).toContain('MySQL collation mismatch');
+            expect(error).toContain('expected utf8mb4_0900_ai_ci');
+            expect(error).toContain('collation_connection=utf8mb4_general_ci');
+        }
+        finally {
+            await Database.statement('SET collation_connection = DEFAULT');
+        }
+    });
+});

package/src/services/DatabaseCollationService.ts

@@ -0,0 +1,81 @@
+import { Database } from '@simonbackx/simple-database';
+
+const EXPECTED_COLLATION = 'utf8mb4_0900_ai_ci';
+
+type CollationRow = {
+    collationConnection: string;
+    collationDatabase: string;
+};
+
+export class DatabaseCollationService {
+    static expectedCollation = EXPECTED_COLLATION;
+
+    static async getCurrentCollations() {
+        const connectionResult = await Database.statement("SHOW VARIABLES LIKE 'collation_connection'");
+        const databaseResult = await Database.statement("SHOW VARIABLES LIKE 'collation_database'");
+
+        const collationConnection = this.extractVariableValue(connectionResult);
+        const collationDatabase = this.extractVariableValue(databaseResult);
+
+        return {
+            collationConnection: typeof collationConnection === 'string' ? collationConnection : '',
+            collationDatabase: typeof collationDatabase === 'string' ? collationDatabase : '',
+        } as CollationRow;
+    }
+
+    private static extractVariableValue(result: unknown) {
+        if (result && typeof result === 'object' && 'rows' in result) {
+            return this.extractVariableValue((result as { rows: unknown }).rows);
+        }
+
+        if (Array.isArray(result) && result.length > 0 && Array.isArray(result[0])) {
+            return this.extractVariableValue(result[0]);
+        }
+
+        if (!Array.isArray(result) || result.length === 0) {
+            return '';
+        }
+
+        const firstRow = result[0] as Record<string, unknown> | undefined;
+
+        if (!firstRow) {
+            return '';
+        }
+
+        const value = firstRow.Value
+            ?? firstRow.value
+            ?? firstRow.VARIABLE_VALUE
+            ?? firstRow.variable_value;
+
+        if (typeof value === 'string') {
+            return value;
+        }
+
+        for (const candidate of Object.values(firstRow)) {
+            if (typeof candidate === 'string' && candidate.startsWith('utf8mb4_')) {
+                return candidate;
+            }
+        }
+
+        return '';
+    }
+
+    static async getMismatchError() {
+        const collations = await this.getCurrentCollations();
+        const mismatches: string[] = [];
+
+        if (collations.collationConnection !== this.expectedCollation) {
+            mismatches.push(`collation_connection=${collations.collationConnection}`);
+        }
+
+        if (collations.collationDatabase !== this.expectedCollation) {
+            mismatches.push(`collation_database=${collations.collationDatabase}`);
+        }
+
+        if (mismatches.length === 0) {
+            return null;
+        }
+
+        return `MySQL collation mismatch: expected ${this.expectedCollation}, got ${mismatches.join(', ')}`;
+    }
+}

package/src/services/DocumentService.ts

@@ -1,5 +1,5 @@
 import { Model } from '@simonbackx/simple-database';
-import { PlainObject } from '@simonbackx/simple-encoding';
+import type { PlainObject } from '@simonbackx/simple-encoding';
 import { Document, Group } from '@stamhoofd/models';
 
 function getGroupFieldsAffectingDocuments(group: Group): PlainObject {

package/src/services/EventNotificationService.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EventNotification, Member, MemberResponsibilityRecord, Organization, Platform, sendEmailTemplate, User } from '@stamhoofd/models';
-import { EmailTemplateType, PermissionLevel, Recipient, RecordCategory, Replacement } from '@stamhoofd/structures';
+import type { EmailTemplateType} from '@stamhoofd/structures';
+import { PermissionLevel, Recipient, RecordCategory, Replacement } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { AdminPermissionChecker } from '../helpers/AdminPermissionChecker.js';
 import { Context } from '../helpers/Context.js';

package/src/services/FileSignService.ts

@@ -2,7 +2,7 @@ import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'; // ES Modules i
 import {
     getSignedUrl,
 } from '@aws-sdk/s3-request-presigner';
-import { DecodedRequest, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { File } from '@stamhoofd/structures';
 import chalk from 'chalk';

package/src/services/MemberNumberService.ts

@@ -1,7 +1,9 @@
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { Member, MemberPlatformMembership, Organization } from '@stamhoofd/models';
+import type { Member, MemberPlatformMembership} from '@stamhoofd/models';
+import { Organization } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { scalarToSQLExpression, SQL, SQLCharLength, SQLWhereLike } from '@stamhoofd/sql';
+import { MemberNumberAlgorithm } from '@stamhoofd/types/MemberNumberAlgorithm';
 
 export class MemberNumberService {
     static async assignMemberNumber(member: Member, membership: MemberPlatformMembership) {

package/src/services/MemberRecordStore.ts

@@ -1,33 +1,31 @@
 import { Model } from '@simonbackx/simple-database';
 import { Organization, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { RecordSettings } from '@stamhoofd/structures';
+import type { RecordSettings } from '@stamhoofd/structures';
 
 export type RecordCacheEntry = { record: RecordSettings; rootCategoryId: string; organizationId: string | null };
 
 /**
  * Service that caches all available member records in the system.
- * - It verified whether ids are unique system wide
+ * - It verifies whether ids are unique system wide
  * - It allows fast retrieving of record settings by id (for permission checking)
  */
-export class MemberRecordStore {
-    private static cache = new Map<string, RecordCacheEntry>();
+class MemberRecordStoreService {
+    private  cache = new Map<string, RecordCacheEntry>();
 
-    constructor() {
-
-    }
+    init() {
+        // Should only be used in userMode platform
+        if (STAMHOOFD.userMode !== 'platform') {
+            return;
+        }
 
-    static init() {
         // Load initial data
         this.loadIfNeeded().catch(console.error);
-
-        // Create listeners to update data as organizations and platform is updated
-        this.listen();
     }
 
-    private static listening = false;
+    private  listening = false;
 
-    private static listen() {
+    private  listen() {
         // Create listeners to update data as organizations and platform is updated
         if (this.listening) {
             return;
@@ -66,7 +64,7 @@ export class MemberRecordStore {
             }
 
             if (event.model instanceof Organization) {
-                // Delete all records with organizationId = null
+                // Delete all records where organizationId equals the organization
                 for (const [id, entry] of this.cache) {
                     if (entry.organizationId === event.model.id) {
                         this.cache.delete(id);
@@ -88,10 +86,10 @@ export class MemberRecordStore {
         });
     }
 
-    static _loadAllPromise: Promise<void> | null = null;
-    static _didLoadAll = false;
+    private  _loadAllPromise: Promise<void> | null = null;
+    private  _didLoadAll = false;
 
-    static async loadIfNeeded() {
+    private async loadIfNeeded() {
         if (this._didLoadAll) {
             return;
         }
@@ -100,6 +98,11 @@ export class MemberRecordStore {
             await this._loadAllPromise;
         }
         else {
+            if (STAMHOOFD.userMode !== 'platform') {
+                // Important to throw an error because in tests the userMode can change in between tests
+                throw new Error('Should only be loaded in userMode platform.');
+            }
+
             this._loadAllPromise = (async () => {
                 try {
                     await this.loadAll();
@@ -116,7 +119,7 @@ export class MemberRecordStore {
         }
     }
 
-    static async loadAll() {
+    private async loadAll() {
         this.cache = new Map<string, RecordCacheEntry>();
 
         // We use a queue here so we can abort this long running task properly
@@ -155,10 +158,16 @@ export class MemberRecordStore {
                 abort.throwIfAborted();
             }
         });
+
+        // Create listeners to update data as organizations and platform is updated.
+        // Should be checked on every loadAll because the userMode can change for tests.
+        this.listen();
     }
 
-    static async getRecord(id: string): Promise<RecordCacheEntry | null> {
+     async getRecord(id: string): Promise<RecordCacheEntry | null> {
         await this.loadIfNeeded();
         return this.cache.get(id) ?? null;
     }
 }
+
+export const MemberRecordStore = new MemberRecordStoreService();

package/src/services/PaymentReallocationService.test.ts

@@ -1,4 +1,5 @@
-import { BalanceItem, BalanceItemPayment, MemberFactory, Organization, OrganizationFactory, Payment } from '@stamhoofd/models';
+import type { Organization} from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, MemberFactory, OrganizationFactory, Payment } from '@stamhoofd/models';
 import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, PaymentMethod, PaymentStatus, ReceivableBalanceType, TranslatedString } from '@stamhoofd/structures';
 import { PaymentReallocationService } from './PaymentReallocationService.js';
 import { BalanceItemService } from './BalanceItemService.js';

package/src/services/PaymentReallocationService.ts

@@ -1,6 +1,7 @@
 import { BalanceItem, BalanceItemPayment, CachedBalance, Payment } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { BalanceItemStatus, doBalanceItemRelationsMatch, PaymentMethod, PaymentStatus, PaymentType, ReceivableBalanceType } from '@stamhoofd/structures';
+import type { ReceivableBalanceType } from '@stamhoofd/structures';
+import { BalanceItemStatus, doBalanceItemRelationsMatch, PaymentMethod, PaymentStatus, PaymentType } from '@stamhoofd/structures';
 import { Sorter } from '@stamhoofd/utility';
 import { BalanceItemService } from './BalanceItemService.js';
 

package/src/services/PaymentService.ts

@@ -1,8 +1,10 @@
-import createMollieClient, { PaymentMethod as molliePaymentMethod, PaymentStatus as MolliePaymentStatus } from '@mollie/api-client';
+import { createMollieClient, PaymentMethod as molliePaymentMethod, PaymentStatus as MolliePaymentStatus } from '@mollie/api-client';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, BalanceItemPayment, Group, Member, MolliePayment, MollieToken, Organization, PayconiqPayment, Payment, sendEmailTemplate, User } from '@stamhoofd/models';
+import type { BalanceItem, Member, User } from '@stamhoofd/models';
+import { BalanceItemPayment, Group, MolliePayment, MollieToken, Organization, PayconiqPayment, Payment, sendEmailTemplate } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, BalanceItemType, Checkoutable, Country, EmailTemplateType, PaymentConfiguration, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, PaymentType, Recipient, VATExcemptReason, Version } from '@stamhoofd/structures';
+import type { Checkoutable, PaymentConfiguration } from '@stamhoofd/structures';
+import { AuditLogSource, BalanceItemType, EmailTemplateType, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, PaymentType, Recipient, VATExcemptReason, Version } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { buildReplacementOptions, getEmailReplacementsForPayment } from '../email-replacements/getEmailReplacementsForPayment.js';
 import { BuckarooHelper } from '../helpers/BuckarooHelper.js';

package/src/services/RegistrationService.ts

@@ -1,6 +1,6 @@
 import { ManyToOneRelation } from '@simonbackx/simple-database';
-import { BalanceItem, Document, Group, Member, Registration } from '@stamhoofd/models';
-import { AppliedRegistrationDiscount, AuditLogSource, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, EmailTemplateType, StockReservation, TranslatedString, Version } from '@stamhoofd/structures';
+import { BalanceItem, Document, Group, Member, Organization, Registration, sendEmailTemplate } from '@stamhoofd/models';
+import { AppliedRegistrationDiscount, AuditLogSource, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, EmailTemplateType, Recipient, Replacement, StockReservation, TranslatedString, Version } from '@stamhoofd/structures';
 import { AuditLogService } from './AuditLogService.js';
 import { GroupService } from './GroupService.js';
 import { PlatformMembershipService } from './PlatformMembershipService.js';
@@ -58,7 +58,7 @@ export const RegistrationService = {
         await PlatformMembershipService.updateMembershipsForId(registration.memberId);
 
         if (registration.sendConfirmationEmail) {
-            await registration.sendEmailTemplate({
+            await RegistrationService.sendEmailTemplate(registration, {
                 type: EmailTemplateType.RegistrationConfirmation,
             });
         }
@@ -76,6 +76,68 @@ export const RegistrationService = {
         return true;
     },
 
+    async getRecipients(registration: Registration, organization: Organization, group: Group) {
+        const member = await Member.getByIdWithUsers(registration.memberId);
+
+        if (!member) {
+            return [];
+        }
+
+        const allowedEmails = member.details.getNotificationEmails();
+
+        return member.users.map(user => Recipient.create({
+            firstName: user.firstName,
+            lastName: user.lastName,
+            email: user.email,
+            userId: user.id,
+            replacements: [
+                Replacement.create({
+                    token: 'firstNameMember',
+                    value: member.details.firstName,
+                }),
+                Replacement.create({
+                    token: 'lastNameMember',
+                    value: member.details.lastName,
+                }),
+                Replacement.create({
+                    token: 'registerUrl',
+                    value: 'https://' + organization.getHost(),
+                }),
+                Replacement.create({
+                    token: 'groupName',
+                    value: group.settings.name.toString(),
+                }),
+            ],
+        })).filter(r => allowedEmails.includes(r.email.toLocaleLowerCase()));
+    },
+
+    async sendEmailTemplate(registration: Registration, data: {
+        type: EmailTemplateType;
+    }) {
+        const group = await Group.getByID(registration.groupId);
+
+        if (!group) {
+            return;
+        }
+
+        const organization = await Organization.getByID(group.organizationId);
+        if (!organization) {
+            return;
+        }
+
+        const recipients = await RegistrationService.getRecipients(registration, organization, group);
+
+        // Create e-mail builder
+        await sendEmailTemplate(organization, {
+            template: {
+                type: data.type,
+                group,
+            },
+            recipients,
+            type: 'transactional',
+        });
+    },
+
     async updateDiscounts(registrationId: string) {
         await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
             await QueueHandler.schedule('registration-discounts-update-' + registrationId, async function (this: undefined) {

package/src/services/SSOService.ts

@@ -1,12 +1,16 @@
-import { DecodedRequest, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest} from '@simonbackx/simple-endpoints';
+import { Response } from '@simonbackx/simple-endpoints';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { Organization, Platform, Token, User, Webshop } from '@stamhoofd/models';
-import { LoginMethod, LoginProviderType, OpenIDClientConfiguration, StartOpenIDFlowStruct, Token as TokenStruct } from '@stamhoofd/structures';
+import type { Organization} from '@stamhoofd/models';
+import { Platform, Token, User, Webshop } from '@stamhoofd/models';
+import type { LoginMethod, StartOpenIDFlowStruct} from '@stamhoofd/structures';
+import { LoginProviderType, OpenIDClientConfiguration, Token as TokenStruct } from '@stamhoofd/structures';
 import crypto from 'crypto';
 import { generators, Issuer } from 'openid-client';
 import { Context } from '../helpers/Context.js';
 
-import { CookieHelper, ObjectWithHeaders } from '../helpers/CookieHelper.js';
+import type { ObjectWithHeaders } from '../helpers/CookieHelper.js';
+import { CookieHelper } from '../helpers/CookieHelper.js';
 
 async function randomBytes(size: number): Promise<Buffer> {
     return new Promise((resolve, reject) => {

package/src/services/STPackageService.ts

@@ -1,7 +1,9 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Organization, Platform, Registration, STPackage } from '@stamhoofd/models';
+import { BalanceItem, Organization, Platform, STPackage } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, Country, PaymentCustomer, STPackageStatus, STPackageType, STPricingType, TranslatedString, VATExcemptReason } from '@stamhoofd/structures';
+import type { PaymentCustomer, STPackageStatus, STPackageType } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, STPricingType, TranslatedString, VATExcemptReason } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { Formatter } from '@stamhoofd/utility';
 import { GroupBuilder } from '../helpers/GroupBuilder.js';
 
@@ -27,7 +29,7 @@ export class STPackageService {
         let membersCount: number | null = null;
 
         if (membersCount === null && pack.meta.pricingType === STPricingType.PerMember) {
-            membersCount = await Registration.getActiveMembers(pack.organizationId);
+            membersCount = await Organization.getActiveMembers(pack.organizationId);
         }
 
         if (pack.meta.pricingType === STPricingType.PerMember) {

package/src/services/StartupHealthService.ts

@@ -0,0 +1,15 @@
+export class StartupHealthService {
+    private static readonly errors = new Set<string>();
+
+    static markUnhealthy(error: string) {
+        this.errors.add(error);
+    }
+
+    static getErrors() {
+        return [...this.errors];
+    }
+
+    static clearForTesting() {
+        this.errors.clear();
+    }
+}

package/src/services/uitpas/UitpasService.ts

@@ -2,7 +2,8 @@ import { Model } from '@simonbackx/simple-database';
 import { isSimpleError, SimpleError } from '@simonbackx/simple-errors';
 import { Order, WebshopUitpasNumber } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { Cart, OrderStatus, Product, ProductPrice, UitpasClientCredentialsStatus, UitpasOrganizersResponse } from '@stamhoofd/structures';
+import type { Cart, Product, ProductPrice, UitpasClientCredentialsStatus, UitpasOrganizersResponse } from '@stamhoofd/structures';
+import { OrderStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 import { UitpasTokenRepository } from '../../helpers/UitpasTokenRepository.js';
@@ -11,8 +12,10 @@ import { checkPermissionsFor } from './checkPermissionsFor.js';
 import { checkUitpasNumbers } from './checkUitpasNumbers.js';
 import { getSocialTariffForEvent } from './getSocialTariffForEvent.js';
 import { getSocialTariffForUitpasNumbers } from './getSocialTariffForUitpasNumbers.js';
-import { GetPassResponse, PassholderEndpoints } from './PassholderEndpoints.js';
-import { RegisterTicketSaleRequest, RegisterTicketSaleResponse, registerTicketSales } from './registerTicketSales.js';
+import type { GetPassResponse} from './PassholderEndpoints.js';
+import { PassholderEndpoints } from './PassholderEndpoints.js';
+import type { RegisterTicketSaleRequest, RegisterTicketSaleResponse} from './registerTicketSales.js';
+import { registerTicketSales } from './registerTicketSales.js';
 import { searchUitpasEvents } from './searchUitpasEvents.js';
 import { searchUitpasOrganizers } from './searchUitpasOrganizers.js';
 

package/src/sql-filters/audit-logs.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const auditLogFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/balance-item-payments.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const balanceItemPaymentsCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/balance-items.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 /**
  * Defines how to filter balance items in the database from StamhoofdFilter objects

package/src/sql-filters/base-registration-filter-compilers.ts

@@ -1,6 +1,8 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createJoinedRelationFilter, SQL, SQLFilterDefinitions, SQLIfNull, SQLValueType } from '@stamhoofd/sql';
-import { FilterWrapperMarker, PermissionLevel, StamhoofdFilter, unwrapFilter } from '@stamhoofd/structures';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, createExistsFilter, createJoinedRelationFilter, SQL, SQLIfNull, SQLValueType } from '@stamhoofd/sql';
+import type { StamhoofdFilter} from '@stamhoofd/structures';
+import { FilterWrapperMarker, PermissionLevel, unwrapFilter } from '@stamhoofd/structures';
 import { Context } from '../helpers/Context.js';
 import { memberCachedBalanceForOrganizationJoin, registrationCachedBalanceJoin } from '../helpers/outstandingBalanceJoin.js';
 import { SQLTranslatedString } from '../helpers/SQLTranslatedString.js';

package/src/sql-filters/document-templates.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const documentTemplateFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,

package/src/sql-filters/documents.ts

@@ -1,4 +1,5 @@
-import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLFilterDefinitions, SQLValueType } from '@stamhoofd/sql';
+import type { SQLFilterDefinitions} from '@stamhoofd/sql';
+import { baseSQLFilterCompilers, createColumnFilter, SQL, SQLValueType } from '@stamhoofd/sql';
 
 export const documentFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,