@stamhoofd/models 2.118.1 → 2.120.0

package/src/models/Organization.ts

@@ -1,20 +1,22 @@
+import type { GetEmailIdentityCommandOutput } from '@aws-sdk/client-sesv2';
+import { CreateEmailIdentityCommand, DeleteEmailIdentityCommand, GetEmailIdentityCommand, PutEmailIdentityFeedbackAttributesCommand, PutEmailIdentityMailFromAttributesCommand, SESv2Client } from '@aws-sdk/client-sesv2';
 import { column, Database } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { I18n } from '@stamhoofd/backend-i18n';
-import { EmailInterfaceRecipient } from '@stamhoofd/email';
-import { ModelCache, QueryableModel } from '@stamhoofd/sql';
-import { Address, appToUri, Country, DNSRecordStatus, EmailTemplateType, Language, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
-
-import { CreateEmailIdentityCommand, DeleteEmailIdentityCommand, GetEmailIdentityCommand, GetEmailIdentityCommandOutput, PutEmailIdentityFeedbackAttributesCommand, PutEmailIdentityMailFromAttributesCommand, SESv2Client } from '@aws-sdk/client-sesv2';
-
-import { v4 as uuidv4 } from 'uuid';
-
+import { I18n } from '@stamhoofd/backend-i18n/I18n';
+import type { EmailInterfaceRecipient } from '@stamhoofd/email';
 import { QueueHandler } from '@stamhoofd/queues';
+import { QueryableModel, SQL } from '@stamhoofd/sql';
+import type { OrganizationEmail, PrivatePaymentConfiguration } from '@stamhoofd/structures';
+import { Address, appToUri, DNSRecordStatus, EmailTemplateType, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
+import { v4 as uuidv4 } from 'uuid';
 import { validateDNSRecords } from '../helpers/DNSValidator.js';
-import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
 import { OrganizationServerMetaData } from '../structures/OrganizationServerMetaData.js';
-import { OrganizationRegistrationPeriod, StripeAccount } from './index.js';
+import { Group } from './Group.js';
+import { OrganizationRegistrationPeriod } from './OrganizationRegistrationPeriod.js';
+import { StripeAccount } from './StripeAccount.js';
+import { Country } from '@stamhoofd/types/Country';
+import { Language } from '@stamhoofd/types/Language';
 
 export class Organization extends QueryableModel {
     static table = 'organizations';
@@ -201,7 +203,7 @@ export class Organization extends QueryableModel {
             throw new SimpleError({
                 code: 'archived',
                 message: 'This organization is archived',
-                human: $t(`8bd60208-9101-40cf-9f1d-1fd90cdafd62`),
+                human: $t(`%x4`),
             });
         }
         return organization;
@@ -467,15 +469,17 @@ export class Organization extends QueryableModel {
                 to: i18n.localizedDomains.marketing(),
             },
             {
-                from: defaultI18n.$t('59b85264-c4c3-4cf6-8923-9b43282b2787'),
-                to: i18n.$t('59b85264-c4c3-4cf6-8923-9b43282b2787'),
+                from: defaultI18n.$t('%2a'),
+                to: i18n.$t('%2a'),
             },
             {
-                from: defaultI18n.$t('6b3555a2-ace4-4f37-a1fd-18921552f2b5'),
-                to: i18n.$t('6b3555a2-ace4-4f37-a1fd-18921552f2b5'),
+                from: defaultI18n.$t('%19'),
+                to: i18n.$t('%19'),
             },
         ];
 
+        const { sendEmailTemplate } = await import('../helpers/EmailBuilder.js');
+
         // Create e-mail builder
         await sendEmailTemplate(null, {
             replaceAll,
@@ -926,7 +930,7 @@ export class Organization extends QueryableModel {
             throw new SimpleError({
                 code: 'payment_provider_not_configured',
                 message: 'Payment provider not configured for ' + method,
-                human: $t(`9e44e007-3b35-4edf-979f-41b458d2eb39`),
+                human: $t(`%x5`),
             });
         }
 
@@ -969,4 +973,28 @@ export class Organization extends QueryableModel {
 
         return await super.delete();
     }
+
+    /**
+     * Get the number of active members that are currently registered
+     * This is used for billing
+     */
+    static async getActiveMembers(organizationId: string): Promise<number> {
+        const organization = await Organization.getByID(organizationId);
+        if (!organization) {
+            return 0;
+        }
+
+        return await this.select()
+            .join(
+                SQL.join(Group.table)
+                    .where(SQL.column('id'), SQL.parentColumn('groupId')),
+            )
+            .where('periodId', organization.periodId)
+            .where('deactivatedAt', null)
+            .where('registeredAt', '!=', null)
+            .where(SQL.column(Group.table, 'deletedAt'), null)
+            .count(
+                SQL.distinct(SQL.column('memberId')),
+            );
+    }
 }

package/src/models/OrganizationRegistrationPeriod.ts

@@ -3,8 +3,8 @@ import { QueryableModel } from '@stamhoofd/sql';
 import { Group as GroupStruct, OrganizationRegistrationPeriodSettings, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, SetupSteps } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
-import { Group } from './Group.js';
-import { RegistrationPeriod } from './RegistrationPeriod.js';
+import type { Group } from './Group.js';
+import type { RegistrationPeriod } from './RegistrationPeriod.js';
 export class OrganizationRegistrationPeriod extends QueryableModel {
     static table = 'organization_registration_periods';
 

package/src/models/PasswordToken.ts

@@ -1,10 +1,12 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import { I18n } from '@stamhoofd/backend-i18n';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column, Database } from '@simonbackx/simple-database';
+import type {I18n} from '@stamhoofd/backend-i18n';
 import { QueryableModel } from '@stamhoofd/sql';
 import basex from 'base-x';
 import crypto from 'crypto';
 
-import { Organization, User } from './index.js';
+import type {Organization} from './Organization.js';
+import { User } from './User.js';
 import { SimpleError } from '@simonbackx/simple-errors';
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);
@@ -45,10 +47,10 @@ export class PasswordToken extends QueryableModel {
     })
     createdAt: Date;
 
-    @column({ type: 'string', foreignKey: PasswordToken.user })
+    @column({ type: 'string' })
     userId: string;
 
-    static user = new ManyToOneRelation(User, 'user');
+    static user: ManyToOneRelation<'user', User>;
 
     isExpired(): boolean {
         return this.validUntil < new Date();

package/src/models/PayconiqPayment.ts

@@ -1,12 +1,15 @@
 import { column } from '@simonbackx/simple-database';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
-import { PayconiqAccount, PaymentStatus, Version } from '@stamhoofd/structures';
-import { IncomingMessage } from 'http';
+import type { PayconiqAccount} from '@stamhoofd/structures';
+import { PaymentStatus, Version } from '@stamhoofd/structures';
+import type { IncomingMessage } from 'http';
 import https from 'https';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization, Payment } from './index.js';
+import type {Organization} from './Organization.js';
+import type {Payment} from './Payment.js';
+
 import { Formatter } from '@stamhoofd/utility';
 
 export class PayconiqPayment extends QueryableModel {
@@ -151,7 +154,7 @@ export class PayconiqPayment extends QueryableModel {
         if (!apiKey) {
             throw new SimpleError({
                 code: '',
-                message: $t('4a3b54dc-e945-4a15-8b31-b9b4bb483b2a'),
+                message: $t('%GP'),
             });
         }
 
@@ -176,7 +179,7 @@ export class PayconiqPayment extends QueryableModel {
             console.error('Unsupported Payconiq response', response);
             throw new SimpleError({
                 code: '',
-                message: $t('4a3b54dc-e945-4a15-8b31-b9b4bb483b2a'),
+                message: $t('%GP'),
             });
         }
 

package/src/models/Payment.ts

@@ -1,10 +1,13 @@
 import { column } from '@simonbackx/simple-database';
-import { BalanceItemDetailed, BalanceItemPaymentDetailed, PaymentCustomer, PaymentGeneral, PaymentMethod, PaymentProvider, PaymentStatus, Settlement, TransferSettings, BaseOrganization, PaymentType } from '@stamhoofd/structures';
+import type { PaymentMethod, PaymentStatus} from '@stamhoofd/structures';
+import { BalanceItemDetailed, BalanceItemPaymentDetailed, BaseOrganization, PaymentCustomer, PaymentGeneral, PaymentProvider, PaymentType, Settlement, TransferSettings } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
-import { BalanceItem, Organization } from './index.js';
 import { QueryableModel } from '@stamhoofd/sql';
+import type { BalanceItem } from './BalanceItem.js';
+import type { BalanceItemPayment } from './BalanceItemPayment.js';
+import { Organization } from './Organization.js';
 
 export class Payment extends QueryableModel {
     static table = 'payments';
@@ -201,8 +204,8 @@ export class Payment extends QueryableModel {
 
     static getGeneralStructureFromRelations({ payments, balanceItemPayments, balanceItems, payingOrganizations }: {
         payments: Payment[];
-        balanceItemPayments: import('./BalanceItemPayment').BalanceItemPayment[];
-        balanceItems: import('./BalanceItem').BalanceItem[];
+        balanceItemPayments: BalanceItemPayment[];
+        balanceItems: BalanceItem[];
         payingOrganizations: Organization[];
     }, includeSettlements = false): PaymentGeneral[] {
         if (payments.length === 0) {
@@ -274,7 +277,7 @@ export class Payment extends QueryableModel {
         return { payingOrganizations };
     }
 
-    static async loadBalanceItemRelations(balanceItems: import('./BalanceItem').BalanceItem[]) {
+    static async loadBalanceItemRelations(balanceItems: BalanceItem[]) {
         const { Order } = await import('./Order.js');
         const { Member } = await import('./Member.js');
 

package/src/models/Platform.ts

@@ -54,7 +54,7 @@ export class Platform extends QueryableModel {
         throw new SimpleError({
             code: 'only_platform',
             message: 'Period id should only be used if userMode is platform',
-            human: $t(`8a50ee7d-f37e-46cc-9ce7-30c7b37cefe8`),
+            human: $t(`%1AD`),
         });
     }
 

package/src/models/Registration.ts

@@ -1,11 +1,12 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
-import { AppliedRegistrationDiscount, EmailTemplateType, GroupPrice, Recipient, RecordAnswer, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, Replacement, StockReservation } from '@stamhoofd/structures';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
+import type { RecordAnswer} from '@stamhoofd/structures';
+import { AppliedRegistrationDiscount, GroupPrice, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, StockReservation } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { QueryableModel, SQL } from '@stamhoofd/sql';
-import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
-import { Group, Organization } from './index.js';
+import { QueryableModel } from '@stamhoofd/sql';
+import type {Group} from './Group.js';
 
 export class Registration extends QueryableModel {
     static table = 'registrations';
@@ -29,7 +30,7 @@ export class Registration extends QueryableModel {
     @column({ type: 'string' })
     periodId: string;
 
-    @column({ type: 'string', foreignKey: Registration.group })
+    @column({ type: 'string' })
     groupId: string;
 
     @column({ type: 'json', decoder: GroupPrice })
@@ -153,9 +154,9 @@ export class Registration extends QueryableModel {
     @column({ type: 'json', decoder: new MapDecoder(StringDecoder, AppliedRegistrationDiscount) })
     discounts = new Map<string, AppliedRegistrationDiscount>();
 
-    static group: ManyToOneRelation<'group', import('./Group').Group>;
+    static group: ManyToOneRelation<'group', Group>;
 
-    getStructure(this: Registration & { group: import('./Group').Group }) {
+    getStructure(this: Registration & { group: Group }) {
         return RegistrationStructure.create({
             ...this,
             group: this.group.getStructure(),
@@ -163,95 +164,6 @@ export class Registration extends QueryableModel {
         });
     }
 
-    /**
-     * Get the number of active members that are currently registered
-     * This is used for billing
-     */
-    static async getActiveMembers(organizationId: string): Promise<number> {
-        const organization = await Organization.getByID(organizationId);
-        if (!organization) {
-            return 0;
-        }
-
-        return await this.select()
-            .join(
-                SQL.join(Group.table)
-                    .where(SQL.column('id'), SQL.parentColumn('groupId')),
-            )
-            .where('periodId', organization.periodId)
-            .where('deactivatedAt', null)
-            .where('registeredAt', '!=', null)
-            .where(SQL.column(Group.table, 'deletedAt'), null)
-            .count(
-                SQL.distinct(SQL.column('memberId')),
-            );
-    }
-
-    async getRecipients(organization: Organization, group: import('./').Group) {
-        const { Member } = await import('./Member.js');
-
-        const member = await Member.getByIdWithUsers(this.memberId);
-
-        if (!member) {
-            return [];
-        }
-
-        const allowedEmails = member.details.getNotificationEmails();
-
-        return member.users.map(user => Recipient.create({
-            firstName: user.firstName,
-            lastName: user.lastName,
-            email: user.email,
-            userId: user.id,
-            replacements: [
-                Replacement.create({
-                    token: 'firstNameMember',
-                    value: member.details.firstName,
-                }),
-                Replacement.create({
-                    token: 'lastNameMember',
-                    value: member.details.lastName,
-                }),
-                Replacement.create({
-                    token: 'registerUrl',
-                    value: 'https://' + organization.getHost(),
-                }),
-                Replacement.create({
-                    token: 'groupName',
-                    value: group.settings.name.toString(),
-                }),
-            ],
-        })).filter(r => allowedEmails.includes(r.email.toLocaleLowerCase()));
-    }
-
-    async sendEmailTemplate(data: {
-        type: EmailTemplateType;
-    }) {
-        const Group = (await import('./index.js')).Group;
-        const group = await Group.getByID(this.groupId);
-
-        if (!group) {
-            return;
-        }
-
-        const organization = await Organization.getByID(group.organizationId);
-        if (!organization) {
-            return;
-        }
-
-        const recipients = await this.getRecipients(organization, group);
-
-        // Create e-mail builder
-        await sendEmailTemplate(organization, {
-            template: {
-                type: data.type,
-                group,
-            },
-            recipients,
-            type: 'transactional',
-        });
-    }
-
     shouldIncludeStock() {
         return (this.registeredAt !== null && this.deactivatedAt === null) || this.canRegister || (this.reservedUntil && this.reservedUntil > new Date());
     }

package/src/models/STInvoice.ts

@@ -4,7 +4,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { QueryableModel } from '@stamhoofd/sql';
 import { OrganizationPaymentMandate, OrganizationPaymentMandateDetails, STInvoiceMeta } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
-import { Organization } from './index.js';
+import type { Organization } from './Organization.js';
 
 export class STInvoice extends QueryableModel {
     static table = 'stamhoofd_invoices';
@@ -84,9 +84,6 @@ export class STInvoice extends QueryableModel {
     @column({ type: 'boolean' })
     didSendPeppol = false;
 
-    // static organization = new ManyToOneRelation(Organization, 'organization');
-    // static payment = new ManyToOneRelation(Payment, 'payment');
-
     static async getMollieMandates(organization: Organization) {
         // Poll mollie status
         // Mollie payment is required

package/src/models/STPackage.ts

@@ -6,7 +6,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
-import { Organization } from './index.js';
+import { Organization } from './Organization.js';
 
 export class STPackage extends QueryableModel {
     static table = 'stamhoofd_packages';
@@ -102,7 +102,7 @@ export class STPackage extends QueryableModel {
             throw new SimpleError({
                 code: 'not_allowed',
                 message: 'Not allowed',
-                human: $t(`fcb50c02-7510-4e48-bfac-10bb584e3454`),
+                human: $t(`%x7`),
             });
         }
 

package/src/models/STPendingInvoice.ts

@@ -1,9 +1,10 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { STInvoiceMeta } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization } from './index.js';
+import type {Organization} from './Organization.js';
 
 /**
  * Things that should get paid, but are not yet invoiced yet because:
@@ -27,7 +28,7 @@ export class STPendingInvoice extends QueryableModel {
     })
     id!: string;
 
-    @column({ foreignKey: STPendingInvoice.organization, type: 'string', nullable: true })
+    @column({ type: 'string', nullable: true })
     organizationId: string | null;
 
     @column({ type: 'json', decoder: STInvoiceMeta })
@@ -60,5 +61,5 @@ export class STPendingInvoice extends QueryableModel {
     })
     updatedAt: Date;
 
-    static organization = new ManyToOneRelation(Organization, 'organization');
+    static organization: ManyToOneRelation<'organization', Organization>;
 }

package/src/models/Ticket.ts

@@ -1,11 +1,13 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { CartReservedSeat } from '@stamhoofd/structures';
 import basex from 'base-x';
 import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
-
-import { Order, Organization, Webshop } from './index.js';
+import type {Order} from './Order.js';
+import type {Organization} from './Organization.js';
+import type {Webshop} from './Webshop.js';
 
 // Note: 0 and O is removed to prevent typing it in wrong
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZ';
@@ -45,10 +47,10 @@ export class Ticket extends QueryableModel {
     @column({ type: 'string' })
     secret!: string;
 
-    @column({ foreignKey: Ticket.organization, type: 'string' })
+    @column({ type: 'string' })
     organizationId: string;
 
-    @column({ foreignKey: Ticket.webshop, type: 'string' })
+    @column({ type: 'string' })
     webshopId: string;
 
     /**
@@ -57,7 +59,7 @@ export class Ticket extends QueryableModel {
      * The order details should remain private to a ticket holder except for the item details
      * + also the orderID should remain private for the holder (since this provides access via URL, need to add a secret here)
      */
-    @column({ foreignKey: Ticket.order, type: 'string' })
+    @column({ type: 'string' })
     orderId: string;
 
     /**
@@ -121,9 +123,9 @@ export class Ticket extends QueryableModel {
     @column({ type: 'string', nullable: true })
     scannedBy: string | null = null;
 
-    static webshop = new ManyToOneRelation(Webshop, 'webshop');
-    static order = new ManyToOneRelation(Order, 'order');
-    static organization = new ManyToOneRelation(Organization, 'organization');
+    static webshop: ManyToOneRelation<'webshop', Webshop>;
+    static order: ManyToOneRelation<'order', Order>;
+    static organization: ManyToOneRelation<'organization', Organization>;
 
     getUrl(this: Ticket & { webshop: Webshop & { organization: Organization } }) {
         return 'https://' + this.webshop.getHost() + '/ticket/' + this.secret;

package/src/models/Token.test.ts

@@ -2,9 +2,9 @@ import { Database } from '@simonbackx/simple-database';
 
 import { OrganizationFactory } from '../factories/OrganizationFactory.js';
 import { UserFactory } from '../factories/UserFactory.js';
-import { Organization } from './Organization.js';
+import type { Organization } from './Organization.js';
 import { Token } from './Token.js';
-import { User } from './User.js';
+import type { User } from './User.js';
 
 describe('Model.Token', () => {
     const existingToken = 'ABCDEFG';

package/src/models/Token.ts

@@ -1,11 +1,11 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column, Database } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
-import { ApiUser, ApiUserRateLimits } from '@stamhoofd/structures';
+import { ApiUser } from '@stamhoofd/structures';
 import crypto from 'crypto';
 
-import { RateLimiter } from '../helpers/RateLimiter.js';
-import { User } from './index.js';
 import { SimpleError } from '@simonbackx/simple-errors';
+import { User } from './User.js';
 
 export type TokenWithUser = Token & { user: User };
 
@@ -25,7 +25,7 @@ export class Token extends QueryableModel {
     static table = 'tokens';
     static MAX_DEVICES = 15;
 
-    @column({ type: 'string', foreignKey: Token.user })
+    @column({ type: 'string' })
     userId: string;
 
     // Columns
@@ -63,7 +63,7 @@ export class Token extends QueryableModel {
     })
     updatedAt: Date;
 
-    static user = new ManyToOneRelation(User, 'user');
+    static user: ManyToOneRelation<'user', User>;
 
     isAccessTokenExpired(): boolean {
         return this.accessTokenValidUntil < new Date() || this.refreshTokenValidUntil < new Date();

package/src/models/User.ts

@@ -1,13 +1,14 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import { EmailInterfaceRecipient } from '@stamhoofd/email';
-import { ModelCache, QueryableModel, SQL, SQLJSONNull } from '@stamhoofd/sql';
-import { LoginProviderType, NewUser, Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from '@stamhoofd/structures';
+import { column, Database } from '@simonbackx/simple-database';
+import type { EmailInterfaceRecipient } from '@stamhoofd/email';
+import { QueryableModel, SQL, SQLJSONNull } from '@stamhoofd/sql';
+import type { LoginProviderType, NewUser} from '@stamhoofd/structures';
+import { Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from '@stamhoofd/structures';
 import argon2 from 'argon2';
 import { v4 as uuidv4 } from 'uuid';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
-import { Organization } from './index.js';
+import type {Organization} from './Organization.js';
 
 export class User extends QueryableModel {
     static table = 'users';
@@ -21,7 +22,7 @@ export class User extends QueryableModel {
     })
     id!: string;
 
-    @column({ foreignKey: User.organization, type: 'string', nullable: true })
+    @column({ type: 'string', nullable: true })
     organizationId: string | null;
 
     @column({ type: 'string', nullable: true })
@@ -77,8 +78,6 @@ export class User extends QueryableModel {
     })
     updatedAt: Date;
 
-    static organization = new ManyToOneRelation(Organization, 'organization');
-
     get name() {
         if (this.firstName && this.lastName) {
             return this.firstName + ' ' + this.lastName;
@@ -468,7 +467,7 @@ export class User extends QueryableModel {
                 throw new SimpleError({
                     code: 'duplicate_login_provider',
                     message: 'This account is already linked to another account',
-                    human: $t(`d4f1cb82-1e15-421a-8218-37cd3066436c`),
+                    human: $t(`%GQ`),
                     statusCode: 400,
                 });
             }
@@ -479,7 +478,7 @@ export class User extends QueryableModel {
                 throw new SimpleError({
                     code: 'password_based_account',
                     message: 'This user uses a password to login. Log in with the password and link the external account through the settings.',
-                    human: $t(`0154f68a-7458-4b87-91f2-5d04be0737fd`),
+                    human: $t(`%GR`),
                     statusCode: 400,
                 });
             }

package/src/models/UserPermissions.ts

@@ -1,9 +1,10 @@
-import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Permissions } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization, User } from './index.js';
+import type {Organization, User} from './index.js';
 
 export class UserPermissions extends QueryableModel {
     static table = 'user_permissions';
@@ -16,10 +17,10 @@ export class UserPermissions extends QueryableModel {
     })
     id!: string;
 
-    @column({ foreignKey: UserPermissions.organization, type: 'string' })
+    @column({ type: 'string' })
     organizationId: string;
 
-    @column({ foreignKey: UserPermissions.user, type: 'string' })
+    @column({ type: 'string' })
     userId: string;
 
     @column({ type: 'json', decoder: Permissions, nullable: true })
@@ -47,6 +48,6 @@ export class UserPermissions extends QueryableModel {
     })
     updatedAt: Date;
 
-    static organization = new ManyToOneRelation(Organization, 'organization');
-    static user = new ManyToOneRelation(User, 'user');
+    static organization: ManyToOneRelation<'organization', Organization>;
+    static user: ManyToOneRelation<'user', User>;
 }

package/src/models/Webshop.ts

@@ -1,11 +1,11 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
+import type { ManyToOneRelation } from '@simonbackx/simple-database';
+import { column, Database } from '@simonbackx/simple-database';
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Category, DNSRecordStatus, Product, WebshopMetaData, WebshopPrivateMetaData, WebshopServerMetaData } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { validateDNSRecords } from '../helpers/DNSValidator.js';
-
-import { Organization } from './index.js';
+import type {Organization} from './Organization.js';
 
 export class Webshop extends QueryableModel {
     static table = 'webshops';
@@ -18,7 +18,7 @@ export class Webshop extends QueryableModel {
     })
     id!: string;
 
-    @column({ foreignKey: Webshop.organization, type: 'string' })
+    @column({ type: 'string' })
     organizationId: string;
 
     // A custom domain name that is used to host the webshop application (should be unique)
@@ -93,7 +93,7 @@ export class Webshop extends QueryableModel {
     })
     updatedAt: Date;
 
-    static organization = new ManyToOneRelation(Organization, 'organization');
+    static organization: ManyToOneRelation<'organization', Organization>;
 
     // Methods
     static async getByLegacyURI(organizationId: string, uri: string): Promise<Webshop | undefined> {