@stamhoofd/models 2.118.1 → 2.120.0

package/src/models/Email.ts

@@ -1,12 +1,15 @@
 import { column } from '@simonbackx/simple-database';
-import { BaseOrganization, EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailStatus, Email as EmailStruct, EmailTemplateType, EmailWithRecipients, getExampleRecipient, isSoftEmailRecipientError, LimitedFilteredRequest, PaginatedResponse, SortItemDirection, StamhoofdFilter, User as UserStruct } from '@stamhoofd/structures';
+import type { BaseOrganization, EmailRecipientFilterType, EmailRecipient as EmailRecipientStruct, EmailTemplateType, PaginatedResponse, StamhoofdFilter, User as UserStruct } from '@stamhoofd/structures';
+import { EmailAttachment, EmailPreview, EmailRecipientFilter, EmailRecipientsStatus, EmailStatus, Email as EmailStruct, EmailWithRecipients, getExampleRecipient, isSoftEmailRecipientError, LimitedFilteredRequest, SortItemDirection } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { AnyDecoder, ArrayDecoder } from '@simonbackx/simple-encoding';
 import { isSimpleError, isSimpleErrors, SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { Email as EmailClass, EmailInterfaceRecipient } from '@stamhoofd/email';
-import { isAbortedError, QueueHandler, QueueHandlerOptions } from '@stamhoofd/queues';
+import { I18n } from '@stamhoofd/backend-i18n/I18n';
+import type { EmailInterfaceRecipient } from '@stamhoofd/email';
+import { Email as EmailClass } from '@stamhoofd/email';
+import type { QueueHandlerOptions } from '@stamhoofd/queues';
+import { isAbortedError, QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel, readDynamicSQLExpression, SQL, SQLAlias, SQLCalculation, SQLCount, SQLPlusSign, SQLSelectAs, SQLWhereSign } from '@stamhoofd/sql';
 import { canSendFromEmail, fillRecipientReplacements, getEmailBuilder, mergeReplacementsIfEqual, removeUnusedReplacements, stripRecipientReplacementsForWebDisplay, stripSensitiveRecipientReplacements } from '../helpers/EmailBuilder.js';
 import { EmailRecipient } from './EmailRecipient.js';
@@ -29,7 +32,7 @@ function errorToSimpleErrors(e: unknown) {
             new SimpleError({
                 code: 'unknown_error',
                 message: ((typeof e === 'object' && e !== null && 'message' in e && typeof e.message === 'string') ? e.message : 'Unknown error'),
-                human: $t(`41db9fc8-77f4-49a7-a77b-40a4ae8c4d8f`),
+                human: $t(`%1ED`),
             }),
         );
     }
@@ -236,7 +239,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing subject',
-                human: $t(`e78c8218-4d25-413b-ae6b-fd916e663e5a`),
+                human: $t(`%wu`),
             });
         }
 
@@ -244,7 +247,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing text',
-                human: $t(`65b701a3-c74c-4eb6-b98e-7b9dcad0a358`),
+                human: $t(`%wv`),
             });
         }
 
@@ -252,7 +255,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing html',
-                human: $t(`65b701a3-c74c-4eb6-b98e-7b9dcad0a358`),
+                human: $t(`%wv`),
             });
         }
 
@@ -260,7 +263,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Missing from',
-                human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
+                human: $t(`%ww`),
             });
         }
 
@@ -268,7 +271,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_recipients',
                 message: 'Failed to build recipients (count)',
-                human: $t(`457ec920-2867-4d59-bbec-4466677e1b50`) + ' ' + this.recipientsErrors.getHuman(),
+                human: $t(`%1EE`) + ' ' + this.recipientsErrors.getHuman(),
             });
         }
 
@@ -276,7 +279,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_state',
                 message: 'Email is deleted',
-                human: $t(`a0524f41-bdde-4fcc-9a9a-9350905377d8`),
+                human: $t(`%1EF`),
             });
         }
 
@@ -301,7 +304,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'missing_unsubscribe_button',
                     message: 'Missing unsubscribe button',
-                    human: $t(`dd55e04b-e5d9-4d9a-befc-443eef4175a8`),
+                    human: $t(`%DS`),
                     field: 'html',
                 });
             }
