@stamhoofd/backend 2.118.1 → 2.120.0

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

@@ -1,5 +1,6 @@
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
-import { MemberDetails, MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { MemberDetails} from '@stamhoofd/structures';
+import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 
 /**
  * Returns true when either the firstname, lastname or birthday has changed

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

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, RegisterCode } from '@stamhoofd/models';
 import { RegisterCode as RegisterCodeStruct } from '@stamhoofd/structures';
@@ -36,7 +37,7 @@ export class CheckRegisterCodeEndpoint extends Endpoint<Params, Query, Body, Res
         throw new SimpleError({
             code: 'invalid_code',
             message: 'Invalid code',
-            human: $t(`d46c176d-780c-4484-a510-7fcbe0e31555`),
+            human: $t(`%EC`),
             field: 'registerCode',
         });
     }

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

@@ -1,5 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { Address, Country, CreateOrganization, NewUser, Organization as OrganizationStruct, Version } from '@stamhoofd/structures';
+import { Address, CreateOrganization, NewUser, Organization as OrganizationStruct, Version } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { CreateOrganizationEndpoint } from './CreateOrganizationEndpoint.js';
@@ -29,7 +30,7 @@ describe.skip('Endpoint.CreateOrganization', () => {
         }).encode({ version: Version }));
 
         const response = await testServer.test(endpoint, r);
-        expect(response.body.token).not.toBeEmpty();
+        expect(response.body.token).not.toEqual([]);
     });
 
     test('Creating an organization with an in-use URI throws', async () => {

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

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { AuditLog, EmailVerificationCode, Organization, OrganizationRegistrationPeriod, RegistrationPeriod, User } from '@stamhoofd/models';
 import { AuditLogSource, AuditLogType, CreateOrganization, PermissionLevel, Permissions, RegistrationPeriodSettings, SignupResponse, UserPermissions } from '@stamhoofd/structures';
@@ -32,7 +33,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Not allowed',
-                human: $t(`a010c110-bf4e-4c12-a324-6b84c992e728`),
+                human: $t(`%ED`),
             });
         }
 
@@ -41,7 +42,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Should not be empty',
-                    human: $t(`3f37782a-c07f-457d-994f-f1cc075cff44`),
+                    human: $t(`%Cz`),
                     field: 'organization.name',
                 });
             }
@@ -49,7 +50,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Field is too short',
-                human: $t(`0e82abec-5467-45d8-ba89-9b9fd10c085d`),
+                human: $t(`%D0`),
                 field: 'organization.name',
             });
         }
@@ -60,7 +61,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Field is too long',
-                human: $t(`c4d225ea-8e41-4829-bf0c-bc04755492de`),
+                human: $t(`%D1`),
                 field: 'organization.name',
             });
         }
@@ -70,7 +71,7 @@ export class CreateOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
             throw new SimpleError({
                 code: 'name_taken',
                 message: 'An organization with the same name already exists',
-                human: $t(`19e5262f-9dc1-40d9-b905-bda8462b6046`),
+                human: $t(`%D3`),
                 field: 'name',
             });
         }

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

@@ -1,8 +1,10 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
-import { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { GoogleTranslateHelper } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 type Params = Record<string, never>;

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

@@ -1,8 +1,10 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization } from '@stamhoofd/models';
-import { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 type Params = Record<string, never>;
 

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

@@ -1,8 +1,11 @@
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Organization } from '@stamhoofd/models';
-import { scalarToSQLExpression, SQL, SQLMatch, SQLWhere, SQLWhereLike } from '@stamhoofd/sql';
-import { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { SQLWhere} from '@stamhoofd/sql';
+import { scalarToSQLExpression, SQL, SQLMatch, SQLWhereLike } from '@stamhoofd/sql';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 
 type Params = Record<string, never>;
@@ -33,7 +36,7 @@ export class SearchOrganizationEndpoint extends Endpoint<Params, Query, Body, Re
 
     async handle(request: DecodedRequest<Params, Query, Body>) {
         // Escape query
-        const query = request.query.query.replace(/([-+><()~*"@\s]+)/g, ' ').replace(/[^\w\d]+$/, '').trim();
+        const query = request.query.query.replace(/[-+><()~*"@\s]+/g, ' ').replace(/\W+$/, '').trim();
         if (query.length === 0) {
             // Do not try searching...
             return new Response([]);

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

@@ -1,5 +1,7 @@
-import { AnyDecoder, AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AnyDecoder, AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Organization, StripeAccount, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
 import { isDebouncedError, QueueHandler } from '@stamhoofd/queues';

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

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { User } from '@stamhoofd/models';
 import { OrganizationAdmins } from '@stamhoofd/structures';
 

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

@@ -1,6 +1,7 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Platform } from '@stamhoofd/models';
-import { Platform as PlatformStruct } from '@stamhoofd/structures';
+import type { Platform as PlatformStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
 

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

@@ -1,8 +1,9 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { Organization, OrganizationFactory, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Organization} from '@stamhoofd/models';
+import { OrganizationFactory, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { PermissionLevel, Permissions, PlatformConfig, Platform as PlatformStruct, Version } from '@stamhoofd/structures';
 
-import { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { PatchPlatformEndpoint } from './PatchPlatformEnpoint.js';

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

@@ -1,7 +1,10 @@
-import { AutoEncoderPatchType, Decoder, isPatchableArray, patchObject } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder} from '@simonbackx/simple-encoding';
+import { isPatchableArray, patchObject } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Organization, Platform, RegistrationPeriod } from '@stamhoofd/models';
-import { MemberResponsibility, PlatformConfig, PlatformPremiseType, Platform as PlatformStruct } from '@stamhoofd/structures';
+import type { MemberResponsibility, PlatformConfig, PlatformPremiseType} from '@stamhoofd/structures';
+import { Platform as PlatformStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { QueueHandler } from '@stamhoofd/queues';
@@ -163,7 +166,7 @@ export class PatchPlatformEndpoint extends Endpoint<
                 throw new SimpleError({
                     code: 'cannot_set_locked_period',
                     message: 'Platform period cannot be set to a locked period',
-                    human: $t(`fdd15119-b950-4282-9413-fd6973afde07`),
+                    human: $t(`%EE`),
                 });
             }
             platform.periodId = period.id;

package/src/endpoints/global/platform-memberships/GetPlatformMembershipsCountEndpoint.ts

@@ -0,0 +1,47 @@
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
+import { Context } from '../../../helpers/Context.js';
+import { GetPlatformMembershipsEndpoint } from './GetPlatformMembershipsEndpoint.js';
+
+type Params = Record<string, never>;
+type Query = CountFilteredRequest;
+type Body = undefined;
+type ResponseBody = CountResponse
+
+export class GetPlatformMembershipsCountEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+    queryDecoder = CountFilteredRequest as Decoder<CountFilteredRequest>;
+
+    protected doesMatch(request: Request): [true, Params] | [false] {
+           if (request.method !== 'GET') {
+               return [false];
+           }
+   
+           const params = Endpoint.parseParameters(request.url, '/platform-memberships/count', {});
+   
+           if (params) {
+               return [true, params as Params];
+           }
+           return [false];
+       }
+   
+       async handle(request: DecodedRequest<Params, Query, Body>) {
+           await Context.authenticate();
+
+            if (!Context.auth.hasPlatformFullAccess()) {
+                throw Context.auth.error();
+            }
+                  
+           const query = await GetPlatformMembershipsEndpoint.buildQuery(request.query);
+   
+           const count = await query
+               .count();
+   
+           return new Response(
+               CountResponse.create({
+                   count,
+               }),
+           );
+       }
+}

package/src/endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.ts

@@ -0,0 +1,206 @@
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import { SimpleError } from '@simonbackx/simple-errors';
+import { Member, MemberPlatformMembership, Organization } from '@stamhoofd/models';
+import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse, PlatformMembershiMemberDetails, PlatformMembership, PlatformMembershipOrganizationDetails } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
+import { Context } from '../../../helpers/Context.js';
+import { platformMembershipFilterCompilers } from '../../../sql-filters/platform-memberships.js';
+import { platformMembershipSorters } from '../../../sql-sorters/platform-memberships.js';
+
+type Params = Record<string, never>;
+type Query = LimitedFilteredRequest;
+type Body = undefined;
+type ResponseBody = PaginatedResponse<PlatformMembership[], LimitedFilteredRequest>;
+
+
+const sorters = platformMembershipSorters;
+const filterCompilers = platformMembershipFilterCompilers;
+
+export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+    queryDecoder = LimitedFilteredRequest as Decoder<LimitedFilteredRequest>;
+
+    protected doesMatch(request: Request): [true, Params] | [false] {
+        if (request.method !== 'GET') {
+            return [false];
+        }
+
+        const params = Endpoint.parseParameters(request.url, '/platform-memberships', {});
+
+        if (params) {
+            return [true, params as Params];
+        }
+        return [false];
+    }
+
+    static async buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
+       if (!Context.auth.hasPlatformFullAccess()) {
+           throw Context.auth.error();
+       }
+
+        const query = MemberPlatformMembership.select()
+            .setMaxExecutionTime(15 * 1000)
+            .where('deletedAt', null);
+
+        if (q.filter) {
+            query.where(await compileToSQLFilter(q.filter, filterCompilers));
+        }
+
+        const searchFilter = GetPlatformMembershipsEndpoint.buildSearchFilter(q.search);
+
+        if (searchFilter) {
+            query.where(await compileToSQLFilter(searchFilter, filterCompilers));
+        }
+
+        if (q instanceof LimitedFilteredRequest) {
+            if (q.pageFilter) {
+                query.where(await compileToSQLFilter(q.pageFilter, filterCompilers));
+            }
+
+            q.sort = assertSort(q.sort, [{ key: 'id' }]);
+            applySQLSorter(query, q.sort, sorters);
+            query.limit(q.limit);
+        }
+
+        return query;
+    }
+
+    static buildSearchFilter(search: string | null): StamhoofdFilter | null {
+        if (!search) {
+            return null;
+        }
+
+        // Is member number?
+        if (search.match(/^\d{4}-\d{6}-\d{1,2}$/) || search.match(/^\d{9,10}$/)) {
+            return {
+                member: {
+                        memberNumber: {
+                        $eq: search,
+                    },
+                    
+                }
+            };
+        }
+
+        return {
+                member: {
+                    name: {
+                        $contains: search,
+                    }
+                }
+            };
+    }
+
+    static async buildData(requestQuery: LimitedFilteredRequest) {
+        const query = await GetPlatformMembershipsEndpoint.buildQuery(requestQuery);
+
+        let data: MemberPlatformMembership[];
+
+        try {
+            data = await query.fetch();
+        }
+        catch (error) {
+            if (error.message.includes('ER_QUERY_TIMEOUT')) {
+                throw new SimpleError({
+                    code: 'timeout',
+                    message: 'Query took too long',
+                    human: $t(`%Cv`),
+                });
+            }
+            throw error;
+        }
+
+        const memberIds = Formatter.uniqueArray(data.map(d => d.memberId));
+        const organizationIds = Formatter.uniqueArray(data.map(d => d.organizationId));
+        const members = await Member.getByIDs(...memberIds);
+        const organizations = await Organization.getByIDs(...organizationIds);
+
+        const results: PlatformMembership[] = [];
+
+        for (const model of data) {
+            const member = members.find(m => m.id === model.memberId);
+            if (!member) {
+                throw new SimpleError({
+                    code: 'not_found',
+                    message: 'Member not found',
+                    human: $t(`Het lid dat bij de aansluiting hoort is niet gevonden.`),
+                    statusCode: 404,
+                });
+            }
+
+            const organization = organizations.find(o => o.id === model.organizationId);
+            if (!organization) {
+                throw new SimpleError({
+                    code: 'not_found',
+                    message: 'Organization not found',
+                    human: $t(`De vereniging die bij de aansluiting hoort is niet gevonden.`),
+                    statusCode: 404,
+                });
+            }
+
+            results.push(PlatformMembership.create({
+                ...model,
+                member: PlatformMembershiMemberDetails.create(member),
+                organization: PlatformMembershipOrganizationDetails.create(organization)
+            }));
+        }
+
+        let next: LimitedFilteredRequest | undefined;
+
+        if (results.length >= requestQuery.limit) {
+            const lastObject = results[results.length - 1];
+            const nextFilter = getSortFilter(lastObject, sorters, requestQuery.sort);
+
+            next = new LimitedFilteredRequest({
+                filter: requestQuery.filter,
+                pageFilter: nextFilter,
+                sort: requestQuery.sort,
+                limit: requestQuery.limit,
+                search: requestQuery.search,
+            });
+
+            if (JSON.stringify(nextFilter) === JSON.stringify(requestQuery.pageFilter)) {
+                console.error('Found infinite loading loop for', requestQuery);
+                next = undefined;
+            }
+        }
+
+        return new PaginatedResponse<PlatformMembership[], LimitedFilteredRequest>({
+            results,
+            next,
+        });
+    }
+
+    async handle(request: DecodedRequest<Params, Query, Body>) {
+        await Context.authenticate();
+
+       if (!Context.auth.hasPlatformFullAccess()) {
+           throw Context.auth.error();
+       }
+
+        const maxLimit = 1000;
+
+        if (request.query.limit > maxLimit) {
+            throw new SimpleError({
+                code: 'invalid_field',
+                field: 'limit',
+                message: 'Limit can not be more than ' + maxLimit,
+            });
+        }
+
+        if (request.query.limit < 1) {
+            throw new SimpleError({
+                code: 'invalid_field',
+                field: 'limit',
+                message: 'Limit can not be less than 1',
+            });
+        }
+
+        return new Response(
+            await GetPlatformMembershipsEndpoint.buildData(request.query),
+        );
+    }
+}

package/src/endpoints/global/registration/GetRegistrationsCountEndpoint.ts

@@ -1,5 +1,6 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/registration/GetRegistrationsEndpoint.test.ts

@@ -1,5 +1,6 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { RegistrationPeriod} from '@stamhoofd/models';
+import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EventMeta, GroupType, LimitedFilteredRequest, NamedObject, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';

package/src/endpoints/global/registration/GetRegistrationsEndpoint.ts

@@ -1,11 +1,14 @@
-import { Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Group, Member, Platform, Registration } from '@stamhoofd/models';
-import { SQL, SQLExpression, SQLSelect, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { CountFilteredRequest, GroupType, LimitedFilteredRequest, PaginatedResponse, PermissionLevel, RegistrationWithMemberBlob, StamhoofdFilter, assertSort, RegistrationsBlob } from '@stamhoofd/structures';
+import type { SQLExpression, SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, SQLSelect, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, RegistrationWithMemberBlob, StamhoofdFilter, RegistrationsBlob } from '@stamhoofd/structures';
+import { GroupType, LimitedFilteredRequest, PaginatedResponse, PermissionLevel, assertSort } from '@stamhoofd/structures';
 
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
+import type { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
 import { LimitedFilteredRequestHelper } from '../../../helpers/LimitedFilteredRequestHelper.js';
@@ -135,7 +138,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
                     if (groupIds.length === 0) {
                         throw Context.auth.error({
                             message: 'You must filter on a group of the organization you are trying to access',
-                            human: $t(`94e2d4ff-9b4b-4861-ba42-341ed67b32d8`),
+                            human: $t(`%15g`),
                         });
                     }
 
@@ -205,7 +208,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
                 throw new SimpleError({
                     code: 'timeout',
                     message: 'Query took too long',
-                    human: $t(`dce51638-6129-448b-8a15-e6d778f3a76a`),
+                    human: $t(`%Cv`),
                 });
             }
             throw error;

package/src/endpoints/global/registration/GetUserDetailedPayableBalanceEndpoint.ts

@@ -1,5 +1,7 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { BalanceItem, Member, Organization, Payment } from '@stamhoofd/models';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { Payment } from '@stamhoofd/models';
+import { BalanceItem, Member, Organization } from '@stamhoofd/models';
 import { DetailedPayableBalanceCollection, DetailedPayableBalance } from '@stamhoofd/structures';
 
 import { Formatter } from '@stamhoofd/utility';

package/src/endpoints/global/registration/GetUserDocumentsEndpoint.ts

@@ -1,6 +1,8 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Document, DocumentTemplate, Member } from '@stamhoofd/models';
-import { Document as DocumentStruct, DocumentStatus } from '@stamhoofd/structures';
+import type { Document as DocumentStruct} from '@stamhoofd/structures';
+import { DocumentStatus } from '@stamhoofd/structures';
 import { Sorter } from '@stamhoofd/utility';
 
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/registration/GetUserMembersEndpoint.ts

@@ -1,6 +1,7 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Member } from '@stamhoofd/models';
-import { MembersBlob } from '@stamhoofd/structures';
+import type { MembersBlob } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/global/registration/GetUserPayableBalanceEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CachedBalance, Organization } from '@stamhoofd/models';
 import { PayableBalance, PayableBalanceCollection, ReceivableBalanceType } from '@stamhoofd/structures';
 

package/src/endpoints/global/registration/PatchUserMembersEndpoint.test.ts

@@ -1,8 +1,10 @@
 import { Database } from '@simonbackx/simple-database';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
-import { Endpoint, Request } from '@simonbackx/simple-endpoints';
+import type { Endpoint} from '@simonbackx/simple-endpoints';
+import { Request } from '@simonbackx/simple-endpoints';
 import { GroupFactory, Member, MemberFactory, OrganizationFactory, Platform, RegistrationFactory, Token, UserFactory } from '@stamhoofd/models';
-import { MemberDetails, MemberWithRegistrationsBlob, OrganizationMetaData, OrganizationRecordsConfiguration, Parent, PatchAnswers, PermissionLevel, RecordCategory, RecordSettings, RecordTextAnswer, TranslatedString, UitpasNumberDetails, UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
+import type { PatchAnswers} from '@stamhoofd/structures';
+import { MemberDetails, MemberWithRegistrationsBlob, OrganizationMetaData, OrganizationRecordsConfiguration, Parent, PermissionLevel, RecordCategory, RecordSettings, RecordTextAnswer, TranslatedString, UitpasNumberDetails, UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { initUitpasApi } from '../../../../tests/init/index.js';
@@ -540,7 +542,7 @@ describe('Endpoint.PatchUserMembersEndpoint', () => {
                 expect(result.body.members[0].details.uitpasNumberDetails?.uitpasNumber).toEqual('0900011354819');
                 expect(result.body.members[0].details.uitpasNumberDetails?.socialTariff?.status).toEqual(UitpasSocialTariffStatus.Active);
                 expect(result.body.members[0].details.uitpasNumberDetails?.socialTariff?.updatedAt.getTime()).not.toEqual(new Date(2030, 0, 1).getTime());
-                expect(result.body.members[0].details.uitpasNumberDetails?.socialTariff?.endDate).toBeDate();
+                expect(result.body.members[0].details.uitpasNumberDetails?.socialTariff?.endDate).toBeInstanceOf(Date);
             });
 
             test('Should throw if invalid uitpas number', async () => {