@stamhoofd/backend 2.119.0 → 2.120.1

package/src/helpers/GroupedThrottledQueue.test.ts

@@ -3,19 +3,19 @@ import { GroupedThrottledQueue } from './GroupedThrottledQueue.js';
 describe('GroupedThrottledQueue', () => {
     // Mock timers for controlling setTimeout
     beforeEach(() => {
-        jest.useFakeTimers();
+        vitest.useFakeTimers();
     });
 
     afterEach(() => {
-        jest.useRealTimers();
+        vitest.useRealTimers();
     });
 
     afterAll(() => {
-        jest.clearAllMocks();
+        vitest.clearAllMocks();
     });
 
     it('should create an instance with the provided handler', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new GroupedThrottledQueue(handler);
 
         expect(queue.handler).toBe(handler);
@@ -23,7 +23,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should call handler when processing items from a group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -33,7 +33,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should process items from different groups separately', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -47,7 +47,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should batch items from the same group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItems('group1', [1, 2, 3]);
@@ -59,7 +59,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should flush only the specified group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -77,7 +77,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should remove the group when all items are processed', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -93,7 +93,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle multiple items added to the same group', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         queue.addItem('group1', 1);
@@ -107,7 +107,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle large batch sizes correctly', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue<number>(handler);
 
         // Create a large array of items
@@ -127,9 +127,9 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should handle errors in handler without failing the queue', async () => {
-        const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation();
+        const consoleErrorMock = vitest.spyOn(console, 'error');// .mockImplementation();
 
-        const handler = jest.fn().mockImplementation((group, items) => {
+        const handler = vitest.fn().mockImplementation((group, items) => {
             if (group === 'error-group') {
                 throw new Error('Test error');
             }
@@ -155,7 +155,7 @@ describe('GroupedThrottledQueue', () => {
     it('should handle async handler functions', async () => {
         let processingPromise: Promise<void> | null = null;
 
-        const handler = jest.fn().mockImplementation((group, items) => {
+        const handler = vitest.fn().mockImplementation((group, items) => {
             processingPromise = new Promise((resolve) => {
                 setTimeout(() => {
                     resolve();
@@ -174,7 +174,7 @@ describe('GroupedThrottledQueue', () => {
         expect(queue.queues.size).toBe(1);
 
         // Fast-forward time to resolve the processing promise
-        jest.advanceTimersByTime(100);
+        vitest.advanceTimersByTime(100);
 
         // Wait for the processing to complete
         await waitPromise;
@@ -184,7 +184,7 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should not error when flushing non-existing groups', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new GroupedThrottledQueue<number>(handler);
 
         await expect(queue.flushGroupAndWait('non-existing')).resolves.not.toThrow();
@@ -194,21 +194,21 @@ describe('GroupedThrottledQueue', () => {
     });
 
     it('should automatically flush after maxDelay', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new GroupedThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
         queue.addItem('group-1', 1);
         expect(queue.timeout).not.toBeNull();
 
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         queue.addItem('group-2', 2);
         await queue.wait();
         expect(handler).not.toHaveBeenCalled();
 
         // Fast-forward time
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         await queue.wait();
         expect(handler).toHaveBeenCalledWith('group-1', [1]);

package/src/helpers/LimitedFilteredRequestHelper.ts

@@ -1,5 +1,5 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { SQLSortDefinitions } from '@stamhoofd/sql';
+import type { SQLSortDefinitions } from '@stamhoofd/sql';
 import { getSortFilter, LimitedFilteredRequest } from '@stamhoofd/structures';
 
 export class LimitedFilteredRequestHelper {

package/src/helpers/MemberCharger.ts

@@ -1,5 +1,6 @@
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemType, MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import type { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import { BalanceItemType } from '@stamhoofd/structures';
 
 export class MemberCharger {
     static async chargeMany({ chargingOrganizationId, membersToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; membersToCharge: MemberWithRegistrationsBlob[]; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {

package/src/helpers/MemberUserSyncer.ts

@@ -1,7 +1,9 @@
-import { CachedBalance, Member, MemberResponsibilityRecord, MemberWithUsers, Organization, Platform, User } from '@stamhoofd/models';
+import type { MemberWithUsers } from '@stamhoofd/models';
+import { CachedBalance, Member, MemberResponsibilityRecord, Organization, Platform, User } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL } from '@stamhoofd/sql';
-import { AuditLogSource, MemberDetails, PermissionRole, Permissions, ReceivableBalanceType, UserPermissions } from '@stamhoofd/structures';
+import type { MemberDetails, PermissionRole } from '@stamhoofd/structures';
+import { AuditLogSource, Permissions, ReceivableBalanceType, UserPermissions } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import basex from 'base-x';
 import crypto from 'crypto';
@@ -96,7 +98,8 @@ export class MemberUserSyncerStatic {
                     }
                 }
 
-                if (member.details.securityCode === null) {
+                // Generate security code (only for userMode platform)
+                if (STAMHOOFD.userMode !== 'organization' && member.details.securityCode === null) {
                     console.log('Generating security code for member ' + member.id);
 
                     const length = 16;

package/src/helpers/OrganizationCharger.ts

@@ -1,5 +1,6 @@
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemType, Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { BalanceItemType } from '@stamhoofd/structures';
 
 export class OrganizationCharger {
     static async chargeMany({ chargingOrganizationId, organizationsToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; organizationsToCharge: OrganizationStruct[]; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {

package/src/helpers/PeriodHelper.ts

@@ -1,5 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform, RegistrationPeriod } from '@stamhoofd/models';
+import type { RegistrationPeriod } from '@stamhoofd/models';
+import { Group, Member, MemberResponsibilityRecord, Organization, OrganizationRegistrationPeriod, Platform } 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.js';

package/src/helpers/SQLTranslatedString.ts

@@ -1,5 +1,6 @@
-import { SQLColumnExpression, SQLExpression, SQLExpressionOptions, SQLQuery, SQLTranslatedStringHelper } from '@stamhoofd/sql';
-import { Language } from '@stamhoofd/structures';
+import type { SQLColumnExpression, SQLExpression, SQLExpressionOptions, SQLQuery } from '@stamhoofd/sql';
+import { SQLTranslatedStringHelper } from '@stamhoofd/sql';
+import { Language } from '@stamhoofd/types/Language';
 
 export class SQLTranslatedString implements SQLExpression {
     private helper: SQLTranslatedStringHelper;

package/src/helpers/ServiceFeeHelper.ts

@@ -1,4 +1,4 @@
-import { Organization, Payment } from '@stamhoofd/models';
+import type { Organization, Payment } from '@stamhoofd/models';
 import { calculateVATPercentage, PaymentProvider, STPackageType } from '@stamhoofd/structures';
 
 export class ServiceFeeHelper {

package/src/helpers/SetupStepUpdater.ts

@@ -11,14 +11,15 @@ import {
 } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
+import type {
+    MemberResponsibility,
+    Platform as PlatformStruct,
+    SetupSteps} from '@stamhoofd/structures';
 import {
     AuditLogSource,
     GroupType,
-    MemberResponsibility,
-    Platform as PlatformStruct,
     RecordCategory,
-    SetupStepType,
-    SetupSteps,
+    SetupStepType
 } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { AuditLogService } from '../services/AuditLogService.js';

package/src/helpers/StripeHelper.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { BalanceItem, BalanceItemPayment, Organization, Payment, StripeAccount, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
+import type { I18n } from '@stamhoofd/backend-i18n';
+import type { BalanceItem, BalanceItemPayment, Organization, StripeAccount} from '@stamhoofd/models';
+import { Payment, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
 import { calculateVATPercentage, PaymentMethod, PaymentMethodHelper, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import Stripe from 'stripe';

package/src/helpers/TagHelper.test.ts

@@ -292,8 +292,8 @@ describe('TagHelper', () => {
             const result2 = TagHelper.validateTags(validPlatformTags);
 
             // assert
-            expect(result1).toBeFalse();
-            expect(result2).toBeTrue();
+            expect(result1).toBe(false);
+            expect(result2).toBe(true);
         });
 
         it('should return false if a tag is a child tag of multiple tags', () => {
@@ -339,8 +339,8 @@ describe('TagHelper', () => {
             const result2 = TagHelper.validateTags(validPlatformTags);
 
             // assert
-            expect(result1).toBeFalse();
-            expect(result2).toBeTrue();
+            expect(result1).toBe(false);
+            expect(result2).toBe(true);
         });
 
         it('should return false if the child tags contain an infinite loop', () => {
@@ -367,7 +367,7 @@ describe('TagHelper', () => {
             const result = TagHelper.validateTags(platformTagsWithInfiniteLoop);
 
             // assert
-            expect(result).toBeFalse();
+            expect(result).toBe(false);
         });
     });
 });

package/src/helpers/TagHelper.ts

@@ -1,6 +1,7 @@
 import { Organization, Platform } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
-import { AuditLogSource, OrganizationTag, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
+import type { OrganizationTag} from '@stamhoofd/structures';
+import { AuditLogSource, TagHelper as SharedTagHelper } from '@stamhoofd/structures';
 import { AuditLogService } from '../services/AuditLogService.js';
 
 export class TagHelper extends SharedTagHelper {

package/src/helpers/TemporaryMemberAccess.ts

@@ -1,4 +1,5 @@
-import { getPermissionLevelNumber, PermissionLevel } from '@stamhoofd/structures';
+import type { PermissionLevel } from '@stamhoofd/structures';
+import { getPermissionLevelNumber } from '@stamhoofd/structures';
 
 const userMemberTemporaryAccessCache = new Map<string, { memberId: string; level: PermissionLevel; validUntil: Date }[]>();
 

package/src/helpers/ThrottledQueue.test.ts

@@ -3,19 +3,19 @@ import { ThrottledQueue } from './ThrottledQueue.js';
 describe('ThrottledQueue', () => {
     // Mock timers for controlling setTimeout
     beforeEach(() => {
-        jest.useFakeTimers();
+        vitest.useFakeTimers();
     });
 
     afterEach(() => {
-        jest.useRealTimers();
+        vitest.useRealTimers();
     });
 
     afterAll(() => {
-        jest.clearAllMocks();
+        vitest.clearAllMocks();
     });
 
     it('should create an instance with the provided handler', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         expect(queue.handler).toBe(handler);
@@ -24,7 +24,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should add items to the queue', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         queue.addItem(1);
@@ -33,7 +33,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should add multiple items to the queue', () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         queue.addItems([1, 2, 3]);
@@ -44,12 +44,12 @@ describe('ThrottledQueue', () => {
     });
 
     it('should flush automatically when reaching maxBatchSize', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxBatchSize = 3;
 
         // Spy on flushAll to check if it's called
-        const flushAllSpy = jest.spyOn(queue, 'flushAll');
+        const flushAllSpy = vitest.spyOn(queue, 'flushAll');
 
         queue.addItems([1, 2]);
         expect(flushAllSpy).not.toHaveBeenCalled();
@@ -65,7 +65,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should process items in batches when exceeding maxBatchSize', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxBatchSize = 3;
 
@@ -88,9 +88,9 @@ describe('ThrottledQueue', () => {
     });
 
     it('should call emptyHandler when queue becomes empty', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
-        const emptyHandler = jest.fn();
+        const emptyHandler = vitest.fn();
         queue.emptyHandler = emptyHandler;
 
         queue.maxBatchSize = 3;
@@ -101,9 +101,9 @@ describe('ThrottledQueue', () => {
     });
 
     it('should not call emptyHandler when queue is filled during processing', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
-        const emptyHandler = jest.fn();
+        const emptyHandler = vitest.fn();
         queue.emptyHandler = emptyHandler;
 
         queue.maxBatchSize = 3;
@@ -120,11 +120,11 @@ describe('ThrottledQueue', () => {
 
     it('should not fail if handler throws an error', async () => {
         const error = new Error('Test error');
-        const handler = jest.fn().mockRejectedValue(error);
+        const handler = vitest.fn().mockRejectedValue(error);
         const queue = new ThrottledQueue(handler);
 
         // Spy on console.error
-        const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+        const consoleErrorSpy = vitest.spyOn(console, 'error').mockImplementation(() => {});
 
         queue.addItem(1);
         await queue.flushAndWait();
@@ -137,7 +137,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should handle flushAndWait when queue is empty', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
 
         await queue.flushAndWait();
@@ -160,7 +160,7 @@ describe('ThrottledQueue', () => {
     });
 
     it('should handle startTimeout and stopTimeout correctly', async () => {
-        const handler = jest.fn();
+        const handler = vitest.fn();
         const queue = new ThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
@@ -172,19 +172,19 @@ describe('ThrottledQueue', () => {
     });
 
     it('should automatically flush after maxDelay', async () => {
-        const handler = jest.fn().mockResolvedValue(undefined);
+        const handler = vitest.fn().mockResolvedValue(undefined);
         const queue = new ThrottledQueue(handler);
         queue.maxDelay = 1000; // Set a max delay for the timeout
 
         queue.addItem(1);
         expect(queue.timeout).not.toBeNull();
 
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
         await queue.wait();
         expect(handler).not.toHaveBeenCalled();
 
         // Fast-forward time
-        jest.advanceTimersByTime(500);
+        vitest.advanceTimersByTime(500);
 
         await queue.wait();
         expect(handler).toHaveBeenCalledWith([1]);

package/src/helpers/ViesHelper.ts

@@ -1,6 +1,7 @@
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { Company, Country } from '@stamhoofd/structures';
+import type { Company } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import axios from 'axios';
 import * as jsvat from 'jsvat-next'; // has no default export, so we need the wildcard
 
@@ -135,7 +136,7 @@ export class ViesHelperStatic {
         const formatted = result.value ?? vatNumber;
 
         try {
-            const cleaned = formatted.substring(2).replace(/(\.-\s)+/g, '');
+            const cleaned = formatted.substring(2).replace(/(?:\.-\s)+/g, '');
             const response = await this.request('POST', 'https://ec.europa.eu/taxation_customs/vies/rest-api/check-vat-number', {
                 countryCode: country,
                 vatNumber: cleaned,

package/src/helpers/XlsxTransformerColumnHelper.ts

@@ -1,5 +1,7 @@
-import { isXlsxTransformerConcreteColumn, XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
-import { Address, CountryHelper, Parent, ParentTypeHelper, PlatformMember, RecordAnswer, RecordCategory, RecordSettings, RecordType } from '@stamhoofd/structures';
+import type { XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import { isXlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import type { Address, Parent, PlatformMember, RecordAnswer, RecordSettings} from '@stamhoofd/structures';
+import { CountryHelper, ParentTypeHelper, RecordCategory, RecordType } from '@stamhoofd/structures';
 
 export class XlsxTransformerColumnHelper {
     static formatBoolean(value: boolean | undefined | null): string {

package/src/helpers/email-html-helpers.ts

@@ -1,5 +1,6 @@
-import { Order, Webshop } from '@stamhoofd/models';
-import { CheckoutMethodType, PaymentGeneral, PaymentMethod, PaymentMethodHelper, RecordCategory, RecordCheckboxAnswer, WebshopTakeoutMethod } from '@stamhoofd/structures';
+import type { Order, Webshop } from '@stamhoofd/models';
+import type { WebshopTakeoutMethod } from '@stamhoofd/structures';
+import { CheckoutMethodType, PaymentGeneral, PaymentMethod, PaymentMethodHelper, RecordCategory, RecordCheckboxAnswer } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 export function createOrderDataHTMLTable(order: Order, webshop: Webshop): string {
@@ -17,7 +18,7 @@ export function createOrderDataHTMLTable(order: Order, webshop: Webshop): string
                 }
 
                 if (order.data.checkoutMethod?.type === CheckoutMethodType.OnSite) {
-                    return $t(`%TW`);
+                    return $t(`%8a`);
                 }
 
                 return $t(`%Us`);
@@ -55,7 +56,7 @@ export function createOrderDataHTMLTable(order: Order, webshop: Webshop): string
             value: order.data.timeSlot?.timeRangeString() ?? '',
         },
         {
-            title: $t(`%Gq`),
+            title: $t(`%1Os`),
             value: order.data.customer.name,
         },
         ...(order.data.customer.phone

package/src/helpers/fetchToAsyncIterator.ts

@@ -1,4 +1,4 @@
-import { IPaginatedResponse, LimitedFilteredRequest } from '@stamhoofd/structures';
+import type { IPaginatedResponse, LimitedFilteredRequest } from '@stamhoofd/structures';
 import { FileSignService } from '../services/FileSignService.js';
 
 export function fetchToAsyncIterator<T>(

package/src/helpers/outstandingBalanceJoin.ts

@@ -1,5 +1,6 @@
 import { CachedBalance, Registration } from '@stamhoofd/models';
-import { SQL, SQLAlias, SQLCalculation, SQLNamedExpression, SQLPlusSign, SQLSelectAs, SQLSum } from '@stamhoofd/sql';
+import type { SQLNamedExpression} from '@stamhoofd/sql';
+import { SQL, SQLAlias, SQLCalculation, SQLPlusSign, SQLSelectAs, SQLSum } from '@stamhoofd/sql';
 
 export const memberCachedBalanceForOrganizationJoin = SQL.leftJoin(
     SQL.select('objectId', 'organizationId',

package/src/helpers/updateMemberDetailsUitpasNumber.ts

@@ -1,8 +1,9 @@
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { isSimpleError, SimpleError } from '@simonbackx/simple-errors';
 import { Member } from '@stamhoofd/models';
-import { MemberDetails, ReviewTimes, UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
-import { GetPassResponse } from '../services/uitpas/PassholderEndpoints.js';
+import type { MemberDetails, ReviewTimes} from '@stamhoofd/structures';
+import { UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
+import type { GetPassResponse } from '../services/uitpas/PassholderEndpoints.js';
 import { UitpasService } from '../services/uitpas/UitpasService.js';
 import { throwIfInvalidUitpasNumber } from '../services/uitpas/checkUitpasNumbers.js';
 

package/src/middleware/ContextMiddleware.ts

@@ -1,4 +1,4 @@
-import { Request, RequestMiddleware } from '@simonbackx/simple-endpoints';
+import type { Request, RequestMiddleware } from '@simonbackx/simple-endpoints';
 
 import { ContextInstance } from '../helpers/Context.js';
 

package/src/migrate.ts

@@ -1,12 +1,16 @@
 import chalk from 'chalk';
 
-import { Column, DatabaseInstance, Migration } from '@simonbackx/simple-database';
+import { Column, Database, DatabaseInstance, Migration } from '@simonbackx/simple-database';
 import { Version } from '@stamhoofd/structures';
 import path from 'path';
 
 Column.setJSONVersion(Version);
 process.env.TZ = 'UTC';
 
+// Polyfill require.resolve, since import.meta.resolve is not supported by vitest
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+
 const emailPath = require.resolve('@stamhoofd/email');
 const modelsPath = require.resolve('@stamhoofd/models');
 
@@ -20,6 +24,10 @@ const start = async () => {
         throw new Error('STAMHOOFD.DB_DATABASE is not set');
     }
 
+    // Reload database so we are sure we are running on the correct database in the
+    // environment
+    await Database.reload({})
+
     let killSignalReceived = false;
     const handler = () => {
         // Ignore
@@ -41,17 +49,26 @@ const start = async () => {
     await globalDatabase.statement(query);
 
     // External migrations
-    await Migration.runAll(path.dirname(modelsPath) + '/migrations');
-    await Migration.runAll(path.dirname(emailPath) + '/migrations');
+    if (!await Migration.runAll(path.dirname(modelsPath) + '/migrations')) {
+        throw new Error('Migrations failed')
+    }
+    if (!await Migration.runAll(path.dirname(emailPath) + '/../migrations')) {
+        throw new Error('Email migrations failed')
+    }
 
     // Internal
-    await Migration.runAll(__dirname + '/src/migrations');
+    if (!await Migration.runAll(import.meta.dirname + '/migrations')) {
+        throw new Error('Internal migrations failed')
+    }
 
     if (killSignalReceived) {
         console.error(chalk.red('Killing process due to received signal during migration'));
         process.exit(1);
     }
 
+    // Reload database to prevent connection state leakage
+    await Database.reload({})
+
     process.off('SIGTERM', handler);
     process.off('SIGINT', handler);
 };

package/src/seeds/0000000003-default-email-templates.ts

@@ -12,7 +12,7 @@ export default new Migration(async () => {
 
     // Insert defaults
     console.log('Inserting default email templates');
-    const sqlStatement = await fs.readFile(__dirname + '/data/default-email-templates.sql', { encoding: 'utf-8' });
+    const sqlStatement = await fs.readFile(import.meta.dirname + '/data/default-email-templates.sql', { encoding: 'utf-8' });
     await Database.statement(sqlStatement);
 
     // Do something here

package/src/seeds/0000000004-single-organization.ts

@@ -1,6 +1,7 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Organization, RegistrationPeriod } from '@stamhoofd/models';
-import { Address, Country } from '@stamhoofd/structures';
+import { Address } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { Formatter } from '@stamhoofd/utility';
 
 export default new Migration(async () => {

package/src/seeds/1752848561-groups-registration-periods.ts

@@ -1,6 +1,7 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Group, Organization, OrganizationRegistrationPeriod, Registration, RegistrationPeriod } from '@stamhoofd/models';
-import { CycleInformation, GroupCategory, GroupCategorySettings, GroupPrivateSettings, GroupSettings, GroupStatus, GroupType, RegistrationPeriodSettings, TranslatedString } from '@stamhoofd/structures';
+import type { CycleInformation} from '@stamhoofd/structures';
+import { GroupCategory, GroupCategorySettings, GroupPrivateSettings, GroupSettings, GroupStatus, GroupType, RegistrationPeriodSettings, TranslatedString } from '@stamhoofd/structures';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment === 'test') {

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

@@ -1,4 +1,5 @@
-import { Group, GroupFactory, Organization, OrganizationFactory, OrganizationRegistrationPeriod, OrganizationRegistrationPeriodFactory, RegistrationPeriod, RegistrationPeriodFactory } from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import { Group, GroupFactory, OrganizationFactory, OrganizationRegistrationPeriod, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory } from '@stamhoofd/models';
 import { GroupCategory, GroupCategorySettings, GroupPriceDiscountType, GroupStatus, OldGroupPrice, OldGroupPrices, TranslatedString } from '@stamhoofd/structures';
 import { migratePrices } from './1754560914-groups-prices.js';