@@ -313,7 +316,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'missing_unsubscribe_button',
                     message: 'Missing unsubscribe button',
-                    human: $t(`dd55e04b-e5d9-4d9a-befc-443eef4175a8`),
+                    human: $t(`%DS`),
                     field: 'text',
                 });
             }
@@ -330,7 +333,7 @@ export class Email extends QueryableModel {
             throw new SimpleError({
                 code: 'too_big_attachments',
                 message: 'Too big attachments',
-                human: $t(`e8b9a1db-97d0-410e-99b2-6a87c1087593`),
+                human: $t(`%wx`),
                 field: 'attachments',
             });
         }
@@ -351,7 +354,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'content_type_not_supported',
                     message: 'Content-Type not supported',
-                    human: $t(`54da84d6-5f6a-4db2-be34-9ddb7f47bbe8`),
+                    human: $t(`%wy`),
                     field: 'attachments',
                 });
             }
@@ -450,7 +453,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Email not found',
-                    human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
+                    human: $t(`%wz`),
                 });
             }
             const c = await callback(upToDate, options);
@@ -619,7 +622,7 @@ export class Email extends QueryableModel {
                 continue;
             }
 
-            let filename = $t('b1291584-d2ad-4ebd-88ed-cbda4f3755b4');
+            let filename = $t('%180');
 
             if (attachment.contentType === 'application/pdf') {
                 // tmp solution for pdf only
@@ -650,7 +653,7 @@ export class Email extends QueryableModel {
                     throw new SimpleError({
                         code: 'attachment_not_found',
                         message: 'Attachment not found',
-                        human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                        human: $t(`%181`),
                     });
                 }
 
@@ -664,7 +667,7 @@ export class Email extends QueryableModel {
                     throw new SimpleError({
                         code: 'attachment_not_found',
                         message: 'Attachment not found',
-                        human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                        human: $t(`%181`),
                     });
                 }
 
@@ -808,7 +811,7 @@ export class Email extends QueryableModel {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Missing from',
-                            human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
+                            human: $t(`%ww`),
                         });
                     }
 
@@ -836,7 +839,7 @@ export class Email extends QueryableModel {
                         throw new SimpleError({
                             code: 'not_found',
                             message: 'Email not found',
-                            human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
+                            human: $t(`%wz`),
                         });
                     }
                     upToDate.copyFrom(c);
@@ -845,7 +848,7 @@ export class Email extends QueryableModel {
                         throw new SimpleError({
                             code: 'recipients_not_created',
                             message: 'Failed to create recipients',
-                            human: $t(`f660b2eb-e382-4d21-86e4-673ca7bc2d4a`),
+                            human: $t(`%x0`),
                         });
                     }
 
@@ -1020,7 +1023,7 @@ export class Email extends QueryableModel {
                             new SimpleError({
                                 code: 'no_recipients',
                                 message: 'No recipients',
-                                human: $t(`9fe3de8e-090c-4949-97da-4810ce9e61c7`),
+                                human: $t(`%1EG`),
                             }),
                         );
                     }
@@ -1162,7 +1165,7 @@ export class Email extends QueryableModel {
                 throw new SimpleError({
                     code: 'organization_not_found',
                     message: 'Organization not found',
-                    human: $t(`f3c6e2b1-2f3a-4e2f-8f7a-1e5f3d3c8e2a`),
+                    human: $t(`%1NV`),
                 });
             }
             const platform = await Platform.getSharedPrivateStruct();

package/src/models/EmailTemplate.ts

@@ -1,7 +1,8 @@
 import { column } from '@simonbackx/simple-database';
 import { AnyDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EmailTemplate as EmailTemplateStruct, EmailTemplateType } from '@stamhoofd/structures';
