@stamhoofd/backend 2.115.1 → 2.117.0

package/src/endpoints/global/email/PatchEmailEndpoint.test.ts

@@ -4,15 +4,15 @@ import { Request } from '@simonbackx/simple-endpoints';
 import { Email, EmailRecipient, GroupFactory, MemberFactory, Organization, OrganizationFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EmailRecipientFilter, EmailRecipientFilterType, EmailRecipientSubfilter, EmailStatus, Email as EmailStruct, OrganizationEmail, Parent, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserPermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { PatchEmailEndpoint } from './PatchEmailEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { PatchEmailEndpoint } from './PatchEmailEndpoint.js';
 
 // Import recipient loaders to initialize them
 import { Formatter } from '@stamhoofd/utility';
-import '../../../email-recipient-loaders/members';
-import '../../../email-recipient-loaders/orders';
-import '../../../email-recipient-loaders/receivable-balances';
-import '../../../email-recipient-loaders/registrations';
+import '../../../email-recipient-loaders/members.js';
+import '../../../email-recipient-loaders/orders.js';
+import '../../../email-recipient-loaders/receivable-balances.js';
+import '../../../email-recipient-loaders/registrations.js';
 import { EmailMocker } from '@stamhoofd/email';
 
 const baseUrl = `/v${Version}/email`;

package/src/endpoints/global/email-recipients/GetEmailRecipientsCountEndpoint.ts

@@ -2,8 +2,8 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
-import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint';
+import { Context } from '../../../helpers/Context.js';
+import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = CountFilteredRequest;

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.test.ts

@@ -1,9 +1,9 @@
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint';
+import { GetEmailRecipientsEndpoint } from './GetEmailRecipientsEndpoint.js';
 import { AccessRight, EmailStatus, LimitedFilteredRequest, OrganizationEmail, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
 import { Email, EmailRecipient, Organization, OrganizationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
 import { Request } from '@simonbackx/simple-endpoints';
-import { testServer } from '../../../../tests/helpers/TestServer';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
 
 const baseUrl = `/email-recipients`;
 

package/src/endpoints/global/email-recipients/GetEmailRecipientsEndpoint.ts

@@ -5,10 +5,10 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { EmailRecipient, fillRecipientReplacements } from '@stamhoofd/models';
 import { applySQLSorter, compileToSQLFilter, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
-import { Context } from '../../../helpers/Context';
-import { emailRecipientsFilterCompilers } from '../../../sql-filters/email-recipients';
-import { emailRecipientSorters } from '../../../sql-sorters/email-recipients';
-import { validateEmailRecipientFilter } from './helpers/validateEmailRecipientFilter';
+import { Context } from '../../../helpers/Context.js';
+import { emailRecipientsFilterCompilers } from '../../../sql-filters/email-recipients.js';
+import { emailRecipientSorters } from '../../../sql-sorters/email-recipients.js';
+import { validateEmailRecipientFilter } from './helpers/validateEmailRecipientFilter.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;

package/src/endpoints/global/email-recipients/RetryEmailRecipientEndpoint.ts

@@ -3,7 +3,7 @@ import { Email, EmailRecipient } from '@stamhoofd/models';
 import { EmailRecipient as EmailRecipientStruct, EmailStatus, PermissionLevel } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 
 type Params = { id: string };
 type Query = undefined;

package/src/endpoints/global/email-recipients/helpers/validateEmailRecipientFilter.ts

@@ -1,7 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Email } from '@stamhoofd/models';
 import { FilterWrapperMarker, PermissionLevel, StamhoofdFilter, unwrapFilter, WrapperFilter } from '@stamhoofd/structures';
-import { Context } from '../../../../helpers/Context';
+import { Context } from '../../../../helpers/Context.js';
 
 export async function validateEmailRecipientFilter({ filter, permissionLevel }: { filter: StamhoofdFilter; permissionLevel: PermissionLevel }) {
     // Require presence of a filter

package/src/endpoints/global/events/GetEventNotificationsCountEndpoint.ts

@@ -2,8 +2,8 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
-import { GetEventNotificationsEndpoint } from './GetEventNotificationsEndpoint';
+import { Context } from '../../../helpers/Context.js';
+import { GetEventNotificationsEndpoint } from './GetEventNotificationsEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = CountFilteredRequest;

package/src/endpoints/global/events/GetEventNotificationsEndpoint.ts

@@ -6,10 +6,10 @@ import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@st
 import { AccessRight, CountFilteredRequest, EventNotification as EventNotificationStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { eventNotificationsFilterCompilers } from '../../../sql-filters/event-notifications';
-import { eventNotificationsSorters } from '../../../sql-sorters/event-notifications';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { eventNotificationsFilterCompilers } from '../../../sql-filters/event-notifications.js';
+import { eventNotificationsSorters } from '../../../sql-sorters/event-notifications.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;

package/src/endpoints/global/events/GetEventsEndpoint.ts

@@ -5,10 +5,10 @@ import { Event } from '@stamhoofd/models';
 import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { CountFilteredRequest, Event as EventStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
 
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { eventFilterCompilers } from '../../../sql-filters/events';
-import { eventSorters } from '../../../sql-sorters/events';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { eventFilterCompilers } from '../../../sql-filters/events.js';
+import { eventSorters } from '../../../sql-sorters/events.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;

package/src/endpoints/global/events/PatchEventNotificationsEndpoint.test.ts

@@ -4,8 +4,8 @@ import { EmailMocker } from '@stamhoofd/email';
 import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
 import { AccessRight, BaseOrganization, EmailTemplateType, Event, EventNotificationStatus, EventNotification as EventNotificationStruct, Permissions, PermissionsResourceType, RecordType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { PatchEventNotificationsEndpoint } from './PatchEventNotificationsEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { PatchEventNotificationsEndpoint } from './PatchEventNotificationsEndpoint.js';
 
 const baseUrl = `/event-notifications`;
 const endpoint = new PatchEventNotificationsEndpoint();

package/src/endpoints/global/events/PatchEventNotificationsEndpoint.ts

@@ -4,9 +4,9 @@ import { Event, EventNotification, Platform, RegistrationPeriod } from '@stamhoo
 import { EmailTemplateType, EventNotificationStatus, EventNotification as EventNotificationStruct, PermissionLevel, RecordCategory } from '@stamhoofd/structures';
 
 import { isSimpleError, isSimpleErrors, SimpleError } from '@simonbackx/simple-errors';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { EventNotificationService } from '../../../services/EventNotificationService';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { EventNotificationService } from '../../../services/EventNotificationService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;

package/src/endpoints/global/events/PatchEventsEndpoint.test.ts

@@ -3,8 +3,8 @@ import { Endpoint, Request } from '@simonbackx/simple-endpoints';
 import { EventFactory, Organization, OrganizationFactory, OrganizationRegistrationPeriodFactory, PlatformEventTypeFactory, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
 import { AccessRight, Event, Group, GroupSettings, GroupType, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, TranslatedString } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { PatchEventsEndpoint } from './PatchEventsEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { PatchEventsEndpoint } from './PatchEventsEndpoint.js';
 
 const baseUrl = `/events`;
 const endpoint = new PatchEventsEndpoint();

package/src/endpoints/global/events/PatchEventsEndpoint.ts

@@ -6,10 +6,10 @@ import { AuditLogSource, Event as EventStruct, Group as GroupStruct, GroupType,
 import { SimpleError } from '@simonbackx/simple-errors';
 import { SQL, SQLWhereSign } from '@stamhoofd/sql';
 import { Formatter } from '@stamhoofd/utility';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { AuditLogService } from '../../../services/AuditLogService';
-import { PatchOrganizationRegistrationPeriodsEndpoint } from '../../organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { AuditLogService } from '../../../services/AuditLogService.js';
+import { PatchOrganizationRegistrationPeriodsEndpoint } from '../../organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -450,7 +450,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             }
         }
 
-        if (type.maximum && (!event.existsInDatabase || ('typeId' in (await event.getChangedDatabaseProperties()).fields))) {
+        if (type.maximum && (!event.existsInDatabase || ('typeId' in (event.getChangedDatabaseProperties()).fields))) {
             const currentPeriod = await RegistrationPeriod.getByDate(event.startDate, event.organizationId);
             console.log('event.startDate', event.startDate);
             if (currentPeriod) {

package/src/endpoints/global/files/ExportToExcelEndpoint.ts

@@ -6,9 +6,9 @@ import { Platform, RateLimiter, sendEmailTemplate } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
 import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, ExcelExportType, IPaginatedResponse, LimitedFilteredRequest, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
-import { Context } from '../../../helpers/Context';
-import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator';
-import { FileCache } from '../../../helpers/FileCache';
+import { Context } from '../../../helpers/Context.js';
+import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator.js';
+import { FileCache } from '../../../helpers/FileCache.js';
 
 type Params = { type: string };
 type Query = undefined;
@@ -149,7 +149,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
                 const writer = new XlsxWriter(zipWriterAdapter);
 
                 // Limit to pages of 100
-                request.filter.limit = STAMHOOFD.environment === 'development' ? 1 : 100; // in development, we need to check if total count matches and pagination is working correctly
+                request.filter.limit = STAMHOOFD.environment === 'development' ? 1000 : 100; // in development, we need to check if total count matches and pagination is working correctly
 
                 await exportToExcel({
                     definitions: loader.sheets,

package/src/endpoints/global/files/GetFileCache.ts

@@ -1,8 +1,8 @@
 import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { Readable } from 'node:stream';
-import { Context } from '../../../helpers/Context';
-import { FileCache } from '../../../helpers/FileCache';
+import { Context } from '../../../helpers/Context.js';
+import { FileCache } from '../../../helpers/FileCache.js';
 import { Formatter } from '@stamhoofd/utility';
 import { RateLimiter } from '@stamhoofd/models';
 

package/src/endpoints/global/files/UploadFile.ts

@@ -8,8 +8,8 @@ import { promises as fs } from 'fs';
 import { v4 as uuidv4 } from 'uuid';
 
 import { AutoEncoder, BooleanDecoder, Decoder, field } from '@simonbackx/simple-encoding';
-import { Context } from '../../../helpers/Context';
-import { limiter } from './UploadImage';
+import { Context } from '../../../helpers/Context.js';
+import { limiter } from './UploadImage.js';
 import { Image } from '@stamhoofd/models';
 
 type Params = Record<string, never>;

package/src/endpoints/global/files/UploadImage.ts

@@ -6,7 +6,7 @@ import { Image as ImageStruct, ResolutionRequest } from '@stamhoofd/structures';
 import formidable from 'formidable';
 import { promises as fs } from 'fs';
 
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 class Query extends AutoEncoder {

package/src/endpoints/global/groups/GetGroupsEndpoint.test.ts

@@ -2,9 +2,9 @@ import { Request } from '@simonbackx/simple-endpoints';
 import { GroupFactory, Organization, OrganizationFactory, OrganizationRegistrationPeriodFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { BundleDiscountGroupPriceSettings, GroupPrice, GroupType, LimitedFilteredRequest, StamhoofdFilter } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { initAdmin, initBundleDiscount, initPlatformAdmin } from '../../../../tests/init';
-import { GetGroupsEndpoint } from './GetGroupsEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { initAdmin, initBundleDiscount, initPlatformAdmin } from '../../../../tests/init/index.js';
+import { GetGroupsEndpoint } from './GetGroupsEndpoint.js';
 import { Database } from '@simonbackx/simple-database';
 
 const baseUrl = `/groups`;

package/src/endpoints/global/groups/GetGroupsEndpoint.ts

@@ -5,10 +5,10 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group } from '@stamhoofd/models';
 import { applySQLSorter, compileToSQLFilter, SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { groupFilterCompilers } from '../../../sql-filters/groups';
-import { groupSorters } from '../../../sql-sorters/groups';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { groupFilterCompilers } from '../../../sql-filters/groups.js';
+import { groupSorters } from '../../../sql-sorters/groups.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;

package/src/endpoints/global/members/GetMemberFamilyEndpoint.ts

@@ -1,9 +1,9 @@
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Member, MemberWithRegistrations } from '@stamhoofd/models';
+import { Member, MemberWithUsersRegistrationsAndGroups } from '@stamhoofd/models';
 
 import { MembersBlob } from '@stamhoofd/structures';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
 type Params = { id: string };
 type Query = undefined;
 type Body = undefined;
@@ -47,7 +47,7 @@ export class GetMemberFamilyEndpoint extends Endpoint<Params, Query, Body, Respo
 
         let foundMember = false;
 
-        const validatedMembers: MemberWithRegistrations[] = [];
+        const validatedMembers: MemberWithUsersRegistrationsAndGroups[] = [];
 
         for (const member of members) {
             if (member.id === request.params.id) {

package/src/endpoints/global/members/GetMembersEndpoint.test.ts

@@ -2,9 +2,9 @@ import { Endpoint, Request } from '@simonbackx/simple-endpoints';
 import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RecordCategoryFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EventMeta, GroupType, LimitedFilteredRequest, NamedObject, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, RecordAnswer, RecordTextAnswer, RecordType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { GetMembersEndpoint } from './GetMembersEndpoint';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { initPlatformRecordCategory } from '../../../../tests/init/initPlatformRecordCategory';
+import { GetMembersEndpoint } from './GetMembersEndpoint.js';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { initPlatformRecordCategory } from '../../../../tests/init/initPlatformRecordCategory.js';
 
 const baseUrl = `/members`;
 const endpoint = new GetMembersEndpoint();

package/src/endpoints/global/members/GetMembersEndpoint.ts

@@ -126,10 +126,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             }
         }
 
-        const query = SQL
-            .select(
-                SQL.column('members', 'id'),
-            )
+        const query = Member.select()
             .setMaxExecutionTime(15 * 1000)
             .from(
                 SQL.table('members'),
@@ -257,7 +254,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
     static async buildData(requestQuery: LimitedFilteredRequest, permissionLevel = PermissionLevel.Read) {
         const query = await GetMembersEndpoint.buildQuery(requestQuery, permissionLevel);
-        let data: SQLResultNamespacedRow[];
+        let data: Member[];
 
         try {
             data = await query.fetch();
@@ -273,16 +270,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
             throw error;
         }
 
-        const memberIds = data.map((r) => {
-            if (typeof r.members.id === 'string') {
-                return r.members.id;
-            }
-            throw new Error('Expected string');
-        });
-
-        const _members = await Member.getBlobByIds(...memberIds);
-        // Make sure members is in same order as memberIds
-        const members = memberIds.map(id => _members.find(m => m.id === id)!);
+        const members = await Member.loadRegistrationsAndUsers(data, true);
 
         for (const member of members) {
             if (!await Context.auth.canAccessMember(member, permissionLevel)) {
@@ -293,7 +281,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
 
         let next: LimitedFilteredRequest | undefined;
 
-        if (memberIds.length >= requestQuery.limit) {
+        if (members.length >= requestQuery.limit) {
             const lastObject = members[members.length - 1];
             const nextFilter = getSortFilter(lastObject, sorters, requestQuery.sort);
 

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -2,7 +2,7 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { AutoEncoderPatchType, ConvertArrayToPatchableArray, Decoder, isEmptyPatch, isPatchableArray, PatchableArray, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
+import { AuditLog, BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, MemberWithUsersAndRegistrations, MemberWithUsersRegistrationsAndGroups, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
 import { AuditLogReplacement, AuditLogReplacementType, AuditLogSource, AuditLogType, EmergencyContact, GroupType, MemberDetails, MemberResponsibility, MembersBlob, MemberWithRegistrationsBlob, Parent, PermissionLevel, SetupStepType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -72,7 +72,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             }
         }
 
-        const members: MemberWithRegistrations[] = [];
+        const members: MemberWithUsersRegistrationsAndGroups[] = [];
 
         const platform = await Platform.getShared();
 
@@ -717,7 +717,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
 
         // Loop all members one by one
         for (const id of ids) {
-            const member = await Member.getWithRegistrations(id);
+            const member = await Member.getByIdWithUsersAndRegistrations(id);
             if (!member || !await Context.auth.canDeleteMember(member)) {
                 throw Context.auth.error($t(`39f5696c-3755-429f-b0da-a0ca920ed11e`));
             }
@@ -754,9 +754,10 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         }
     }
 
-    static async mergeDuplicateRelations(member: MemberWithRegistrations, patch: AutoEncoderPatchType<MemberDetails> | MemberDetails) {
-        const _familyMembers = await Member.getFamilyWithRegistrations(member.id);
-        const familyMembers: typeof _familyMembers = [];
+    static async mergeDuplicateRelations(member: Member, patch: AutoEncoderPatchType<MemberDetails> | MemberDetails) {
+        const __familyMembers = await Member.getFamily(member.id);
+        const _familyMembers = await Member.loadRegistrationsAndUsers(__familyMembers);
+        const familyMembers: Member[] = [];
         // Only modify members if we have write access to them (this avoids issues with overriding data)
         for (const member of _familyMembers) {
             if (await Context.auth.canAccessMember(member, PermissionLevel.Write)) {
@@ -901,7 +902,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         }
     }
 
-    static async checkSecurityCode(member: MemberWithRegistrations, securityCode: string | null | undefined, type: 'put' | 'patch') {
+    static async checkSecurityCode(member: MemberWithUsersRegistrationsAndGroups, securityCode: string | null | undefined, type: 'put' | 'patch') {
         if ((type === 'put' && await member.isSafeToMergeDuplicateWithoutSecurityCode()) || await Context.auth.canAccessMember(member, PermissionLevel.Write)) {
             console.log('checkSecurityCode: without security code: allowed for ' + member.id);
         }

package/src/endpoints/global/members/helpers/validateGroupFilter.ts

@@ -1,6 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { FilterWrapperMarker, PermissionLevel, StamhoofdFilter, unwrapFilter, WrapperFilter } from '@stamhoofd/structures';
-import { Context } from '../../../../helpers/Context';
+import { Context } from '../../../../helpers/Context.js';
 
 export async function validateGroupFilter({ filter, permissionLevel, key }: { filter: StamhoofdFilter; permissionLevel: PermissionLevel; key: string | null }) {
     // Require presence of a filter

package/src/endpoints/global/organizations/CreateOrganizationEndpoint.test.ts

@@ -1,8 +1,8 @@
 import { Request } from '@simonbackx/simple-endpoints';
 import { Address, Country, CreateOrganization, NewUser, Organization as OrganizationStruct, Version } from '@stamhoofd/structures';
 
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { CreateOrganizationEndpoint } from './CreateOrganizationEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { CreateOrganizationEndpoint } from './CreateOrganizationEndpoint.js';
 
 describe.skip('Endpoint.CreateOrganization', () => {
     // Test endpoint

package/src/endpoints/global/organizations/CreateOrganizationEndpoint.ts

@@ -1,9 +1,10 @@
 import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { EmailVerificationCode, Organization, RegistrationPeriod, User } from '@stamhoofd/models';
-import { CreateOrganization, PermissionLevel, Permissions, RegistrationPeriodSettings, SignupResponse, UserPermissions } from '@stamhoofd/structures';
+import { AuditLog, EmailVerificationCode, Organization, OrganizationRegistrationPeriod, RegistrationPeriod, User } from '@stamhoofd/models';
+import { AuditLogSource, AuditLogType, CreateOrganization, PermissionLevel, Permissions, RegistrationPeriodSettings, SignupResponse, UserPermissions } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
+import { AuditLogService } from '../../../services/AuditLogService.js';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -85,15 +86,14 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         organization.address = request.body.organization.address;
         organization.privateMeta.acquisitionTypes = request.body.organization.privateMeta?.acquisitionTypes ?? [];
 
-        const period = new RegistrationPeriod();
+        const period = await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+            const period = new RegistrationPeriod();
+            period.configureForNewOrganization();
 
-        // WIP
-        period.settings = RegistrationPeriodSettings.create({});
-        period.startDate = new Date();
-        period.endDate = new Date(Date.now() + 1000 * 60 * 60 * 24 * 31); // 1 month
-
-        await period.save();
-        organization.periodId = period.id;
+            await period.save();
+            organization.periodId = period.id;
+            return period;
+        });
 
         try {
             await organization.save();
@@ -106,8 +106,16 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
                 statusCode: 500,
             });
         }
-        period.organizationId = organization.id;
-        await period.save();
+
+        await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+            period.organizationId = organization.id;
+            await period.save();
+
+            const organizationPeriod = new OrganizationRegistrationPeriod();
+            organizationPeriod.organizationId = organization.id;
+            organizationPeriod.periodId = organization.periodId;
+            await organizationPeriod.save();
+        });
 
         const user = await User.register(
             organization,
@@ -127,6 +135,9 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
         user.permissions.organizationPermissions.set(organization.id, Permissions.create({ level: PermissionLevel.Full }));
         await user.save();
 
+        // Correctly assign creation
+        await AuditLog.update().where('type', AuditLogType.OrganizationAdded).where('objectId', organization.id).set('userId', user.id).set('source', AuditLogSource.User).update();
+
         const code = await EmailVerificationCode.createFor(user, user.email);
         code.send(user, organization, request.i18n).catch(console.error);
 

package/src/endpoints/global/organizations/GetOrganizationFromDomainEndpoint.test.ts

@@ -2,8 +2,8 @@ import { Request } from '@simonbackx/simple-endpoints';
 import { OrganizationFactory } from '@stamhoofd/models';
 import { Organization } from '@stamhoofd/structures';
 
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { GetOrganizationFromDomainEndpoint } from './GetOrganizationFromDomainEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { GetOrganizationFromDomainEndpoint } from './GetOrganizationFromDomainEndpoint.js';
 
 describe('Endpoint.GetOrganizationFromDomain', () => {
     // Test endpoint

package/src/endpoints/global/organizations/GetOrganizationFromDomainEndpoint.ts

@@ -4,7 +4,7 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
 import { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { GoogleTranslateHelper } from '@stamhoofd/utility';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 type Params = Record<string, never>;
 
 class Query extends AutoEncoder {

package/src/endpoints/global/organizations/GetOrganizationFromUriEndpoint.ts

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
 import { Organization as OrganizationStruct } from '@stamhoofd/structures';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 type Params = Record<string, never>;
 
 class Query extends AutoEncoder {

package/src/endpoints/global/organizations/SearchOrganizationEndpoint.test.ts

@@ -3,8 +3,8 @@ import { OrganizationFactory } from '@stamhoofd/models';
 import { v4 as uuidv4 } from 'uuid';
 
 import { Database } from '@simonbackx/simple-database';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { SearchOrganizationEndpoint } from './SearchOrganizationEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { SearchOrganizationEndpoint } from './SearchOrganizationEndpoint.js';
 
 describe('Endpoint.SearchOrganization', () => {
     // Test endpoint

package/src/endpoints/global/organizations/SearchOrganizationEndpoint.ts

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { Organization } from '@stamhoofd/models';
 import { scalarToSQLExpression, SQL, SQLMatch, SQLWhere, SQLWhereLike } from '@stamhoofd/sql';
 import { Organization as OrganizationStruct } from '@stamhoofd/structures';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 
 type Params = Record<string, never>;
 

package/src/endpoints/global/payments/StripeWebhookEndpoint.ts

@@ -4,10 +4,10 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, StripeAccount, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
 import { isDebouncedError, QueueHandler } from '@stamhoofd/queues';
 
-import { StripeHelper } from '../../../helpers/StripeHelper';
-import { PaymentService } from '../../../services/PaymentService';
+import { StripeHelper } from '../../../helpers/StripeHelper.js';
+import { PaymentService } from '../../../services/PaymentService.js';
 import { AuditLog, AuditLogSource } from '@stamhoofd/structures';
-import { AuditLogService } from '../../../services/AuditLogService';
+import { AuditLogService } from '../../../services/AuditLogService.js';
 
 type Params = Record<string, never>;
 class Body extends AutoEncoder {

package/src/endpoints/global/platform/GetPlatformAdminsEndpoint.ts

@@ -2,7 +2,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { User } from '@stamhoofd/models';
 import { OrganizationAdmins } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Query = undefined;

package/src/endpoints/global/platform/GetPlatformEndpoint.test.ts

@@ -3,8 +3,8 @@ import { Token, UserFactory } from '@stamhoofd/models';
 import { PermissionLevel, Permissions, Version } from '@stamhoofd/structures';
 
 import { TestUtils } from '@stamhoofd/test-utils';
-import { testServer } from '../../../../tests/helpers/TestServer';
-import { GetPlatformEndpoint } from './GetPlatformEndpoint';
+import { testServer } from '../../../../tests/helpers/TestServer.js';
+import { GetPlatformEndpoint } from './GetPlatformEndpoint.js';
 
 describe('Endpoint.GetPlatformEndpoint', () => {
     const endpoint = new GetPlatformEndpoint();

package/src/endpoints/global/platform/GetPlatformEndpoint.ts

@@ -2,7 +2,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { Platform } from '@stamhoofd/models';
 import { Platform as PlatformStruct } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
+import { Context } from '../../../helpers/Context.js';
 
 type Params = Record<string, never>;
 type Query = undefined;