@stamhoofd/backend 2.120.6 → 2.122.0

package/src/helpers/ViesHelper.ts

@@ -55,8 +55,7 @@ export class ViesHelperStatic {
         if (company.companyNumber) {
             if (company.VATNumber !== null && company.address.country === Country.Belgium) {
                 // Already validated
-            }
-            else {
+            } else {
                 // Need to validate
                 const result = await ViesHelper.checkCompanyNumber(company.address.country, company.companyNumber);
                 patch.companyNumber = result.companyNumber;
@@ -103,12 +102,10 @@ export class ViesHelperStatic {
                 companyNumber: corrected.substring(2),
                 VATNumber: corrected,
             };
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 // Ignore: normal that it is not a valid VAT number
-            }
-            else {
+            } else {
                 // Other errors should be thrown
                 throw e;
             }
@@ -128,13 +125,17 @@ export class ViesHelperStatic {
         if (!result.isValid) {
             throw new SimpleError({
                 code: 'invalid_field',
-                message: 'Ongeldig BTW-nummer: ' + vatNumber,
+                message: $t('%1To', { number: vatNumber }),
                 field: 'VATNumber',
             });
         }
 
         const formatted = result.value ?? vatNumber;
 
+        if (STAMHOOFD.environment === 'development' && formatted === 'NL301828519B01') {
+            return formatted;
+        }
+
         try {
             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', {
@@ -150,12 +151,11 @@ export class ViesHelperStatic {
             if (!response.valid) {
                 throw new SimpleError({
                     code: 'invalid_field',
-                    message: 'Het opgegeven BTW-nummer is ongeldig of niet BTW-plichtig: ' + formatted,
+                    message: $t('%1TG', { 'vat-number': formatted }),
                     field: 'VATNumber',
                 });
             }
-        }
-        catch (e) {
+        } catch (e) {
             if (isSimpleError(e) || isSimpleErrors(e)) {
                 throw e;
             }
@@ -164,7 +164,7 @@ export class ViesHelperStatic {
 
             throw new SimpleError({
                 code: 'service_unavailable',
-                message: 'De BTW-nummer validatie service (VIES) is tijdelijk niet beschikbaar. Probeer het later opnieuw.',
+                message: $t('%1Sf'),
                 field: 'VATNumber',
             });
         }

package/src/helpers/XlsxTransformerColumnHelper.ts

@@ -1,6 +1,6 @@
 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 type { Address, Parent, PlatformMember, RecordAnswer, RecordSettings } from '@stamhoofd/structures';
 import { CountryHelper, ParentTypeHelper, RecordCategory, RecordType } from '@stamhoofd/structures';
 
 export class XlsxTransformerColumnHelper {

package/src/helpers/outstandingBalanceJoin.ts

@@ -25,7 +25,7 @@ export const registrationCachedBalanceJoin = SQL.leftJoin(
         new SQLSelectAs(
             new SQLSum(
                 SQL.calculation(SQL.column('amountOpen'))
-                    .add(SQL.column('amountPending'))
+                    .add(SQL.column('amountPending')),
             ),
             new SQLAlias('toPay'),
         ),
@@ -33,7 +33,7 @@ export const registrationCachedBalanceJoin = SQL.leftJoin(
             new SQLSum(
                 SQL.calculation(SQL.column('amountOpen'))
                     .add(SQL.column('amountPaid'))
-                    .add(SQL.column('amountPending'))
+                    .add(SQL.column('amountPending')),
             ),
             new SQLAlias('price'),
         ),

package/src/helpers/updateMemberDetailsUitpasNumber.ts

@@ -1,7 +1,7 @@
 import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { isSimpleError, SimpleError } from '@simonbackx/simple-errors';
 import { Member } from '@stamhoofd/models';
-import type { MemberDetails, ReviewTimes} from '@stamhoofd/structures';
+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';
@@ -42,8 +42,7 @@ export async function updateMemberDetailsUitpasNumberForPatch(memberId: string,
 
     try {
         isUpdated = await updateMemberDetailsUitpasNumber(details);
-    }
-    catch (error: any) {
+    } catch (error: any) {
         const isUitpasEqual = previousUitpasNumber !== null && previousUitpasNumber === details.uitpasNumberDetails.uitpasNumber;
 
         if (isSimpleError(error)) {
@@ -94,8 +93,7 @@ export function uitpasApiResponseToSocialTariff(response: GetPassResponse): Uitp
     if (response.socialTariff.endDate) {
         try {
             endDate = new Date(response.socialTariff.endDate);
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
             console.error('endDate: ', response.socialTariff.endDate);
 

package/src/migrate.ts

@@ -9,6 +9,9 @@ process.env.TZ = 'UTC';
 
 // Polyfill require.resolve, since import.meta.resolve is not supported by vitest
 import { createRequire } from 'node:module';
+import { GlobalHelper } from './helpers/GlobalHelper.js';
+import { I18n } from '@stamhoofd/backend-i18n/I18n';
+import { QueryableModel } from '@stamhoofd/sql';
 const require = createRequire(import.meta.url);
 
 const emailPath = require.resolve('@stamhoofd/email');
@@ -26,13 +29,14 @@ const start = async () => {
 
     // Reload database so we are sure we are running on the correct database in the
     // environment
-    await Database.reload({})
+    await Database.reload({});
 
     let killSignalReceived = false;
     const handler = () => {
         // Ignore
         console.error('Ignoring SIGTERM signal during migration');
         killSignalReceived = true;
+        QueryableModel.shutdownMigrations = true;
     };
 
     process.on('SIGTERM', handler);
@@ -50,15 +54,18 @@ const start = async () => {
 
     // External migrations
     if (!await Migration.runAll(path.dirname(modelsPath) + '/migrations')) {
-        throw new Error('Migrations failed')
+        throw new Error('Migrations failed');
     }
     if (!await Migration.runAll(path.dirname(emailPath) + '/../migrations')) {
-        throw new Error('Email migrations failed')
+        throw new Error('Email migrations failed');
     }
 
     // Internal
+    await I18n.load();
+    GlobalHelper.loadGlobalTranslateFunction();
+
     if (!await Migration.runAll(import.meta.dirname + '/migrations')) {
-        throw new Error('Internal migrations failed')
+        throw new Error('Internal migrations failed');
     }
 
     if (killSignalReceived) {
@@ -67,7 +74,7 @@ const start = async () => {
     }
 
     // Reload database to prevent connection state leakage
-    await Database.reload({})
+    await Database.reload({});
 
     process.off('SIGTERM', handler);
     process.off('SIGINT', handler);

package/src/{seeds → migrations}/0000000004-single-organization.ts

@@ -1,5 +1,5 @@
 import { Migration } from '@simonbackx/simple-database';
-import { Organization, RegistrationPeriod } from '@stamhoofd/models';
+import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { Address } from '@stamhoofd/structures';
 import { Country } from '@stamhoofd/types/Country';
 import { Formatter } from '@stamhoofd/utility';
@@ -9,6 +9,10 @@ export default new Migration(async () => {
         return;
     }
 
+    if (STAMHOOFD.userMode !== 'platform') {
+        throw new Error('singleOrganization should never be combined with userMode organization');
+    }
+
     let organization = await Organization.getByID(STAMHOOFD.singleOrganization);
     if (organization) {
         console.log('Single organization already created.');
@@ -56,6 +60,11 @@ export default new Migration(async () => {
 
     await organization.save();
 
+    // Set as platform organization
+    const platform = await Platform.getForEditing();
+    platform.membershipOrganizationId = organization.id;
+    await platform.save();
+
     // Do something here
     return Promise.resolve();
 });

package/src/migrations/0000000006-default-organization.ts

@@ -0,0 +1,139 @@
+import { Migration } from '@simonbackx/simple-database';
+import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
+import { Address, Company, File, Image, PaymentMethod, Resolution } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
+import { Formatter } from '@stamhoofd/utility';
+import { STPackageService } from '../services/STPackageService.js';
+
+export default new Migration(async () => {
+    const platform = await Platform.getForEditing();
+    if (platform.membershipOrganizationId) {
+        console.log('Membership organization already created.');
+        return;
+    }
+
+    const registrationPeriod = STAMHOOFD.userMode === 'platform' ? ((await RegistrationPeriod.select().first(false)) ?? new RegistrationPeriod()) : new RegistrationPeriod();
+    if (!registrationPeriod.id) {
+        const s = Formatter.luxon();
+        const startDate = s.set({
+            day: 1,
+            month: 9,
+            hour: 0,
+            minute: 0,
+            second: 0,
+            millisecond: 0,
+        });
+        const endDate = s.set({
+            year: startDate.year + 1,
+            day: 31,
+            month: 8,
+            hour: 23,
+            minute: 59,
+            second: 59,
+            millisecond: 999,
+        });
+        registrationPeriod.startDate = startDate.toJSDate();
+        registrationPeriod.endDate = endDate.toJSDate();
+    }
+    await registrationPeriod.save();
+
+    console.log('Creating membership organization...');
+    const organization = new Organization();
+    organization.name = STAMHOOFD.platformName;
+    organization.uri = Formatter.slug(STAMHOOFD.platformName);
+    organization.periodId = registrationPeriod.id;
+    organization.address = Address.create({
+        street: '',
+        number: '',
+        postalCode: '',
+        city: 'Gent',
+        country: STAMHOOFD.fixedCountry ?? Country.Belgium,
+    });
+    organization.privateMeta.featureFlags = ['organization-receivable-balances'];
+
+    // Setup Codawood credentials if running Stamhoofd
+    if (STAMHOOFD.platformName === 'stamhoofd' && STAMHOOFD.userMode === 'organization') {
+        organization.id = '57aa0001-0000-4000-8000-000000000001';
+        organization.name = 'Stamhoofd';
+        organization.meta.companies = [
+            Company.create({
+                name: 'Codawood BV',
+                VATNumber: 'BE0747832683',
+                companyNumber: '0747832683',
+                address: Address.create({
+                    street: 'Collegiebaan',
+                    number: '54',
+                    postalCode: '9230',
+                    city: 'Wetteren',
+                    country: Country.Belgium,
+                }),
+                administrationEmail: 'hallo@stamhoofd.be',
+            }),
+        ];
+
+        organization.address = organization.meta.companies[0].address!;
+        organization.meta.registrationPaymentConfiguration.enableMandates = true;
+        organization.meta.invoicesEnabled = true;
+        organization.meta.registrationPaymentConfiguration.paymentMethods = [
+            PaymentMethod.Bancontact,
+            PaymentMethod.iDEAL,
+            PaymentMethod.CreditCard,
+        ];
+
+        // Logo for invoices + normal icon
+        const horizontalLogo = new File({
+            id: 'logo',
+            size: 0,
+            server: 'https://files.stamhoofd.be',
+            path: 'fixtures/logo.svg',
+        });
+
+        organization.meta.horizontalLogo = Image.create({
+            source: horizontalLogo,
+            resolutions: [
+                new Resolution({
+                    file: horizontalLogo,
+                    width: 1650,
+                    height: 340,
+                }),
+            ],
+        });
+
+        const squareLogo = new File({
+            id: 'square',
+            size: 0,
+            server: 'https://files.stamhoofd.be',
+            path: 'fixtures/logo-small.svg',
+        });
+
+        organization.meta.squareLogo = Image.create({
+            source: squareLogo,
+            resolutions: [
+                new Resolution({
+                    file: squareLogo,
+                    width: 1000,
+                    height: 1000,
+                }),
+            ],
+        });
+
+        // Link a mollie token
+    }
+
+    await organization.save();
+
+    if (STAMHOOFD.userMode === 'organization') {
+        registrationPeriod.organizationId = organization.id;
+        await registrationPeriod.save();
+    }
+
+    // Set as platform organization
+    platform.membershipOrganizationId = organization.id;
+    await platform.save();
+
+    // Make sure default packages are active for this organization
+    await STPackageService.updateOrganizationPackages(organization.id);
+
+    // Do something here
+    return Promise.resolve();
+});

package/src/{seeds → migrations}/1715028563-user-permissions.ts

@@ -1,6 +1,7 @@
 import { Migration } from '@simonbackx/simple-database';
 import { User } from '@stamhoofd/models';
 import { UserPermissions } from '@stamhoofd/structures';
+import { SeedTools } from '../helpers/SeedTools.js';
 
 export default new Migration(async () => {
     if (STAMHOOFD.environment == 'test') {
@@ -8,42 +9,31 @@ export default new Migration(async () => {
         return;
     }
     process.stdout.write('\n');
-    let c = 0;
-    while (true) {
-        const admins = await User.where({
-            organizationPermissions: {
-                value: null,
-                sign: '!=',
-            },
-            organizationId: {
-                value: null,
-                sign: '!=',
-            },
-        }, { limit: 100 });
 
-        for (const admin of admins) {
+    let realUpdate = 0;
+
+    const result = await SeedTools.loop({
+        batchSize: 1000,
+        query: User.select().whereNot('organizationPermissions', null).whereNot('organizationId', null),
+        useTransactionPerBatch: true,
+        action: async (admin: User) => {
             if (!admin.organizationPermissions || !admin.organizationId) {
-                continue;
+                return;
             }
             const p = UserPermissions.create({});
             p.organizationPermissions.set(admin.organizationId, admin.organizationPermissions);
             admin.permissions = UserPermissions.limitedAdd(admin.permissions, p, admin.organizationId);
             admin.organizationPermissions = null;
-            await admin.save();
-            c++;
-
-            if (c % 1000 === 0) {
-                process.stdout.write('.');
+            if (await admin.save({
+                skipMarkSaved: true,
+                skipSendEvents: true,
+            })) {
+                realUpdate++;
             }
-            if (c % 10000 === 0) {
-                process.stdout.write('\n');
-            }
-        }
+        },
+    });
 
-        if (admins.length === 0) {
-            break;
-        }
-    }
+    console.log('Updated permissions of ' + realUpdate + ' users, looped ' + result.total + ' users');
 
     // Do something here
     return Promise.resolve();

package/src/{seeds/1765896674-document-update-year.test.ts → migrations/1750090029-document-update-year.test.ts}

@@ -1,6 +1,7 @@
-import type { RegistrationPeriod} 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';
+import { migrateDocumentYears } from './1750090029-document-update-year.js';
+import { Formatter } from '@stamhoofd/utility';
 
 describe('migration.document-update-year', () => {
     describe('should use most frequent year of groups', () => {
@@ -9,8 +10,8 @@ describe('migration.document-update-year', () => {
             }).create();
 
             const period1 = await new RegistrationPeriodFactory({
-                startDate: new Date(2021, 0, 1),
-                endDate: new Date(2021, 11, 31),
+                startDate: Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate(),
+                endDate: Formatter.luxon().set({ day: 31, month: 12, year: 2021 }).toJSDate(),
                 organization,
             }).create();
 
@@ -18,8 +19,8 @@ describe('migration.document-update-year', () => {
             await organization.save();
 
             const period2 = await new RegistrationPeriodFactory({
-                startDate: new Date(2019, 0, 1),
-                endDate: new Date(2019, 11, 31),
+                startDate: Formatter.luxon().set({ day: 1, month: 1, year: 2019 }).toJSDate(),
+                endDate: Formatter.luxon().set({ day: 31, month: 12, year: 2019 }).toJSDate(),
                 organization,
             }).create();
 
@@ -32,9 +33,9 @@ describe('migration.document-update-year', () => {
             };
 
             // groups
-            const group1 = await createGroup(new Date(2021, 0, 1), new Date(2021, 11, 31), period1);
-            const group2 = await createGroup(new Date(2021, 0, 1), new Date(2021, 11, 31), period1);
-            const group3 = await createGroup(new Date(2019, 0, 1), new Date(2019, 11, 31), period2);
+            const group1 = await createGroup(Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate(), Formatter.luxon().set({ day: 31, month: 12, year: 2021 }).toJSDate(), period1);
+            const group2 = await createGroup(Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate(), Formatter.luxon().set({ day: 31, month: 12, year: 2021 }).toJSDate(), period1);
+            const group3 = await createGroup(Formatter.luxon().set({ day: 1, month: 1, year: 2019 }).toJSDate(), Formatter.luxon().set({ day: 31, month: 12, year: 2019 }).toJSDate(), period2);
 
             // document created in 2021
             const document1 = await new DocumentTemplateFactory({
@@ -42,7 +43,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document1.createdAt = new Date(2022, 0, 1);
+            document1.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2022 }).toJSDate();
             await document1.save();
 
             // document created in 2020
@@ -51,7 +52,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document2.createdAt = new Date(2021, 0, 1);
+            document2.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate();
             await document2.save();
 
             // document created in 2019
@@ -60,7 +61,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document3.createdAt = new Date(2020, 0, 1);
+            document3.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2020 }).toJSDate();
             await document3.save();
 
             // act
@@ -74,7 +75,7 @@ describe('migration.document-update-year', () => {
             // take most frequent year and prefer date of document creation
             expect(updatedDocument1?.year).toBe(2021);
             expect(updatedDocument2?.year).toBe(2021);
-            expect(updatedDocument3?.year).toBe(2021);
+            expect(updatedDocument3?.year).toBe(2020); // maxed at creation year
         });
 
         test('groups overlapping period', async () => {
@@ -82,8 +83,8 @@ describe('migration.document-update-year', () => {
             }).create();
 
             const period1 = await new RegistrationPeriodFactory({
-                startDate: new Date(2021, 0, 1),
-                endDate: new Date(2021, 11, 31),
+                startDate: Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate(),
+                endDate: Formatter.luxon().set({ day: 31, month: 12, year: 2021 }).toJSDate(),
                 organization,
             }).create();
 
@@ -91,14 +92,14 @@ describe('migration.document-update-year', () => {
             await organization.save();
 
             const period2 = await new RegistrationPeriodFactory({
-                startDate: new Date(2020, 0, 1),
-                endDate: new Date(2020, 11, 31),
+                startDate: Formatter.luxon().set({ day: 1, month: 1, year: 2020 }).toJSDate(),
+                endDate: Formatter.luxon().set({ day: 31, month: 12, year: 2020 }).toJSDate(),
                 organization,
             }).create();
 
             const period3 = await new RegistrationPeriodFactory({
-                startDate: new Date(2019, 0, 1),
-                endDate: new Date(2019, 11, 31),
+                startDate: Formatter.luxon().set({ day: 1, month: 1, year: 2019 }).toJSDate(),
+                endDate: Formatter.luxon().set({ day: 31, month: 12, year: 2019 }).toJSDate(),
                 organization,
             }).create();
 
@@ -111,9 +112,9 @@ describe('migration.document-update-year', () => {
             };
 
             // groups
-            const group1 = await createGroup(new Date(2020, 6, 1), new Date(2021, 5, 30), period1);
-            const group2 = await createGroup(new Date(2020, 7, 5), new Date(2021, 4, 3), period1);
-            const group3 = await createGroup(new Date(2018, 5, 1), new Date(2019, 10, 14), period3);
+            const group1 = await createGroup(Formatter.luxon().set({ day: 1, month: 7, year: 2020 }).toJSDate(), Formatter.luxon().set({ day: 30, month: 6, year: 2021 }).toJSDate(), period1);
+            const group2 = await createGroup(Formatter.luxon().set({ day: 5, month: 8, year: 2020 }).toJSDate(), Formatter.luxon().set({ day: 3, month: 5, year: 2021 }).toJSDate(), period1);
+            const group3 = await createGroup(Formatter.luxon().set({ day: 1, month: 6, year: 2018 }).toJSDate(), Formatter.luxon().set({ day: 14, month: 11, year: 2019 }).toJSDate(), period3);
 
             // document created in 2021
             const document1 = await new DocumentTemplateFactory({
@@ -121,7 +122,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document1.createdAt = new Date(2022, 0, 1);
+            document1.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2022 }).toJSDate();
             await document1.save();
 
             // document created in 2020
@@ -130,7 +131,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document2.createdAt = new Date(2021, 0, 1);
+            document2.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2021 }).toJSDate();
             await document2.save();
 
             // document created in 2019
@@ -139,7 +140,7 @@ describe('migration.document-update-year', () => {
                 year: 0,
             }).create();
 
-            document3.createdAt = new Date(2020, 0, 1);
+            document3.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2020 }).toJSDate();
             await document3.save();
 
             // act
@@ -165,7 +166,7 @@ describe('migration.document-update-year', () => {
             year: 0,
         }).create();
 
-        document.createdAt = new Date(2025, 0, 1);
+        document.createdAt = Formatter.luxon().set({ day: 1, month: 1, year: 2025 }).toJSDate();
         await document.save();
 
         // act