+import type { EmailTemplateType } from '@stamhoofd/structures';
+import { EmailTemplate as EmailTemplateStruct } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 /**

package/src/models/EmailVerificationCode.ts

@@ -1,6 +1,6 @@
 import { column } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
+import type {I18n} from '@stamhoofd/backend-i18n';
 import { QueryableModel } from '@stamhoofd/sql';
 import { EmailTemplateType, Recipient, Replacement } from '@stamhoofd/structures';
 import basex from 'base-x';
@@ -8,6 +8,8 @@ import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
 import { Platform } from './Platform.js';
+import type {User} from './User.js';
+import type {Organization} from './Organization.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);
@@ -118,7 +120,7 @@ export class EmailVerificationCode extends QueryableModel {
         this.expiresAt = new Date(new Date().getTime() + 1000 * 60 * 60 * 12);
     }
 
-    getEmailVerificationUrl(user: import('./User').User, organization: import('./Organization').Organization | null, i18n: I18n) {
+    getEmailVerificationUrl(user: User, organization: Organization | null, i18n: I18n) {
         let host: string;
         if (user.permissions || !organization || STAMHOOFD.userMode === 'platform') {
             host = 'https://' + (STAMHOOFD.domains.dashboard ?? 'stamhoofd.app') + '/' + i18n.locale;
@@ -217,7 +219,7 @@ export class EmailVerificationCode extends QueryableModel {
             throw new SimpleError({
                 code: 'too_many_attempts',
                 message: 'Too many attempts',
-                human: $t(`9ea99caf-e245-45b2-97d5-004393e78b49`),
+                human: $t(`%GL`),
                 statusCode: 429,
             });
         }
@@ -238,13 +240,13 @@ export class EmailVerificationCode extends QueryableModel {
             throw new SimpleError({
                 code: 'too_many_attempts',
                 message: 'Too many attempts',
-                human: $t(`9ea99caf-e245-45b2-97d5-004393e78b49`),
+                human: $t(`%GL`),
                 statusCode: 429,
             });
         }
     }
 
-    async send(user: import('./User').User, organization: import('./Organization').Organization | null, i18n: I18n, withCode = true) {
+    async send(user: User, organization: Organization | null, i18n: I18n, withCode = true) {
         const url = this.getEmailVerificationUrl(user, organization, i18n);
 
         const name = organization?.name ?? (await Platform.getSharedPrivateStruct()).config.name;
@@ -298,7 +300,7 @@ export class EmailVerificationCode extends QueryableModel {
         }
     }
 
-    static async resend(organization: import('./Organization').Organization | null, token: string, i18n: I18n) {
+    static async resend(organization: Organization | null, token: string, i18n: I18n) {
         const verificationCodes = await this.where({
             token,
             organizationId: organization
@@ -336,7 +338,7 @@ export class EmailVerificationCode extends QueryableModel {
      * If needed, it will update the code.
      * Use this method for sending only, not for verification!
      */
-    static async createFor(user: import('./User').User, email: string): Promise<EmailVerificationCode> {
+    static async createFor(user: User, email: string): Promise<EmailVerificationCode> {
         // TODO: make this constant time to avoid complex timing attacks (especially when under load)
         // Do we already have a verificationCode for this email?
 

package/src/models/EventNotification.ts

@@ -1,7 +1,8 @@
 import { column, ManyToManyRelation } from '@simonbackx/simple-database';
 import { MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { EventNotificationStatus, RecordAnswer, RecordAnswerDecoder } from '@stamhoofd/structures';
+import type { RecordAnswer} from '@stamhoofd/structures';
+import { EventNotificationStatus, RecordAnswerDecoder } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Event } from './Event.js';
 
@@ -79,5 +80,5 @@ export class EventNotification extends QueryableModel {
     updatedAt: Date;
 
     // Note: all relations should point to their parents, not the other way around to avoid reference cycles
-    static events = new ManyToManyRelation(EventNotification, Event, 'events');
+    static events = new ManyToManyRelation<'events', EventNotification, Event>(EventNotification, Event, 'events');
 }

package/src/models/Group.ts

@@ -1,21 +1,14 @@
 import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import { GroupCategory, GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType, StockReservation } from '@stamhoofd/structures';
+import type { GroupCategory} from '@stamhoofd/structures';
+import { GroupPrivateSettings, GroupSettings, GroupStatus, Group as GroupStruct, GroupType, StockReservation } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueueHandler } from '@stamhoofd/queues';
-import { ModelCache, QueryableModel } from '@stamhoofd/sql';
-import { Member, OrganizationRegistrationPeriod, Payment, Registration, User } from './index.js';
+import { QueryableModel } from '@stamhoofd/sql';
+import type {OrganizationRegistrationPeriod} from './OrganizationRegistrationPeriod.js';
+import { Registration } from './Registration.js';
 
-if (Member === undefined) {
-    throw new Error('Import Member is undefined');
-}
-if (User === undefined) {
-    throw new Error('Import User is undefined');
-}
-if (Payment === undefined) {
-    throw new Error('Import Payment is undefined');
-}
 if (Registration === undefined) {
     throw new Error('Import Registration is undefined');
 }
@@ -240,6 +233,3 @@ export class Group extends QueryableModel {
         return await this.applyStockReservations(groupId, reservations, true);
     }
 }
