@stamhoofd/backend 2.118.1 → 2.120.0

package/package.json

@@ -1,35 +1,45 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.118.1",
+    "version": "2.120.0",
+    "type": "module",
     "main": "./dist/index.js",
     "exports": {
         ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
             "require": "./dist/index.js"
         },
-        "./src/migrate": {
+        "./migrate": {
+            "types": "./dist/src/migrate.d.ts",
+            "import": "./dist/src/migrate.js",
             "require": "./dist/src/migrate.js"
         },
-        "./src/boot": {
+        "./boot": {
+            "types": "./dist/src/boot.d.ts",
+            "import": "./dist/src/boot.js",
             "require": "./dist/src/boot.js"
         },
         "./tests/helpers": {
+            "@stamhoofd/source": "./tests/helpers/index.ts",
+            "types": "./dist/tests/helpers/index.d.ts",
+            "import": "./dist/tests/helpers/index.js",
             "require": "./dist/tests/helpers/index.js"
         }
     },
     "license": "UNLICENCED",
     "scripts": {
         "dev": "wait-on ../../shared/middleware/dist/index.js && concurrently -r 'yarn -s build --watch --preserveWatchOutput' \"yarn -s dev:watch\"",
+        "dev:build": "yarn -s build",
         "dev:full": "yarn -s dev",
         "dev:watch": "wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --delay 2000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM",
         "dev:backend": "yarn -s dev",
-        "build": "rm -rf ./dist/src/migrations && rm -rf ./dist/src/seeds && yarn -s copy-assets && tsc -b",
-        "copy-assets": "rsync --delete --mkpath --exclude='*.ts' --exclude='*.js' -r --checksum ./src/ ./dist/src/",
+        "build": "tsc --build tsconfig.build.json --clean && yarn -s copy-assets && tsc --build tsconfig.build.json",
+        "copy-assets": "rsync --delete --mkpath --exclude='*.ts' --exclude='*.js' --exclude='*.map' -r --checksum ./src/ ./dist/src/",
         "build:full": "yarn -s clear && yarn -s build",
-        "clear": "rm -rf ./dist",
+        "clear": "rm -rf ./dist && rm -f *.tsbuildinfo",
         "start": "yarn -s build && node --enable-source-maps ./dist/index.js",
-        "test": "jest --runInBand",
-        "test:build": "yarn -s build:full && yarn -s test",
-        "test:reset": "yarn -s build:full && jest --runInBand",
+        "test": "vitest",
+        "test:reset": "yarn -s build:full && yarn -s test",
         "migrations": "yarn -s build:full && node ./dist/migrations.js",
         "lint": "eslint"
     },
@@ -51,18 +61,18 @@
         "@aws-sdk/s3-request-presigner": "^3.839.0",
         "@bwip-js/node": "^4.5.1",
         "@mollie/api-client": "4.3.3",
-        "@simonbackx/simple-database": "1.34.0",
-        "@simonbackx/simple-encoding": "2.23.1",
-        "@simonbackx/simple-endpoints": "1.20.1",
+        "@simonbackx/simple-database": "1.36.12",
+        "@simonbackx/simple-encoding": "2.26.5",
+        "@simonbackx/simple-endpoints": "1.21.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.118.1",
-        "@stamhoofd/backend-middleware": "2.118.1",
-        "@stamhoofd/email": "2.118.1",
-        "@stamhoofd/models": "2.118.1",
-        "@stamhoofd/queues": "2.118.1",
-        "@stamhoofd/sql": "2.118.1",
-        "@stamhoofd/structures": "2.118.1",
-        "@stamhoofd/utility": "2.118.1",
+        "@stamhoofd/backend-i18n": "2.120.0",
+        "@stamhoofd/backend-middleware": "2.120.0",
+        "@stamhoofd/email": "2.120.0",
+        "@stamhoofd/models": "2.120.0",
+        "@stamhoofd/queues": "2.120.0",
+        "@stamhoofd/sql": "2.120.0",
+        "@stamhoofd/structures": "2.120.0",
+        "@stamhoofd/utility": "2.120.0",
         "archiver": "^7.0.1",
         "axios": "^1.13.2",
         "cookie": "^0.7.0",
@@ -72,7 +82,7 @@
         "luxon": "3.4.4",
         "mailparser": "^3.9.1",
         "mockdate": "^3.0.2",
-        "mysql2": "^3.14.1",
+        "mysql2": "^3.20.0",
         "node-rsa": "1.1.1",
         "openid-client": "^5.4.0",
         "stripe": "^16.6.0"
@@ -80,5 +90,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7461e7ca17f68233be8a8acf1943f2d7882244fd"
+    "gitHead": "f38f79c15ce16b0c8c14743ff3eb61feda5a18d4"
 }

