@stamhoofd/models 2.107.1 → 2.107.2

package/src/models/Document.ts

@@ -4,10 +4,10 @@ import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
-import { render } from '../helpers/Handlebars';
-import { RegistrationWithMember } from './Member';
-import { Organization } from './Organization';
-import { Registration } from './Registration';
+import { render } from '../helpers/Handlebars.js';
+import { RegistrationWithMember } from './Member.js';
+import { Organization } from './Organization.js';
+import { Registration } from './Registration.js';
 
 export class Document extends QueryableModel {
     static table = 'documents';
@@ -121,7 +121,7 @@ export class Document extends QueryableModel {
     }
 
     async updateData(): Promise<void> {
-        const DocumentTemplate = (await import('./DocumentTemplate')).DocumentTemplate;
+        const DocumentTemplate = (await import('./DocumentTemplate.js')).DocumentTemplate;
         const template = await DocumentTemplate.getByID(this.templateId);
         if (!template) {
             console.log('No template, skipping update');
@@ -141,7 +141,7 @@ export class Document extends QueryableModel {
             return;
         }
 
-        const Member = (await import('./Member')).Member;
+        const Member = (await import('./Member.js')).Member;
         const [registration] = await Member.getRegistrationWithMembersByIDs([this.registrationId]);
         if (!registration) {
             console.log('No registration when updating document', this.id);
@@ -155,7 +155,7 @@ export class Document extends QueryableModel {
     static async updateForMember(memberId: string) {
         try {
             console.log('Updating documents for member', memberId);
-            const Member = (await import('./Member')).Member;
+            const Member = (await import('./Member.js')).Member;
             const member = await Member.getWithRegistrations(memberId);
             if (member) {
                 const organizationIds = Formatter.uniqueArray(member.registrations.map(r => r.organizationId));
@@ -173,7 +173,7 @@ export class Document extends QueryableModel {
         try {
             console.log('Updating documents for registration', registration.id);
 
-            const DocumentTemplate = (await import('./DocumentTemplate')).DocumentTemplate;
+            const DocumentTemplate = (await import('./DocumentTemplate.js')).DocumentTemplate;
             const templates = await DocumentTemplate.where({ updatesEnabled: 1, organizationId: registration.organizationId });
 
             for (const template of templates) {
@@ -205,11 +205,11 @@ export class Document extends QueryableModel {
         try {
             console.log('Updating documents for updateForRegistrations', registrationIds, organizationId);
 
-            const DocumentTemplate = (await import('./DocumentTemplate')).DocumentTemplate;
+            const DocumentTemplate = (await import('./DocumentTemplate.js')).DocumentTemplate;
             const templates = await DocumentTemplate.where({ updatesEnabled: 1, organizationId });
 
             if (templates.length) {
-                const Member = (await import('./Member')).Member;
+                const Member = (await import('./Member.js')).Member;
                 const registrations = await Member.getRegistrationWithMembersByIDs(registrationIds);
 
                 for (const template of templates) {
@@ -226,11 +226,11 @@ export class Document extends QueryableModel {
         try {
             console.log('Updating documents for group', groupId);
 
-            const DocumentTemplate = (await import('./DocumentTemplate')).DocumentTemplate;
+            const DocumentTemplate = (await import('./DocumentTemplate.js')).DocumentTemplate;
             const templates = await DocumentTemplate.where({ updatesEnabled: 1, organizationId });
 
             if (templates.length) {
-                const Member = (await import('./Member')).Member;
+                const Member = (await import('./Member.js')).Member;
                 const registrations = await Member.getRegistrationWithMembersForGroup(groupId);
 
                 for (const template of templates) {
@@ -245,7 +245,7 @@ export class Document extends QueryableModel {
 
     // Rander handlebars template
     async getRenderedHtml(organization: Organization): Promise<string | null> {
-        const DocumentTemplate = (await import('./DocumentTemplate')).DocumentTemplate;
+        const DocumentTemplate = (await import('./DocumentTemplate.js')).DocumentTemplate;
         const template = await DocumentTemplate.getByID(this.templateId);
         if (!template) {
             return null;

package/src/models/DocumentTemplate.ts

@@ -6,14 +6,14 @@ import { Sorter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
-import { render } from '../helpers/Handlebars';
-import { BalanceItem } from './BalanceItem';
-import { Document } from './Document';
-import { Group } from './Group';
-import { Member, RegistrationWithMember } from './Member';
-import { Organization } from './Organization';
-import { Registration } from './Registration';
-import { User } from './User';
+import { render } from '../helpers/Handlebars.js';
+import { BalanceItem } from './BalanceItem.js';
+import { Document } from './Document.js';
+import { Group } from './Group.js';
+import { Member, RegistrationWithMember } from './Member.js';
+import { Organization } from './Organization.js';
+import { Registration } from './Registration.js';
+import { User } from './User.js';
 
 export class DocumentTemplate extends QueryableModel {
     static table = 'document_templates';

package/src/models/Email.test.ts

@@ -1,12 +1,12 @@
 import { BalanceItemType, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientsStatus, EmailRecipient as EmailRecipientStruct, EmailRecipientSubfilter, EmailStatus, LimitedFilteredRequest, OrganizationMetaData, PaginatedResponse } from '@stamhoofd/structures';
-import { Email } from './Email';
-import { EmailRecipient } from './EmailRecipient';
+import { Email } from './Email.js';
+import { EmailRecipient } from './EmailRecipient.js';
 import { EmailMocker } from '@stamhoofd/email';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { OrganizationFactory } from '../factories/OrganizationFactory';
-import { Platform } from './Platform';
-import { BalanceItemFactory, MemberFactory, UserFactory } from '../factories';
-import { CachedBalance } from './CachedBalance';
+import { OrganizationFactory } from '../factories/OrganizationFactory.js';
+import { Platform } from './Platform.js';
+import { BalanceItemFactory, MemberFactory, UserFactory } from '../factories/index.js';
+import { CachedBalance } from './CachedBalance.js';
 import { Formatter } from '@stamhoofd/utility';
 
 async function buildEmail(data: {

package/src/models/Email.ts

@@ -8,12 +8,12 @@ import { I18n } from '@stamhoofd/backend-i18n';
 import { Email as EmailClass, EmailInterfaceRecipient } from '@stamhoofd/email';
 import { isAbortedError, QueueHandler, QueueHandlerOptions } 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';
-import { EmailRecipient } from './EmailRecipient';
-import { EmailTemplate } from './EmailTemplate';
-import { Organization } from './Organization';
-import { User } from './User';
-import { Platform } from './Platform';
+import { canSendFromEmail, fillRecipientReplacements, getEmailBuilder, mergeReplacementsIfEqual, removeUnusedReplacements, stripRecipientReplacementsForWebDisplay, stripSensitiveRecipientReplacements } from '../helpers/EmailBuilder.js';
+import { EmailRecipient } from './EmailRecipient.js';
+import { EmailTemplate } from './EmailTemplate.js';
+import { Organization } from './Organization.js';
+import { User } from './User.js';
+import { Platform } from './Platform.js';
 
 type Attachment = { filename: string; path?: string; href?: string; content?: string | Buffer; contentType?: string; encoding?: string };
 

package/src/models/EmailRecipient.ts

@@ -6,7 +6,7 @@ import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { SimpleErrors } from '@simonbackx/simple-errors';
 import { Formatter } from '@stamhoofd/utility';
-import { Member } from './Member';
+import { Member } from './Member.js';
 
 export class EmailRecipient extends QueryableModel {
     static table = 'email_recipients';

package/src/models/EmailVerificationCode.ts

@@ -6,8 +6,8 @@ import { EmailTemplateType, Recipient, Replacement } from '@stamhoofd/structures
 import basex from 'base-x';
 import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
-import { sendEmailTemplate } from '../helpers/EmailBuilder';
-import { Platform } from './Platform';
+import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
+import { Platform } from './Platform.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);
@@ -323,7 +323,7 @@ export class EmailVerificationCode extends QueryableModel {
             return;
         }
 
-        const { User } = await import('./User');
+        const { User } = await import('./User.js');
         const user = await User.getByID(verificationCode.userId);
         if (!user) {
             return;

package/src/models/Event.ts

@@ -2,7 +2,7 @@ import { column } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { EventMeta, Event as EventStruct, GroupType, TranslatedString } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
-import { Group } from './Group';
+import { Group } from './Group.js';
 
 export class Event extends QueryableModel {
     static table = 'events';

package/src/models/EventNotification.ts

@@ -3,7 +3,7 @@ import { MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { EventNotificationStatus, RecordAnswer, RecordAnswerDecoder } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
-import { Event } from './Event';
+import { Event } from './Event.js';
 
 export class EventNotification extends QueryableModel {
     static table = 'event_notifications';

package/src/models/Group.ts

@@ -6,7 +6,7 @@ import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
-import { Member, MemberWithRegistrations, OrganizationRegistrationPeriod, Payment, Registration, User } from './';
+import { Member, MemberWithRegistrations, OrganizationRegistrationPeriod, Payment, Registration, User } from './index.js';
 
 if (Member === undefined) {
     throw new Error('Import Member is undefined');

package/src/models/Member.ts

@@ -4,7 +4,7 @@ import { MemberDetails, NationalRegisterNumberOptOut, RegistrationWithTinyMember
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Group, MemberResponsibilityRecord, Payment, Registration, User } from './';
+import { Group, MemberResponsibilityRecord, Payment, Registration, User } from './index.js';
 export type MemberWithUsers = Member & {
     users: User[];
 };
@@ -185,7 +185,7 @@ export class Member extends QueryableModel {
      * Fetch all registrations with members with their corresponding (valid) registrations and payment
      */
     static async getRegistrationWithMembersForPayment(paymentId: string): Promise<RegistrationWithMember[]> {
-        const { BalanceItem, BalanceItemPayment } = await import('./');
+        const { BalanceItem, BalanceItemPayment } = await import('./index.js');
 
         let query = `SELECT ${Member.getDefaultSelect()}, ${Registration.getDefaultSelect()} from \`${Member.table}\`\n`;
 

package/src/models/MemberPlatformMembership.ts

@@ -4,12 +4,12 @@ import { QueryableModel, SQL, SQLWhereSign } from '@stamhoofd/sql';
 import { PlatformMembershipTypeBehaviour } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
-import { BalanceItem } from './BalanceItem';
-import { Member } from './Member';
-import { Organization } from './Organization';
-import { Platform } from './Platform';
-import { Registration } from './Registration';
-import { RegistrationPeriod } from './RegistrationPeriod';
+import { BalanceItem } from './BalanceItem.js';
+import { Member } from './Member.js';
+import { Organization } from './Organization.js';
+import { Platform } from './Platform.js';
+import { Registration } from './Registration.js';
+import { RegistrationPeriod } from './RegistrationPeriod.js';
 
 export class MemberPlatformMembership extends QueryableModel {
     static table = 'member_platform_memberships';

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 './';
+import { Member } from './index.js';
 
 export class MergedMember extends QueryableModel {
     static override table = 'merged_members';

package/src/models/MollieToken.ts

@@ -6,7 +6,7 @@ import { MollieOnboarding, MollieProfile, MollieStatus } from '@stamhoofd/struct
 import { IncomingMessage } from 'http';
 import https from 'https';
 
-import { Organization } from './Organization';
+import { Organization } from './Organization.js';
 
 function sleep(ms: number) {
     return new Promise(resolve => setTimeout(resolve, ms));

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';
+import { Organization } from './Organization.js';
 
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
 const bs58 = basex(ALPHABET);

package/src/models/Order.ts

@@ -6,9 +6,9 @@ import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, Ba
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
-import { sendEmailTemplate } from '../helpers/EmailBuilder';
-import { WebshopCounter } from '../helpers/WebshopCounter';
-import { BalanceItem, BalanceItemPayment, Organization, Payment, Ticket, Webshop, WebshopDiscountCode } from './';
+import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
+import { WebshopCounter } from '../helpers/WebshopCounter.js';
+import { BalanceItem, BalanceItemPayment, Organization, Payment, Ticket, Webshop, WebshopDiscountCode } from './index.js';
 
 export class Order extends QueryableModel {
     static table = 'webshop_orders';
@@ -111,6 +111,7 @@ export class Order extends QueryableModel {
     getUrl(this: Order & { webshop: Webshop & { organization: Organization } }) {
         // Country locales are disabled on webshops (always the same country). But we need to add the language if it isn't the same as the organization default language
         let locale = '';
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
         if (this.data.consumerLanguage !== this.webshop.organization.i18n.language) {
             locale = '/' + this.data.consumerLanguage;
         }

package/src/models/Organization.ts

@@ -11,10 +11,10 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { QueueHandler } from '@stamhoofd/queues';
 import { Formatter } from '@stamhoofd/utility';
-import { validateDNSRecords } from '../helpers/DNSValidator';
-import { sendEmailTemplate } from '../helpers/EmailBuilder';
-import { OrganizationServerMetaData } from '../structures/OrganizationServerMetaData';
-import { OrganizationRegistrationPeriod, StripeAccount } from './';
+import { validateDNSRecords } from '../helpers/DNSValidator.js';
+import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
+import { OrganizationServerMetaData } from '../structures/OrganizationServerMetaData.js';
+import { OrganizationRegistrationPeriod, StripeAccount } from './index.js';
 
 export class Organization extends QueryableModel {
     static table = 'organizations';
@@ -815,7 +815,7 @@ export class Organization extends QueryableModel {
 
     async getAdmins() {
         // Circular reference fix
-        const User = (await import('./User')).User;
+        const User = (await import('./User.js')).User;
         return await User.getAdmins(this.id, { verified: true });
     }
 

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, RegistrationPeriod } from '.';
-
+import { Group } from './Group.js';
+import { RegistrationPeriod } from './RegistrationPeriod.js';
 export class OrganizationRegistrationPeriod extends QueryableModel {
     static table = 'organization_registration_periods';
 

package/src/models/PasswordToken.ts

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

package/src/models/PayconiqPayment.ts

@@ -6,7 +6,7 @@ import { IncomingMessage } from 'http';
 import https from 'https';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization, Payment } from './';
+import { Organization, Payment } from './index.js';
 import { Formatter } from '@stamhoofd/utility';
 
 export class PayconiqPayment extends QueryableModel {

package/src/models/Payment.ts

@@ -3,7 +3,7 @@ import { BalanceItemDetailed, BalanceItemPaymentDetailed, PaymentCustomer, Payme
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
-import { BalanceItem, Organization } from './';
+import { BalanceItem, Organization } from './index.js';
 import { QueryableModel } from '@stamhoofd/sql';
 
 export class Payment extends QueryableModel {
@@ -233,8 +233,8 @@ export class Payment extends QueryableModel {
         if (payments.length === 0) {
             return { balanceItemPayments: [], balanceItems: [] };
         }
-        const { BalanceItemPayment } = await import('./BalanceItemPayment');
-        const { BalanceItem } = await import('./BalanceItem');
+        const { BalanceItemPayment } = await import('./BalanceItemPayment.js');
+        const { BalanceItem } = await import('./BalanceItem.js');
 
         // Load all the related models from the database so we can build the structures
         const balanceItemPayments = await BalanceItemPayment.where({
@@ -261,8 +261,8 @@ export class Payment extends QueryableModel {
     }
 
     static async loadBalanceItemRelations(balanceItems: import('./BalanceItem').BalanceItem[]) {
-        const { Order } = await import('./Order');
-        const { Member } = await import('./Member');
+        const { Order } = await import('./Order.js');
+        const { Member } = await import('./Member.js');
 
         // Load members and orders
         const registrationIds = Formatter.uniqueArray(balanceItems.flatMap(b => b.registrationId ? [b.registrationId] : []));

package/src/models/Platform.test.ts

@@ -1,5 +1,5 @@
 import { PlatformConfig, PlatformMembershipType } from '@stamhoofd/structures';
-import { Platform } from './Platform';
+import { Platform } from './Platform.js';
 import { Database } from '@simonbackx/simple-database';
 
 describe('Model.Platform', () => {

package/src/models/Platform.ts

@@ -5,7 +5,7 @@ import { QueryableModel } from '@stamhoofd/sql';
 import { PlatformConfig, PlatformPrivateConfig, PlatformServerConfig, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { deepFreeze } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
-import { RegistrationPeriod } from './RegistrationPeriod';
+import { RegistrationPeriod } from './RegistrationPeriod.js';
 
 export class Platform extends QueryableModel {
     static table = 'platform';

package/src/models/Registration.ts

@@ -5,8 +5,8 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { sendEmailTemplate } from '../helpers/EmailBuilder';
-import { Group, Organization, OrganizationRegistrationPeriod, User } from './';
+import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
+import { Group, Organization, OrganizationRegistrationPeriod, User } from './index.js';
 
 export class Registration extends QueryableModel {
     static table = 'registrations';
@@ -181,7 +181,7 @@ export class Registration extends QueryableModel {
     }
 
     async getRecipients(organization: Organization, group: import('./').Group) {
-        const { Member } = await import('./Member');
+        const { Member } = await import('./Member.js');
 
         const member = await Member.getWithRegistrations(this.memberId);
 
@@ -220,7 +220,7 @@ export class Registration extends QueryableModel {
     async sendEmailTemplate(data: {
         type: EmailTemplateType;
     }) {
-        const Group = (await import('./')).Group;
+        const Group = (await import('./index.js')).Group;
         const group = await Group.getByID(this.groupId);
 
         if (!group) {
@@ -309,7 +309,7 @@ export class Registration extends QueryableModel {
         let group: Group | undefined | null = null;
 
         if (groupIds.length == 1) {
-            const Group = (await import('./')).Group;
+            const Group = (await import('./index.js')).Group;
             group = await Group.getByID(groupIds[0]);
         }
 

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 './';
+import { Organization } from './index.js';
 
 export class STInvoice extends QueryableModel {
     static table = 'stamhoofd_invoices';

package/src/models/STPackage.ts

@@ -5,9 +5,9 @@ import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
-import { sendEmailTemplate } from '../helpers/EmailBuilder';
-import { GroupBuilder } from '../helpers/GroupBuilder';
-import { Organization } from './';
+import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
+import { GroupBuilder } from '../helpers/GroupBuilder.js';
+import { Organization } from './index.js';
 
 export class STPackage extends QueryableModel {
     static table = 'stamhoofd_packages';

package/src/models/STPendingInvoice.ts

@@ -3,7 +3,7 @@ import { QueryableModel } from '@stamhoofd/sql';
 import { STInvoiceMeta } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization } from './';
+import { Organization } from './index.js';
 
 /**
  * Things that should get paid, but are not yet invoiced yet because:

package/src/models/Ticket.ts

@@ -5,7 +5,7 @@ import basex from 'base-x';
 import crypto from 'crypto';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Order, Organization, Webshop } from './';
+import { Order, Organization, Webshop } from './index.js';
 
 // Note: 0 and O is removed to prevent typing it in wrong
 const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZ';

package/src/models/Token.test.ts

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

package/src/models/Token.ts

@@ -3,8 +3,8 @@ import { QueryableModel } from '@stamhoofd/sql';
 import { ApiUser, ApiUserRateLimits } from '@stamhoofd/structures';
 import crypto from 'crypto';
 
-import { RateLimiter } from '../helpers/RateLimiter';
-import { User } from './';
+import { RateLimiter } from '../helpers/RateLimiter.js';
+import { User } from './index.js';
 import { SimpleError } from '@simonbackx/simple-errors';
 
 export type TokenWithUser = Token & { user: User };

package/src/models/User.ts

@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
-import { Organization } from './';
+import { Organization } from './index.js';
 
 export class User extends QueryableModel {
     static table = 'users';
@@ -213,7 +213,7 @@ export class User extends QueryableModel {
             }
         }
 
-        const Member = (await import('./Member')).Member;
+        const Member = (await import('./Member.js')).Member;
 
         // Delete placeholder account, but migrate members first
         const members = await Member.getMembersWithRegistrationForUser(other);

package/src/models/UserPermissions.ts

@@ -3,7 +3,7 @@ import { QueryableModel } from '@stamhoofd/sql';
 import { Permissions } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Organization, User } from './';
+import { Organization, User } from './index.js';
 
 export class UserPermissions extends QueryableModel {
     static table = 'user_permissions';

package/src/models/Webshop.ts

@@ -3,9 +3,9 @@ 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';
+import { validateDNSRecords } from '../helpers/DNSValidator.js';
 
-import { Organization } from './';
+import { Organization } from './index.js';
 
 export class Webshop extends QueryableModel {
     static table = 'webshops';

package/src/models/addresses/City.ts

@@ -3,7 +3,7 @@ import { Country } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
-import { Province } from './Province';
+import { Province } from './Province.js';
 
 export class City extends QueryableModel {
     static table = 'cities';

package/src/models/addresses/PostalCode.test.ts

@@ -1,8 +1,8 @@
 import { Country } from '@stamhoofd/structures';
 
-import { City } from './City';
-import { PostalCode } from './PostalCode';
-import { Province } from './Province';
+import { City } from './City.js';
+import { PostalCode } from './PostalCode.js';
+import { Province } from './Province.js';
 
 describe('Model.PostalCode', () => {
     let oostVlaanderen!: Province;

package/src/models/addresses/PostalCode.ts

@@ -5,7 +5,7 @@ import { Country } from '@stamhoofd/structures';
 import { Formatter, StringCompare } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 
-import { City } from './City';
+import { City } from './City.js';
 
 export class PostalCode extends QueryableModel {
     static table = 'postal_codes';

package/src/models/addresses/Street.ts

@@ -2,7 +2,7 @@ import { column, ManyToOneRelation } from '@simonbackx/simple-database';
 import { QueryableModel } from '@stamhoofd/sql';
 import { v4 as uuidv4 } from 'uuid';
 
-import { City } from './City';
+import { City } from './City.js';
 
 export class Street extends QueryableModel {
     static table = 'streets';