-
-Registration.group = new ManyToOneRelation(Group, 'group');
-Registration.group.foreignKey = 'groupId';

package/src/models/Image.ts

@@ -3,7 +3,8 @@ import { column } from '@simonbackx/simple-database';
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
-import { File, Resolution, ResolutionRequest } from '@stamhoofd/structures';
+import type { ResolutionRequest } from '@stamhoofd/structures';
+import { File, Resolution } from '@stamhoofd/structures';
 import sharp from 'sharp';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -150,7 +151,7 @@ export class Image extends QueryableModel {
                     throw new SimpleError({
                         code: 'failed_to_sign',
                         message: 'Failed to sign file',
-                        human: $t('509cdb4f-131a-42a6-b3b1-a63cca231e65'),
+                        human: $t('%B6'),
                         statusCode: 500,
                     });
                 }

package/src/models/InvoicedBalanceItem.ts

@@ -1,10 +1,11 @@
-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 { QueryableModel } from '@stamhoofd/sql';
-import { Invoice } from './Invoice.js';
-import { BalanceItem } from './BalanceItem.js';
-import { VATExcemptReason } from '@stamhoofd/structures';
+import type {Invoice} from './Invoice.js';
+import type {BalanceItem} from './BalanceItem.js';
+import type { VATExcemptReason } from '@stamhoofd/structures';
 
 /**
  * Keeps track of all the created invoices of a balance item, which contains how many balance was invoiced (including VAT)
@@ -23,10 +24,10 @@ export class InvoicedBalanceItem extends QueryableModel {
     @column({ type: 'string' })
     organizationId: string;
 
-    @column({ type: 'string', foreignKey: InvoicedBalanceItem.invoice })
+    @column({ type: 'string' })
     invoiceId: string;
 
-    @column({ type: 'string', foreignKey: InvoicedBalanceItem.balanceItem })
+    @column({ type: 'string' })
     balanceItemId: string;
 
     @column({ type: 'string' })
@@ -114,6 +115,6 @@ export class InvoicedBalanceItem extends QueryableModel {
     })
     updatedAt: Date;
 
-    static balanceItem = new ManyToOneRelation(BalanceItem, 'balanceItem');
-    static invoice = new ManyToOneRelation(Invoice, 'invoice');
+    static balanceItem: ManyToOneRelation<'balanceItem', BalanceItem>;
+    static invoice: ManyToOneRelation<'invoice', Invoice>;
 }

package/src/models/Member.ts

@@ -1,10 +1,14 @@
-import { column, Database, ManyToManyRelation, ManyToOneRelation, OneToManyRelation } from '@simonbackx/simple-database';
-import { ModelCache, QueryableModel, SQL } from '@stamhoofd/sql';
+import { column, ManyToManyRelation, ManyToOneRelation, OneToManyRelation } from '@simonbackx/simple-database';
+import { QueryableModel, SQL } from '@stamhoofd/sql';
 import { MemberDetails, NationalRegisterNumberOptOut, RegistrationWithTinyMember, TinyMember } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
+import { Group } from './Group.js';
+import { MemberResponsibilityRecord } from './MemberResponsibilityRecord.js';
+import { MemberUser } from './MemberUser.js';
+import { Registration } from './Registration.js';
+import { User } from './User.js';
 
-import { Group, MemberResponsibilityRecord, MemberUser, Payment, Registration, User } from './index.js';
 export type MemberWithUsers = Member & {
     users: User[];
 };
@@ -448,7 +452,7 @@ export class Member extends QueryableModel {
         return this.getBlobByIds(...(await this.getMemberIdsForUser(user)));
     }
 
-    static getRegistrationWithTinyMemberStructure(registration: RegistrationWithMember & { group: import('./Group').Group }): RegistrationWithTinyMember {
+    static getRegistrationWithTinyMemberStructure(registration: RegistrationWithMember & { group: Group }): RegistrationWithTinyMember {
         return RegistrationWithTinyMember.create({
             ...registration.getStructure(),
             cycle: registration.cycle,

package/src/models/MemberPlatformMembership.ts

@@ -5,7 +5,7 @@ import { PlatformMembershipTypeBehaviour } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 import { BalanceItem } from './BalanceItem.js';
-import { Member } from './Member.js';
+import type { Member } from './Member.js';
 import { Organization } from './Organization.js';
 import { Platform } from './Platform.js';
 import { Registration } from './Registration.js';
@@ -184,7 +184,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_membership_type',
                 message: 'Unknown membership type',
-                human: $t(`14e020be-1dd8-4caf-9dce-369cbe0db902`),
+                human: $t(`%GM`),
             });
         }
 
@@ -194,7 +194,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'period_unavailable',
                 message: 'Membership not available for this period',
-                human: $t(`d5795b94-23d5-4fe7-97e1-6f0fe916caca`),
+                human: $t(`%GN`),
             });
         }
 
@@ -291,7 +291,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'invalid_membership_type',
                 message: 'Unknown membership type',
-                human: $t(`14e020be-1dd8-4caf-9dce-369cbe0db902`),
+                human: $t(`%GM`),
             });
         }
 
@@ -301,7 +301,7 @@ export class MemberPlatformMembership extends QueryableModel {
             throw new SimpleError({
                 code: 'period_unavailable',
                 message: 'Membership not available for this period',
-                human: $t(`d5795b94-23d5-4fe7-97e1-6f0fe916caca`),
+                human: $t(`%GN`),
             });
         }
 
@@ -311,7 +311,7 @@ export class MemberPlatformMembership extends QueryableModel {
                 // todo
                 code: 'not_found',
                 message: 'Organization not found',
-                human: $t(`1524a6e6-aad7-4072-81c1-ce6fc196224f`),
+                human: $t(`%GO`),
             });
         }
 

package/src/models/MemberResponsibilityRecord.ts

@@ -1,6 +1,7 @@
 import { column } from '@simonbackx/simple-database';
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import { Group as GroupStruct, MemberResponsibilityRecordBase, MemberResponsibilityRecord as MemberResponsibilityRecordStruct } from '@stamhoofd/structures';
+import type { Group as GroupStruct} from '@stamhoofd/structures';
+import { MemberResponsibilityRecordBase, MemberResponsibilityRecord as MemberResponsibilityRecordStruct } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 export class MemberResponsibilityRecord extends QueryableModel {

package/src/models/MergedMember.ts

@@ -1,7 +1,7 @@
 import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { MemberDetails } from '@stamhoofd/structures';
-import { Member } from './index.js';
+import type {Member} from './index.js';
 
 export class MergedMember extends QueryableModel {
     static override table = 'merged_members';

package/src/models/MollieToken.ts

@@ -1,12 +1,12 @@
 import { column } from '@simonbackx/simple-database';
-import { PartialWithoutMethods, PlainObject } from '@simonbackx/simple-encoding';
+import type { PartialWithoutMethods, PlainObject } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
 import { MollieOnboarding, MollieProfile, MollieStatus } from '@stamhoofd/structures';
-import { IncomingMessage } from 'http';
+import type { IncomingMessage } from 'http';
 import https from 'https';
 
-import { Organization } from './Organization.js';
+import type { Organization } from './Organization.js';
 
 function sleep(ms: number) {
     return new Promise(resolve => setTimeout(resolve, ms));
@@ -366,7 +366,7 @@ export class MollieToken extends QueryableModel {
                 profile: {
                     name: organization.name + ' - Stamhoofd',
                     // url: "https://"+organization.getHost(),
-                    description: $t(`62246c37-15c7-4f7d-94e2-7476f971c8da`),
+                    description: $t(`%x1`),
                     categoryCode: 8398,
                 },
             });

package/src/models/OneTimeToken.ts

@@ -4,7 +4,7 @@ import { QueryableModel } from '@stamhoofd/sql';
 import basex from 'base-x';
 import crypto from 'crypto';
 
-import { Organization } from './Organization.js';
+import type { Organization } from './Organization.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);

package/src/models/Order.ts

@@ -1,14 +1,22 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, BalanceItemWithPayments, BalanceItemWithPrivatePayments, EmailTemplateType, OrderData, OrderStatus, Order as OrderStruct, PaymentMethod, PaymentStatus, Payment as PaymentStruct, PrivateOrder, PrivatePayment, ProductType, Recipient, Replacement, WebshopPreview, WebshopStatus, WebshopTicketType, WebshopTimeSlot } from '@stamhoofd/structures';
+import type { WebshopTimeSlot } from '@stamhoofd/structures';
+import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, BalanceItemWithPayments, BalanceItemWithPrivatePayments, EmailTemplateType, OrderData, OrderStatus, Order as OrderStruct, PaymentMethod, PaymentStatus, Payment as PaymentStruct, PrivateOrder, PrivatePayment, ProductType, Recipient, Replacement, WebshopPreview, WebshopStatus, WebshopTicketType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
 import { WebshopCounter } from '../helpers/WebshopCounter.js';
-import { BalanceItem, BalanceItemPayment, Organization, Payment, Ticket, Webshop, WebshopDiscountCode } from './index.js';
+import { BalanceItem } from './BalanceItem.js';
+import { BalanceItemPayment } from './BalanceItemPayment.js';
+import type { Organization } from './Organization.js';
+import { Payment } from './Payment.js';
+import { Ticket } from './Ticket.js';
+import { Webshop } from './Webshop.js';
+import { WebshopDiscountCode } from './WebshopDiscountCode.js';
 
 export class Order extends QueryableModel {
     static table = 'webshop_orders';
@@ -21,13 +29,13 @@ export class Order extends QueryableModel {
     })
     id!: string;
 
-    @column({ foreignKey: Order.organization, type: 'string' })
+    @column({ type: 'string' })
     organizationId: string;
 
-    @column({ foreignKey: Order.webshop, type: 'string' })
+    @column({ type: 'string' })
     webshopId: string;
 
-    @column({ type: 'string', nullable: true, foreignKey: Order.payment })
+    @column({ type: 'string', nullable: true })
     paymentId: string | null = null;
 
     @column({ type: 'string', nullable: true })
@@ -88,9 +96,9 @@ export class Order extends QueryableModel {
     } })
     timeSlotTime: string | null = null;
 
-    static webshop = new ManyToOneRelation(Webshop, 'webshop');
-    static payment = new ManyToOneRelation(Payment, 'payment');
-    static organization = new ManyToOneRelation(Organization, 'organization');
+    static webshop: ManyToOneRelation<'webshop', Webshop>;
+    static payment: ManyToOneRelation<'payment', Payment>; ;
+    static organization: ManyToOneRelation<'organization', Organization>;
 
     getTransferReplacements(): { [key: string]: string } {
         const base = {
@@ -121,9 +129,9 @@ export class Order extends QueryableModel {
 
     generateBalanceDescription(webshop: Webshop) {
         if (!this.number) {
-            return $t(`df5c326c-e9a3-4f76-ba80-8a22f95f0e70`) + ' ' + webshop.meta.name;
+            return $t(`%x2`) + ' ' + webshop.meta.name;
         }
-        return $t(`12be5ac0-8353-43a2-badb-ab3b27d156b3`) + this.number.toString() + ' - ' + webshop.meta.name;
+        return $t(`%x3`) + this.number.toString() + ' - ' + webshop.meta.name;
     }
 
     /**
@@ -952,7 +960,7 @@ export class Order extends QueryableModel {
                 throw new SimpleError({
                     code: 'missing_iban',
                     message: 'Missing IBAN',
-                    human: $t(`cc8b5066-a7e4-4eae-b556-f56de5d3502c`),
+                    human: $t(`%w2`),
                 });
             }
             payment.generateDescription(organization, this.number.toString(), this.getTransferReplacements());