package/src/audit-logs/ModelLogger.ts

@@ -1,7 +1,9 @@
-import { Model, ModelEvent } from '@simonbackx/simple-database';
+import type { ModelEvent } from '@simonbackx/simple-database';
+import { Model } from '@simonbackx/simple-database';
 import { AuditLog } from '@stamhoofd/models';
 import { ObjectDiffer } from '@stamhoofd/object-differ';
-import { AuditLogPatchItem, AuditLogPatchItemType, AuditLogReplacement, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
+import type { AuditLogType } from '@stamhoofd/structures';
+import { AuditLogPatchItem, AuditLogPatchItemType, AuditLogReplacement, AuditLogSource } from '@stamhoofd/structures';
 import { ContextInstance } from '../helpers/Context.js';
 import { AuditLogService } from '../services/AuditLogService.js';
 

package/src/audit-logs/OrderLogger.ts

@@ -50,7 +50,7 @@ export const OrderLogger = new ModelLogger(Order, {
                 id: model.id,
                 value: model.number ? `bestelling #${model.number}` : `bestelling van ${model.data.customer.name}`,
                 type: AuditLogReplacementType.Order,
-                description: model.number ? model.data.customer.name : $t(`4597a3f5-6a6a-44a3-85da-5240ab08447a`),
+                description: model.number ? model.data.customer.name : $t(`%Cq`),
             })],
         ]);
     },

package/src/boot.ts

@@ -16,12 +16,14 @@ import { SetupStepUpdater } from './helpers/SetupStepUpdater.js';
 import { ContextMiddleware } from './middleware/ContextMiddleware.js';
 import { AuditLogService } from './services/AuditLogService.js';
 import { BalanceItemService } from './services/BalanceItemService.js';
+import { BootChecksService } from './services/BootChecksService.js';
 import { CpuService } from './services/CpuService.js';
 import { DocumentService } from './services/DocumentService.js';
 import { FileSignService } from './services/FileSignService.js';
 import { PlatformMembershipService } from './services/PlatformMembershipService.js';
 import { UitpasService } from './services/uitpas/UitpasService.js';
 import { UniqueUserService } from './services/UniqueUserService.js';
