@stamhoofd/models 2.118.1 → 2.120.0

package/src/factories/EventNotificationTypeFactory.ts

@@ -1,5 +1,6 @@
 import { Factory } from '@simonbackx/simple-database';
-import { EventNotificationType, RecordCategory } from '@stamhoofd/structures';
+import type { RecordCategory } from '@stamhoofd/structures';
+import { EventNotificationType } from '@stamhoofd/structures';
 
 import { Platform } from '../models/Platform.js';
 
@@ -11,7 +12,7 @@ class Options {
 export class EventNotificationTypeFactory extends Factory<Options, EventNotificationType> {
     async create(): Promise<EventNotificationType> {
         const eventType = EventNotificationType.create({
-            title: this.options.title ?? ($t(`506e15b4-622c-4167-a98a-98fbc4404bfc`) + ' ' + (new Date().getTime() + Math.floor(Math.random() * 999999))),
+            title: this.options.title ?? ($t(`%wr`) + ' ' + (new Date().getTime() + Math.floor(Math.random() * 999999))),
         });
 
         eventType.recordCategories = this.options.recordCategories ?? [];

package/src/factories/GroupFactory.ts

@@ -1,10 +1,11 @@
 import { Factory } from '@simonbackx/simple-database';
-import { BundleDiscount, BundleDiscountGroupPriceSettings, GroupPrice, GroupPriceDiscount, GroupSettings, GroupType, ReduceablePrice, TranslatedString } from '@stamhoofd/structures';
+import type { BundleDiscount, GroupPriceDiscount, GroupType} from '@stamhoofd/structures';
+import { BundleDiscountGroupPriceSettings, GroupPrice, GroupSettings, ReduceablePrice, TranslatedString } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group } from '../models/Group.js';
-import { RegistrationPeriod } from '../models/index.js';
-import { Organization } from '../models/Organization.js';
+import type { RegistrationPeriod } from '../models/index.js';
+import type { Organization } from '../models/Organization.js';
 import { OrganizationFactory } from './OrganizationFactory.js';
 
 class Options {

package/src/factories/MemberFactory.ts

@@ -2,9 +2,10 @@ import { Factory } from '@simonbackx/simple-database';
 import { Gender, MemberDetails, ParentType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
-import { Member, MemberWithUsersRegistrationsAndGroups } from '../models/Member.js';
-import { Organization } from '../models/Organization.js';
-import { User } from '../models/User.js';
+import type { MemberWithUsersRegistrationsAndGroups } from '../models/Member.js';
+import { Member } from '../models/Member.js';
+import type { Organization } from '../models/Organization.js';
+import type { User } from '../models/User.js';
 import { EmergencyContactFactory } from './EmergencyContactFactory.js';
 import { OrganizationFactory } from './OrganizationFactory.js';
 import { ParentFactory } from './ParentFactory.js';
@@ -32,7 +33,7 @@ export class MemberFactory extends Factory<Options, MemberWithUsersRegistrations
         const organization = this.options.organization
             ?? (STAMHOOFD.userMode === 'organization' ? (await new OrganizationFactory({}).create()) : null);
 
-        const memberDetails = this.options.details?.clone() ?? new MemberDetails();
+        const memberDetails = this.options.details?.clone() ?? MemberDetails.create({});
         const minAge = (this.options.minAge ?? 6);
         const maxAge = this.options.maxAge ?? 18;
 
@@ -99,7 +100,7 @@ export class MemberFactory extends Factory<Options, MemberWithUsersRegistrations
                 parentFactory = new ParentFactory({
                     type:
                         Math.random() >= 0.2
-                            ? memberDetails.parents[0].type == ParentType.Mother
+                            ? memberDetails.parents[0].type === ParentType.Mother
                                 ? ParentType.Father
                                 : ParentType.Mother
                             : undefined,

package/src/factories/MemberResponsibilityRecordFactory.ts

@@ -1,7 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
-import { MemberResponsibility } from '@stamhoofd/structures';
+import type { MemberResponsibility } from '@stamhoofd/structures';
 
-import { Member, MemberResponsibilityRecord } from '../models/index.js';
+import type { Member} from '../models/index.js';
+import { MemberResponsibilityRecord } from '../models/index.js';
 import { PlatformResponsibilityFactory } from './PlatformResponsibilityFactory.js';
 
 class Options {

package/src/factories/OrganizationFactory.ts

@@ -1,10 +1,12 @@
 import { Factory } from '@simonbackx/simple-database';
-import { Address, Country, OrganizationMetaData, OrganizationType, PermissionRoleDetailed } from '@stamhoofd/structures';
+import type { PermissionRoleDetailed } from '@stamhoofd/structures';
+import { Address, OrganizationMetaData, OrganizationType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Organization } from '../models/Organization.js';
-import { RegistrationPeriod } from '../models/RegistrationPeriod.js';
+import type { RegistrationPeriod } from '../models/RegistrationPeriod.js';
 import { RegistrationPeriodFactory } from './RegistrationPeriodFactory.js';
+import { Country } from '@stamhoofd/types/Country';
 
 class Options {
     uri?: string;

package/src/factories/OrganizationRegistrationPeriodFactory.ts

@@ -1,8 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
 
 import { OrganizationRegistrationPeriod } from '../models/index.js';
-import { Organization } from '../models/Organization.js';
-import { RegistrationPeriod } from '../models/RegistrationPeriod.js';
+import type { Organization } from '../models/Organization.js';
+import type { RegistrationPeriod } from '../models/RegistrationPeriod.js';
 
 class Options {
     organization: Organization;

package/src/factories/ParentFactory.ts

@@ -10,7 +10,7 @@ interface Options {
 
 export class ParentFactory extends Factory<Options, Parent> {
     async create(): Promise<Parent> {
-        const parent = new Parent();
+        const parent = Parent.create({})
         parent.type = this.options.type ?? this.randomArray([ParentType.Mother, ParentType.Father, ParentType.Stepfather, ParentType.Stepmother, ParentType.Other]);
         if (parent.type == ParentType.Other) {
             // Second spin

package/src/factories/RecordAnswerFactory.ts

@@ -1,5 +1,6 @@
 import { Factory } from '@simonbackx/simple-database';
-import { File, Image, RecordAddressAnswer, RecordAnswer, RecordCategory, RecordCheckboxAnswer, RecordChooseOneAnswer, RecordDateAnswer, RecordFileAnswer, RecordImageAnswer, RecordIntegerAnswer, RecordMultipleChoiceAnswer, RecordPriceAnswer, RecordSettings, RecordTextAnswer, RecordType } from '@stamhoofd/structures';
+import type { RecordCategory, RecordSettings} from '@stamhoofd/structures';
+import { File, Image, RecordAddressAnswer, RecordAnswer, RecordCheckboxAnswer, RecordChooseOneAnswer, RecordDateAnswer, RecordFileAnswer, RecordImageAnswer, RecordIntegerAnswer, RecordMultipleChoiceAnswer, RecordPriceAnswer, RecordTextAnswer, RecordType } from '@stamhoofd/structures';
 import { AddressFactory } from './AddressFactory.js';
 
 type Options = ({

package/src/factories/RecordCategoryFactory.ts

@@ -1,6 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
-import { RecordCategory, RecordSettings, TranslatedString } from '@stamhoofd/structures';
-import { RecordFactory, RecordOptions } from './RecordFactory.js';
+import type { RecordSettings} from '@stamhoofd/structures';
+import { RecordCategory, TranslatedString } from '@stamhoofd/structures';
+import type { RecordOptions } from './RecordFactory.js';
+import { RecordFactory } from './RecordFactory.js';
 
 class Options {
     records: RecordOptions[];

package/src/factories/RegistrationFactory.ts

@@ -1,10 +1,11 @@
 import { Factory } from '@simonbackx/simple-database';
 
-import { BundleDiscount, GroupPrice } from '@stamhoofd/structures';
-import { Group } from '../models/Group.js';
-import { Member } from '../models/Member.js';
+import type { GroupPrice } from '@stamhoofd/structures';
+import { BundleDiscount } from '@stamhoofd/structures';
+import type { Group } from '../models/Group.js';
+import type { Member } from '../models/Member.js';
 import { Registration } from '../models/Registration.js';
-import { Organization } from '../models/index.js';
+import type { Organization } from '../models/index.js';
 import { GroupFactory } from './GroupFactory.js';
 
 type Options = ({

package/src/factories/RegistrationPeriodFactory.ts

@@ -1,7 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
 import { RegistrationPeriodSettings } from '@stamhoofd/structures';
 
-import { Organization, RegistrationPeriod } from '../models/index.js';
+import type { Organization} from '../models/index.js';
+import { RegistrationPeriod } from '../models/index.js';
 
 class Options {
     startDate?: Date;

package/src/factories/STPackageFactory.ts

@@ -1,7 +1,7 @@
 import { Factory } from '@simonbackx/simple-database';
 
 import { STPackage } from '../models/index.js';
-import { Organization } from '../models/Organization.js';
+import type { Organization } from '../models/Organization.js';
 import { STPackageBundle, STPackageBundleHelper } from '@stamhoofd/structures';
 
 class Options {

package/src/factories/UserFactory.ts

@@ -1,7 +1,8 @@
 import { Factory } from '@simonbackx/simple-database';
-import { NewUser, Permissions, UserPermissions } from '@stamhoofd/structures';
+import type { Permissions} from '@stamhoofd/structures';
+import { NewUser, UserPermissions } from '@stamhoofd/structures';
 
-import { Organization } from '../models/Organization.js';
+import type { Organization } from '../models/Organization.js';
 import { User } from '../models/User.js';
 import { OrganizationFactory } from './OrganizationFactory.js';
 

package/src/factories/WebshopFactory.ts

@@ -1,6 +1,7 @@
 import { Factory } from '@simonbackx/simple-database';
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
-import { Product, WebshopMetaData, WebshopPrivateMetaData } from '@stamhoofd/structures';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { Product, WebshopPrivateMetaData } from '@stamhoofd/structures';
+import { WebshopMetaData } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { Webshop } from '../models/index.js';

package/src/helpers/DNSValidator.ts

@@ -1,5 +1,6 @@
 import { SimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { DNSRecord, DNSRecordStatus, DNSRecordType } from '@stamhoofd/structures';
+import type { DNSRecord} from '@stamhoofd/structures';
+import { DNSRecordStatus, DNSRecordType } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
 import { Resolver } from 'dns/promises';
 
@@ -30,7 +31,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                             record.errors = new SimpleErrors(new SimpleError({
                                 code: 'not_found',
                                 message: '',
-                                human: $t(`50c67afd-9f29-4634-bbb6-91a6083d7b4b`) + ' ' + record.name + ' ' + $t(`ac374e9b-f59d-4faa-8c12-f4984b798bdd`),
+                                human: $t(`%GA`) + ' ' + record.name + ' ' + $t(`%GB`),
                             }));
                         }
                     }
@@ -42,7 +43,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                         record.errors = new SimpleErrors(new SimpleError({
                             code: 'too_many_fields',
                             message: '',
-                            human: $t(`2cd9734f-c32b-4513-99b5-de749f12cb87`) + ' ' + record.name + $t(`4c66b760-cef1-47bc-899a-1ec5ec363560`),
+                            human: $t(`%GC`) + ' ' + record.name + $t(`%GD`),
                         }));
                     }
                     else {
@@ -59,7 +60,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                                 record.errors = new SimpleErrors(new SimpleError({
                                     code: 'wrong_value',
                                     message: '',
-                                    human: $t(`66fa2988-3bef-4e08-9ae8-da904007444e`) + ' ' + record.name + $t(`dbcdb363-81d4-4f74-a484-3f91b2a8bd3d`) + ' ' + addresses[0] + '.',
+                                    human: $t(`%GE`) + ' ' + record.name + $t(`%GF`) + ' ' + addresses[0] + '.',
                                 }));
                             }
                         }
@@ -82,7 +83,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                             record.errors = new SimpleErrors(new SimpleError({
                                 code: 'not_found',
                                 message: '',
-                                human: $t(`55a44a06-c9da-4ba6-a142-9d223636f54b`) + ' ' + record.name + ' ' + $t(`ac374e9b-f59d-4faa-8c12-f4984b798bdd`),
+                                human: $t(`%GG`) + ' ' + record.name + ' ' + $t(`%GB`),
                             }));
                         }
                     }
@@ -92,7 +93,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                         record.errors = new SimpleErrors(new SimpleError({
                             code: 'too_many_fields',
                             message: '',
-                            human: $t(`f0a3b61f-a736-47f7-b893-1c8c61555b50`) + ' ' + record.name + $t(`4c66b760-cef1-47bc-899a-1ec5ec363560`),
+                            human: $t(`%GH`) + ' ' + record.name + $t(`%GD`),
                         }));
                     }
                     else {
@@ -109,7 +110,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                                 record.errors = new SimpleErrors(new SimpleError({
                                     code: 'wrong_value',
                                     message: '',
-                                    human: $t(`3580661b-3a30-4f7f-bb7a-07dfe644957a`) + ' ' + record.name + $t(`dbcdb363-81d4-4f74-a484-3f91b2a8bd3d`) + ' ' + records[0].join(''),
+                                    human: $t(`%GI`) + ' ' + record.name + $t(`%GF`) + ' ' + records[0].join(''),
                                 }));
                             }
                         }
@@ -126,7 +127,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                     record.errors = new SimpleErrors(new SimpleError({
                         code: 'not_found',
                         message: '',
-                        human: $t(`d6572dda-561a-4aeb-9d9b-1fc4f7a3e337`) + ' ' + record.name + ' ' + $t(`ac374e9b-f59d-4faa-8c12-f4984b798bdd`),
+                        human: $t(`%GJ`) + ' ' + record.name + ' ' + $t(`%GB`),
                     }));
                 }
             }
@@ -136,7 +137,7 @@ export async function validateDNSRecords(dnsRecords: DNSRecord[], didRetry = fal
                     record.errors = new SimpleErrors(new SimpleError({
                         code: 'not_found',
                         message: '',
-                        human: $t(`8fdb686d-0a87-477c-a532-dac98afedf43`),
+                        human: $t(`%GK`),
                     }));
                 }
             }

package/src/helpers/EmailBuilder.ts

@@ -1,10 +1,19 @@
-import { Email, EmailAddress, EmailBuilder, EmailInterfaceRecipient } from '@stamhoofd/email';
-import { BalanceItem as BalanceItemStruct, EmailRecipient as EmailRecipientStruct, EmailTemplateType, OrganizationEmail, Platform as PlatformStruct, ReceivableBalanceType, Recipient, replaceEmailHtml, replaceEmailText, Replacement } from '@stamhoofd/structures';
+import type { EmailBuilder, EmailInterfaceRecipient } from '@stamhoofd/email';
+import { Email, EmailAddress } from '@stamhoofd/email';
+import type { EmailRecipient as EmailRecipientStruct, EmailTemplateType, OrganizationEmail, Platform as PlatformStruct, Recipient} from '@stamhoofd/structures';
+import { BalanceItem as BalanceItemStruct, ReceivableBalanceType, replaceEmailHtml, replaceEmailText, Replacement } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { EmailRecipient, CachedBalance, EmailTemplate, Group, Organization, Platform, User, Webshop } from '../models/index.js';
+import { I18n } from '@stamhoofd/backend-i18n/I18n';
+import { EmailRecipient } from '../models/EmailRecipient.js';
+import { CachedBalance } from '../models/CachedBalance.js';
+import { EmailTemplate } from '../models/EmailTemplate.js';
+import type { Group } from '../models/Group.js';
+import type { Organization } from '../models/Organization.js';
+import { Platform } from '../models/Platform.js';
+import { User } from '../models/User.js';
+import type {Webshop} from '../models/Webshop.js';
 
 export type EmailTemplateOptions = {
     type: EmailTemplateType;
@@ -256,7 +265,7 @@ export async function getEmailBuilder(organization: Organization | null, email:
                         new SimpleError({
                             code: 'email_skipped_hard_bounce',
                             message: 'Recipient has hard bounced',
-                            human: $t(`af49a569-ce88-48d9-ac37-81e594e16c03`),
+                            human: $t(`%ws`),
                         }),
                     );
                 }
@@ -270,7 +279,7 @@ export async function getEmailBuilder(organization: Organization | null, email:
                         new SimpleError({
                             code: 'email_skipped_spam',
                             message: 'Recipient has marked as spam',
-                            human: $t(`e6523f56-397e-4127-8bf7-8396f6f25a62`),
+                            human: $t(`%wt`),
                         }),
                     );
                 }
@@ -285,7 +294,7 @@ export async function getEmailBuilder(organization: Organization | null, email:
                         new SimpleError({
                             code: 'email_skipped_unsubscribed',
                             message: unsubscribe.unsubscribedAll ? 'Recipient has unsubscribed' : (unsubscribe.hardBounce ? 'Recipient has hard bounced' : (unsubscribe.markedAsSpam ? 'Recipient has marked as spam' : 'Recipient has unsubscribed from marketing')),
-                            human: $t('ffbebae7-eac3-44fe-863b-25942c5be7d0'),
+                            human: $t('%1E3'),
                         }),
                     );
                 }
@@ -540,7 +549,7 @@ export function stripRecipientReplacementsForWebDisplay(recipient: Recipient | E
 
     recipient.replacements.push(Replacement.create({
         token: 'greeting',
-        value: $t('f56ad718-fda0-490e-9120-ee0bd6ebbc43'),
+        value: $t('%1E9'),
     }));
 }
 
@@ -623,7 +632,7 @@ export async function fillRecipientReplacements(recipient: Recipient | EmailReci
                 if (members.length > 0) {
                     for (const member of members) {
                         suffixes.push(
-                            $t('e2519632-c495-4629-9ddb-334a4f00e272', {
+                            $t('%1EC', {
                                 firstName: Formatter.escapeHtml(member.firstName),
                                 securityCode: `<span class="style-inline-code">${Formatter.escapeHtml(options.forPreview ? '••••' : Formatter.spaceString(member.details.securityCode ?? '', 4, '-'))}</span>`,
                             }),
@@ -640,8 +649,8 @@ export async function fillRecipientReplacements(recipient: Recipient | EmailReci
                     token: 'loginDetails',
                     value: '',
                     html: recipientUser.hasAccount()
-                        ? `<p class="description"><em>${$t('5403b466-98fe-48ac-beff-38acf7c9734d', { email: emailEscaped })}${suffix}</em></p>`
-                        : `<p class="description"><em>${$t('3ab6ddc1-7ddc-4671-95d2-64994a5d36cc', { email: emailEscaped })}${suffix}</em></p>`,
+                        ? `<p class="description"><em>${$t('%1EA', { email: emailEscaped })}${suffix}</em></p>`
+                        : `<p class="description"><em>${$t('%1EB', { email: emailEscaped })}${suffix}</em></p>`,
                 }),
             );
         }
@@ -653,7 +662,7 @@ export async function fillRecipientReplacements(recipient: Recipient | EmailReci
                     Replacement.create({
                         token: 'loginDetails',
                         value: '',
-                        html: `<p class="description"><em>${$t('3ab6ddc1-7ddc-4671-95d2-64994a5d36cc', { email: emailEscaped })}</em></p>`,
+                        html: `<p class="description"><em>${$t('%1EB', { email: emailEscaped })}</em></p>`,
                     }),
                 );
             }

package/src/helpers/Handlebars.ts

@@ -79,14 +79,14 @@ Handlebars.registerHelper('filterString', (a, options) => {
         return '';
     }
     if (options.hash.type === 'phone') {
-        return Formatter.removeAccents(a).replace(/[^A-Za-z0-9+]+/g, '');
+        return Formatter.removeAccents(a).replace(/[^A-Z0-9+]+/gi, '');
     }
     if (options.hash.type === 'companyNumber') {
         // BE prefix not allowed
-        return Formatter.removeAccents(a).replace(/[^0-9]+/g, '');
+        return Formatter.removeAccents(a).replace(/\D+/g, '');
     }
     // Default: alphanumeric
-    return Formatter.removeAccents(a).replace(/[^A-Za-z0-9]+/g, '');
+    return Formatter.removeAccents(a).replace(/[^A-Z0-9]+/gi, '');
 });
 Handlebars.registerHelper('year', (a) => {
     if (!(a instanceof Date)) {

package/src/helpers/MemberMerger.test.ts

@@ -1,7 +1,6 @@
 import {
     Address,
     BooleanStatus,
-    Country,
     EmergencyContact,
     Gender,
     MemberDetails,
@@ -15,6 +14,7 @@ import {
     UitpasSocialTariff,
     UitpasSocialTariffStatus,
 } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { v4 as uuidv4 } from 'uuid';
 import { Member } from '../models/index.js';
 import { mergeMemberDetails, selectBaseMember } from './MemberMerger.js';

package/src/helpers/MemberMerger.ts

@@ -1,13 +1,14 @@
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import {
+import type {
     Address,
     BooleanStatus,
-    Gender,
     MemberDetails,
     Parent,
-    ParentType,
     RecordAnswer,
-    UitpasNumberDetails,
+    UitpasNumberDetails} from '@stamhoofd/structures';
+import {
+    Gender,
+    ParentType
 } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import {

package/src/helpers/WebshopCounter.ts

@@ -2,7 +2,7 @@ import { Database } from '@simonbackx/simple-database';
 import { QueueHandler } from '@stamhoofd/queues';
 import { WebshopNumberingType } from '@stamhoofd/structures';
 
-import { Webshop } from '../models/index.js';
+import type {Webshop} from '../models/Webshop.js';
 
 export class WebshopCounter {
     static numberCache: Map<string, number> = new Map();

package/src/migrations/1605262045-import-postcodes.ts

@@ -1,6 +1,6 @@
 import { column, Migration } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
-import { Country } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { StringCompare } from '@stamhoofd/utility';
 import { City } from '../models/addresses/City.js';
 import { PostalCode } from '../models/addresses/PostalCode.js';

package/src/migrations/1605262046-import-postcodes-nl.ts

@@ -1,5 +1,5 @@
 import { Migration } from '@simonbackx/simple-database';
-import { Country } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { StringCompare } from '@stamhoofd/utility';
 import fs from 'fs';
 import readline from 'readline';
@@ -44,7 +44,7 @@ export default new Migration(async () => {
     }
 
     // We start by looping all provinces in the files
-    const folder = __dirname + '/data/postcodes/nl';
+    const folder = import.meta.dirname + '/data/postcodes/nl';
     const provinces = (await fs.promises.readdir(folder, { withFileTypes: true }))
         .filter(dirent => !dirent.isDirectory())
         .map((dirent) => {

package/src/migrations/1720080976-convert-charset-leads.ts

@@ -0,0 +1,53 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+
+/**
+ * If the charset of the leads table is not converted this results
+ * in foreign keys constraint errors in other migrations.
+ * 
+ * todo: will we keep the leads table after the migration?
+ */
+export default new Migration(async () => {
+    process.stdout.write('\n');
+
+    if (STAMHOOFD.userMode === 'platform') {
+        console.log('Skipped update leads charset for userMode platform.')
+        return Promise.resolve();
+    }
+
+    const hasTable = await tableExists('leads');
+    console.log('Has leads table: ' + hasTable);
+
+    if (hasTable) {
+        const sqlStatement: string = [
+            'set foreign_key_checks=0;',
+            'ALTER TABLE `leads` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;',
+            'ALTER TABLE `leads` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;',
+            'set foreign_key_checks=1;'
+        ].join('');
+
+        console.log('Start updating charset of leads table.');
+        await Database.statement(sqlStatement);
+    }
+
+    return Promise.resolve();
+});
+
+async function tableExists(tableName: string): Promise<boolean> {
+    const [rows] = await Database.select(
+        `
+        SELECT COUNT(*) as count
+        FROM information_schema.tables
+        WHERE table_schema = DATABASE()
+        AND table_name = ?
+        `,
+        [tableName]
+    );
+
+    const count = rows[0]['']['count'];
+
+    if (typeof count !== 'number') {
+        throw new Error('count is not a number');
+    }
+
+    return count > 0;
+}

package/src/models/AuditLog.ts

@@ -1,5 +1,6 @@
 import { column } from '@simonbackx/simple-database';
-import { ArrayDecoder, Decoder, MapDecoder, StringDecoder, StringOrNumberDecoder } from '@simonbackx/simple-encoding';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { ArrayDecoder, MapDecoder, StringDecoder, StringOrNumberDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { AuditLogPatchItem, AuditLogReplacement, AuditLogSource, AuditLogType, getAuditLogTypeReplacements } from '@stamhoofd/structures';
 import { v7 as uuidv7 } from 'uuid';

package/src/models/BalanceItem.ts

@@ -1,11 +1,12 @@
 import { column, Database } from '@simonbackx/simple-database';
-import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItem as BalanceItemStruct, BalanceItemType, BalanceItemWithPayments, BalanceItemWithPrivatePayments, Payment as PaymentStruct, PrivatePayment, VATExcemptReason } from '@stamhoofd/structures';
+import type { VATExcemptReason } from '@stamhoofd/structures';
+import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItem as BalanceItemStruct, BalanceItemType, BalanceItemWithPayments, BalanceItemWithPrivatePayments, Payment as PaymentStruct, PrivatePayment } from '@stamhoofd/structures';
 import { Formatter, STMath } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { EnumDecoder, MapDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { Payment } from './index.js';
+import { Payment } from './Payment.js';
 
 /**
  * Keeps track of how much a member/user owes or needs to be reimbursed.
@@ -96,7 +97,7 @@ export class BalanceItem extends QueryableModel {
     }
 
     set quantity(quantity: number) {
-        this.amount = this.quantity;
+        this.amount = quantity;
     }
 
     /**

package/src/models/BalanceItemPayment.ts

@@ -1,7 +1,10 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { v4 as uuidv4 } from 'uuid';
 
-import { BalanceItem, Payment } from './index.js';
+import type {BalanceItem} from './BalanceItem.js';
+import type {Payment} from './Payment.js';
+
 import { QueryableModel } from '@stamhoofd/sql';
 
 /**
@@ -21,10 +24,10 @@ export class BalanceItemPayment extends QueryableModel {
     @column({ type: 'string' })
     organizationId: string;
 
-    @column({ type: 'string', foreignKey: BalanceItemPayment.payment })
+    @column({ type: 'string' })
     paymentId: string;
 
-    @column({ type: 'string', foreignKey: BalanceItemPayment.balanceItem })
+    @column({ type: 'string' })
     balanceItemId: string;
 
     /**
@@ -55,6 +58,6 @@ export class BalanceItemPayment extends QueryableModel {
     })
     updatedAt: Date;
 
-    static balanceItem = new ManyToOneRelation(BalanceItem, 'balanceItem');
-    static payment = new ManyToOneRelation(Payment, 'payment');
+    static balanceItem: ManyToOneRelation<'balanceItem', BalanceItem>;
+    static payment: ManyToOneRelation<'payment', Payment>;
 }