+import { AutoEncoder } from '@simonbackx/simple-encoding';
 
 process.on('unhandledRejection', (error: Error) => {
     console.error('unhandledRejection');
@@ -35,16 +37,25 @@ Column.setJSONVersion(Version);
 // Set timezone
 process.env.TZ = 'UTC';
 
+if (STAMHOOFD.environment === 'development') {
+    Error.stackTraceLimit = 100;
+}
+
 // Quick check
 if (new Date().getTimezoneOffset() !== 0) {
     throw new Error('Process should always run in UTC timezone');
 }
 
-const seeds = async () => {
+const seeds = async (options: {shutdown: () => Promise<void>}) => {
     try {
         // Internal
         await AuditLogService.disable(async () => {
-            await Migration.runAll(__dirname + '/seeds');
+            if (!await Migration.runAll(import.meta.dirname + '/seeds')) {
+                console.error('Seeds failed!')
+                if (STAMHOOFD.environment === 'test' || STAMHOOFD.environment === 'development') {
+                    await options.shutdown();
+                }
+            }
         });
     }
     catch (e) {
@@ -61,14 +72,21 @@ function productionLog(message: string) {
 }
 
 export const boot = async (options: { killProcess: boolean }) => {
+    // Make sure we use the current environment for connecting to the database
+    await Database.reload({})
+
     productionLog('Running server at v' + Version);
     productionLog('Running server at port ' + STAMHOOFD.PORT);
     productionLog('Running server on DB ' + process.env.DB_DATABASE); // note, should always use process env here
+    console.log('Node version is: ' + process.version);
+    
+    AutoEncoder.skipDefaultValuesVersion = 10000; // todo
 
     loadLogger();
 
     await GlobalHelper.load();
     await UniqueUserService.check();
+    await BootChecksService.checkDatabaseCollation();
 
     // Init platform shared struct: otherwise permissions won't work with missing responsibilities
     productionLog('Loading platform...');
@@ -79,17 +97,17 @@ export const boot = async (options: { killProcess: boolean }) => {
     productionLog('Loading endpoints...');
 
     // Note: we should load endpoints one by once to have a reliable order of url matching
-    await router.loadAllEndpoints(__dirname + '/endpoints/global/*');
-    await router.loadAllEndpoints(__dirname + '/endpoints/admin/*');
-    await router.loadAllEndpoints(__dirname + '/endpoints/frontend');
-
-    await router.loadAllEndpoints(__dirname + '/endpoints/auth');
-    await router.loadAllEndpoints(__dirname + '/endpoints/organization/dashboard/*');
-    await router.loadAllEndpoints(__dirname + '/endpoints/organization/registration');
-    await router.loadAllEndpoints(__dirname + '/endpoints/organization/webshops');
-    await router.loadAllEndpoints(__dirname + '/endpoints/organization/shared');
-    await router.loadAllEndpoints(__dirname + '/endpoints/organization/shared/*');
-    await router.loadAllEndpoints(__dirname + '/endpoints/system');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/global/*');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/admin/*');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/frontend');
+
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/auth');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/organization/dashboard/*');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/organization/registration');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/organization/webshops');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/organization/shared');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/organization/shared/*');
+    await router.loadAllEndpoints(import.meta.dirname + '/endpoints/system');
 
     router.endpoints.push(new CORSPreflightEndpoint());
 
@@ -257,7 +275,7 @@ export const boot = async (options: { killProcess: boolean }) => {
     UitpasService.listen();
 
     startCrons();
-    seeds().catch(console.error);
+    seeds({ shutdown }).catch(console.error);
 
     return { shutdown };
 };

package/src/crons/balance-emails.ts

@@ -1,7 +1,9 @@
 import { registerCron } from '@stamhoofd/crons';
 import { CachedBalance, Email, EmailRecipient, Organization, User } from '@stamhoofd/models';
-import { IterableSQLSelect, readDynamicSQLExpression, SQL, SQLCalculation, SQLPlusSign } from '@stamhoofd/sql';
-import { EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailTemplateType, OrganizationEmail, ReceivableBalanceType, StamhoofdFilter } from '@stamhoofd/structures';
+import type { IterableSQLSelect} from '@stamhoofd/sql';
+import { readDynamicSQLExpression, SQL, SQLCalculation, SQLPlusSign } from '@stamhoofd/sql';
+import type { OrganizationEmail, StamhoofdFilter } from '@stamhoofd/structures';
+import { EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailTemplateType, ReceivableBalanceType } from '@stamhoofd/structures';
 import { ContextInstance } from '../helpers/Context.js';
 
 registerCron('balanceEmails', balanceEmails);

package/src/crons/clearExcelCache.test.ts

@@ -3,8 +3,8 @@ import fs from 'fs/promises';
 import { clearExcelCacheHelper } from './clearExcelCache.js';
 
 const testPath = '/Users/user/project/backend/app/api/.cache';
-jest.mock('fs/promises');
-const fsMock = jest.mocked(fs, { shallow: true });
+vitest.mock('fs/promises');
+const fsMock = vitest.mocked(fs, { deep: false });
 
 describe('clearExcelCacheHelper', () => {
     it('should only run between 3 and 6 AM', async () => {
@@ -34,7 +34,7 @@ describe('clearExcelCacheHelper', () => {
                 environment: 'production',
             });
 
-            expect(didClear).toBeFalse();
+            expect(didClear).toBe(false);
         }
 
         for (const date of shouldPass) {
@@ -45,7 +45,7 @@ describe('clearExcelCacheHelper', () => {
                 environment: 'production',
             });
 
-            expect(didClear).toBeTrue();
+            expect(didClear).toBe(true);
         }
         // #endregion
     });
@@ -70,7 +70,7 @@ describe('clearExcelCacheHelper', () => {
             environment: 'production',
         });
 
-        expect(didClearSecondTry).toBeFalse();
+        expect(didClearSecondTry).toBe(false);
 
         // third try, should pass because the last clear was more than a day ago
         const didClearThirdTry = await clearExcelCacheHelper({
@@ -80,7 +80,7 @@ describe('clearExcelCacheHelper', () => {
             environment: 'production',
         });
 
-        expect(didClearThirdTry).toBeTrue();
+        expect(didClearThirdTry).toBe(true);
 
         // fourth try, should fail because 5 min earlier the cache was cleared
         const didClearFourthTry = await clearExcelCacheHelper({
@@ -90,7 +90,7 @@ describe('clearExcelCacheHelper', () => {
             environment: 'production',
         });
 
-        expect(didClearFourthTry).toBeFalse();
+        expect(didClearFourthTry).toBe(false);
         // #endregion
     });
 
@@ -132,7 +132,7 @@ describe('clearExcelCacheHelper', () => {
         });
 
         fsMock.readdir.mockReturnValue(
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+             
             Promise.resolve([...directories, file1]) as any,
         );
         // #endregion

package/src/crons/update-cached-balances.ts

@@ -1,5 +1,6 @@
-import { CachedBalance } from '@stamhoofd/models';
 import { registerCron } from '@stamhoofd/crons';
+import { CachedBalance } from '@stamhoofd/models';
+import { ReceivableBalanceType } from '@stamhoofd/structures';
 
 registerCron('updateCachedBalances', updateCachedBalances);
 
@@ -11,28 +12,53 @@ async function updateCachedBalances() {
 
     const balances = await CachedBalance.select().where(
         CachedBalance.whereNeedsUpdate(),
-    ).limit(100).fetch();
+    )
+    /**
+     * Cached balances of member should be updated before the cached balances of the user
+     * because the cached balances of the user are dependent on the cached balances of the member.
+     */
+    .orderBy('objectType', 'ASC')
+    // minimize the number of queries when updating
+    .orderBy('organizationId', 'ASC')
+    .limit(100).fetch();
 
-    // Group by object type and by organization id
-    const grouped = new Map<string, CachedBalance[]>();
+    // Group by object type, next by organization id
+    const grouped = new Map<ReceivableBalanceType, Map<string, CachedBalance[]>>();
 
     for (const balance of balances) {
-        const key = balance.objectType + '-' + balance.organizationId;
-        const arr = grouped.get(key);
+        const objectType = balance.objectType;
+        let organizationMap = grouped.get(objectType);
+        if (!organizationMap) {
+            organizationMap = new Map<string, CachedBalance[]>();
+            grouped.set(objectType, organizationMap);
+        }
 
-        if (!arr) {
-            grouped.set(key, [balance]);
+        const organizationId = balance.organizationId;
+        const balances = organizationMap.get(organizationId);
+
+        if (!balances) {
+            organizationMap.set(organizationId, [balance]);
             continue;
         }
 
-        arr.push(balance);
+        balances.push(balance);
     }
 
-    for (const [_, balances] of grouped) {
-        const balance = balances[0];
+    // update member balances first
+    const objectTypeMemberFirst = Array.from(grouped.entries());
+    objectTypeMemberFirst.sort((a, b) => {
+        const aIsMember = a[0] === ReceivableBalanceType.member;
+        const bIsMember = b[0] === ReceivableBalanceType.member;
+        if (aIsMember && !bIsMember) return -1;
+        if (!aIsMember && bIsMember) return 1;
+        return 0; 
+    });
 
-        const ids = balances.map(b => b.objectId);
-        console.log('Updating', ids.length, balance.objectType, 'for', balance.organizationId);
-        await CachedBalance.updateForObjects(balance.organizationId, ids, balance.objectType);
+    for (const [objectType, organizationMap] of objectTypeMemberFirst) {
+        for (const [organizationId, balances] of organizationMap) {
+            const ids = balances.map(b => b.objectId);
+            console.log('Updating', ids.length, objectType, 'for', organizationId);
+            await CachedBalance.updateForObjects(organizationId, ids, objectType);
+        }
     }
 }

package/src/debug.ts

@@ -1,10 +1,11 @@
 import { Column } from '@simonbackx/simple-database';
-import { EncodedResponse, ResponseMiddleware, Router, RouterServer } from '@simonbackx/simple-endpoints';
+import type { ResponseMiddleware, RouterServer } from '@simonbackx/simple-endpoints';
+import { EncodedResponse, Router } from '@simonbackx/simple-endpoints';
 import { logger } from '@simonbackx/simple-logging';
 import { requestPrefix } from '@stamhoofd/backend-middleware';
 
 import { AutoEncoder } from '@simonbackx/simple-encoding';
-import { Request, Response } from '@simonbackx/simple-endpoints';
+import type { Request, Response } from '@simonbackx/simple-endpoints';
 import { SQLLogger } from '@stamhoofd/sql';
 import { ContextInstance } from './helpers/Context.js';
 

package/src/decoders/StringArrayDecoder.ts

@@ -1,4 +1,4 @@
-import { Data, Decoder } from '@simonbackx/simple-encoding';
+import type { Data, Decoder } from '@simonbackx/simple-encoding';
 
 export class StringArrayDecoder<T> implements Decoder<T[]> {
     decoder: Decoder<T>;

package/src/decoders/StringNullableDecoder.ts

@@ -1,4 +1,4 @@
-import { Decoder, Data } from '@simonbackx/simple-encoding';
+import type { Decoder, Data } from '@simonbackx/simple-encoding';
 
 export class StringNullableDecoder<T> implements Decoder<T | null> {
     decoder: Decoder<T>;

package/src/email-recipient-loaders/documents.ts

@@ -1,6 +1,7 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, Replacement } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest} from '@stamhoofd/structures';
+import { EmailRecipient, EmailRecipientFilterType, PaginatedResponse, Replacement } from '@stamhoofd/structures';
 import { GetDocumentsEndpoint } from '../endpoints/organization/dashboard/documents/GetDocumentsEndpoint.js';
 
 async function fetch(query: LimitedFilteredRequest) {

package/src/email-recipient-loaders/members.ts

@@ -1,6 +1,7 @@
 import { Email } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, MembersBlob, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, MembersBlob} from '@stamhoofd/structures';
+import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';
 
 async function getRecipients(result: PaginatedResponse<MembersBlob, LimitedFilteredRequest>, type: 'member' | 'parents' | 'unverified') {

package/src/email-recipient-loaders/orders.ts

@@ -1,5 +1,6 @@
 import { Email, Webshop } from '@stamhoofd/models';
-import { EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, mergeFilters, PaginatedResponse, WebshopPreview } from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, WebshopPreview } from '@stamhoofd/structures';
+import { EmailRecipientFilterType, mergeFilters, PaginatedResponse } from '@stamhoofd/structures';
 import { GetWebshopOrdersEndpoint } from '../endpoints/organization/dashboard/webshops/GetWebshopOrdersEndpoint.js';
 import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
 import { Context } from '../helpers/Context.js';

package/src/email-recipient-loaders/payments.ts

@@ -1,10 +1,13 @@
-import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Order, Organization, Payment, RecipientLoader, User, Webshop } from '@stamhoofd/models';
+import type { RecipientLoader} from '@stamhoofd/models';
+import { BalanceItem, BalanceItemPayment, Email, Member, MemberResponsibilityRecord, Order, Organization, Payment, User, Webshop } from '@stamhoofd/models';
 import { compileToSQLFilter, SQL } from '@stamhoofd/sql';
-import { CountFilteredRequest, EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, PaymentGeneral, PaymentMethod, StamhoofdFilter } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PaymentGeneral, StamhoofdFilter } from '@stamhoofd/structures';
+import { CountFilteredRequest, EmailRecipient, EmailRecipientFilterType, PaginatedResponse, PaymentMethod } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetPaymentsEndpoint } from '../endpoints/organization/dashboard/payments/GetPaymentsEndpoint.js';
 import { memberResponsibilityRecordFilterCompilers } from '../sql-filters/member-responsibility-records.js';
-import { buildReplacementOptions, getEmailReplacementsForPayment, ReplacementsOptions } from '../email-replacements/getEmailReplacementsForPayment.js';
+import type { ReplacementsOptions } from '../email-replacements/getEmailReplacementsForPayment.js';
+import { buildReplacementOptions, getEmailReplacementsForPayment } from '../email-replacements/getEmailReplacementsForPayment.js';
 
 type BeforeFetchAllResult = {
     doesIncludePaymentWithoutOrders: boolean;

package/src/email-recipient-loaders/receivable-balances.ts

@@ -1,5 +1,6 @@
 import { CachedBalance, Email } from '@stamhoofd/models';
-import { BalanceItem as BalanceItemStruct, compileToInMemoryFilter, EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, receivableBalanceObjectContactInMemoryFilterCompilers, ReceivableBalanceType, Replacement, StamhoofdFilter } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, StamhoofdFilter } from '@stamhoofd/structures';
+import { BalanceItem as BalanceItemStruct, compileToInMemoryFilter, EmailRecipient, EmailRecipientFilterType, PaginatedResponse, receivableBalanceObjectContactInMemoryFilterCompilers, ReceivableBalanceType, Replacement } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetReceivableBalancesEndpoint } from '../endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.js';
 

package/src/email-recipient-loaders/registrations.ts

@@ -1,6 +1,7 @@
 import { Email, Member } from '@stamhoofd/models';
 import { SQL } from '@stamhoofd/sql';
-import { EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, RegistrationsBlob, mergeFilters } from '@stamhoofd/structures';
+import type { EmailRecipient, LimitedFilteredRequest, RegistrationsBlob} from '@stamhoofd/structures';
+import { EmailRecipientFilterType, PaginatedResponse, mergeFilters } from '@stamhoofd/structures';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
 import { memberJoin } from '../sql-filters/registrations.js';
 

package/src/email-replacements/getEmailReplacementsForPayment.ts

@@ -1,5 +1,6 @@
 import { Order, Organization, Webshop } from '@stamhoofd/models';
-import { BalanceItemPaymentsHtmlTableItem, BalanceItemRelationType, BalanceItemType, getBalanceItemPaymentsHtmlTable, PaymentGeneral, PaymentMethod, PaymentMethodHelper, Replacement, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import type { BalanceItemPaymentsHtmlTableItem, PaymentGeneral} from '@stamhoofd/structures';
+import { BalanceItemRelationType, BalanceItemType, getBalanceItemPaymentsHtmlTable, PaymentMethod, PaymentMethodHelper, Replacement, Webshop as WebshopStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { createOrderDataHTMLTable } from '../helpers/email-html-helpers.js';
 
@@ -216,7 +217,7 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                         const webshop = webshopMap.get(order.webshopId);
                         if (webshop) {
                             if (order.number) {
-                                overviewContext.add($t('80c86ad4-5ca1-481a-a408-db018a81f25e', {
+                                overviewContext.add($t('%1Kz', {
                                     webshop: webshop.meta.name,
                                     orderNumber: order.number ?? '',
                                 }));
@@ -226,7 +227,7 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
                             }
                         }
                         else {
-                            overviewContext.add($t('8bb27033-cf3c-4af1-a3f4-3373734ab189', {
+                            overviewContext.add($t('%1L0', {
                                 orderNumber: order.number ?? '',
                             }));
                         }
@@ -252,8 +253,8 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
     }
 
     if (registrationMemberNames.size > 0) {
-        const memberNames = Formatter.joinLast([...registrationMemberNames], ', ', ' ' + $t(`6a156458-b396-4d0f-b562-adb3e38fc51b`) + ' ');
-        overviewContext.add($t(`01d5fd7e-2960-4eb4-ab3a-2ac6dcb2e39c`) + ' ' + memberNames);
+        const memberNames = Formatter.joinLast([...registrationMemberNames], ', ', ' ' + $t(`%M1`) + ' ');
+        overviewContext.add($t(`%x6`) + ' ' + memberNames);
     }
 
     if (overviewContext.size === 0) {
@@ -273,11 +274,11 @@ function getPaymentContext(payment: PaymentGeneral, { orderMap, webshopMap }: Re
             }
 
             // else return default text for multiple items
-            return $t('7462f89e-db05-452f-804f-b9f2d51bff0d', { count: payment.balanceItemPayments.length });
+            return $t('%1Kx', { count: payment.balanceItemPayments.length });
         }
 
         // else return default text for single item
-        return $t('fe349d88-fecf-4cd8-8ea4-9e3b13cfa0dc');
+        return $t('%1Ky');
     }
 
     // join texts for balance items with type order or registration

package/src/endpoints/admin/members/ChargeMembersEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';
 
@@ -35,7 +36,7 @@ export class ChargeMembersEndpoint extends Endpoint<Params, Query, Body, Respons
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid description',
-                human: $t(`2449fba5-99dc-496f-a9d6-a67263d56616`),
+                human: $t(`%Cr`),
                 field: 'description',
             });
         }
@@ -44,7 +45,7 @@ export class ChargeMembersEndpoint extends Endpoint<Params, Query, Body, Respons
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid price',
-                human: $t(`1e165aac-8a58-45c5-bdd8-c58131a7b7f5`),
+                human: $t(`%Cs`),
                 field: 'price',
             });
         }
@@ -53,7 +54,7 @@ export class ChargeMembersEndpoint extends Endpoint<Params, Query, Body, Respons
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid amount',
-                human: $t(`0bdf4953-1eae-41fd-b142-5ad3287f17a7`),
+                human: $t(`%Ct`),
                 field: 'amount',
             });
         }
@@ -77,7 +78,7 @@ export class ChargeMembersEndpoint extends Endpoint<Params, Query, Body, Respons
             throw new SimpleError({
                 code: 'charge_pending',
                 message: 'Charge members already pending',
-                human: $t(`d2b84fdd-035b-4307-a897-000081aa814f`),
+                human: $t(`%Cu`),
             });
         }
 

package/src/endpoints/admin/memberships/ChargeMembershipsEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
 import { Context } from '../../../helpers/Context.js';
@@ -34,7 +35,7 @@ export class ChargeMembershipsEndpoint extends Endpoint<Params, Query, Body, Res
             throw new SimpleError({
                 code: 'charge_pending',
                 message: 'Charge already pending',
-                human: $t(`d2b84fdd-035b-4307-a897-000081aa814f`),
+                human: $t(`%Cu`),
             });
         }
 

package/src/endpoints/admin/memberships/GetChargeMembershipsSummaryEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL, SQLAlias, SQLCount, SQLDistinct, SQLSelectAs, SQLSum, SQLWhereSign } from '@stamhoofd/sql';

package/src/endpoints/admin/organizations/ChargeOrganizationsEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeRequest, LimitedFilteredRequest } from '@stamhoofd/structures';
 
@@ -48,7 +49,7 @@ export class ChargeOrganizationsEndpoint extends Endpoint<Params, Query, Body, R
             throw new SimpleError({
                 code: 'charge_pending',
                 message: 'Charge organizations already pending',
-                human: $t(`d2b84fdd-035b-4307-a897-000081aa814f`),
+                human: $t(`%Cu`),
             });
         }
 

package/src/endpoints/admin/organizations/GetOrganizationsCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';