@stamhoofd/backend 2.118.1 → 2.120.0

package/src/endpoints/global/events/GetEventNotificationsEndpoint.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 { EventNotification } from '@stamhoofd/models';
-import { SQL, SQLSortDefinitions, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { AccessRight, CountFilteredRequest, EventNotification as EventNotificationStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, EventNotification as EventNotificationStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import { AccessRight, LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } 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 { eventNotificationsFilterCompilers } from '../../../sql-filters/event-notifications.js';
@@ -142,7 +145,7 @@ export class GetEventNotificationsEndpoint extends Endpoint<Params, Query, Body,
 
         for (const notification of notifications) {
             if (!await Context.auth.canAccessEventNotification(notification)) {
-                throw Context.auth.error($t(`f18f19ca-c56b-49ad-b131-244cbebb6b1f`));
+                throw Context.auth.error($t(`%DT`));
             }
         }
 

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

@@ -1,9 +1,12 @@
-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 { 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 type { SQLSortDefinitions} from '@stamhoofd/sql';
+import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
+import type { CountFilteredRequest, Event as EventStruct, StamhoofdFilter} from '@stamhoofd/structures';
+import { LimitedFilteredRequest, PaginatedResponse, assertSort, getSortFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

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

@@ -1,7 +1,9 @@
 import { PatchableArray, PatchMap, patchObject } 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 { EmailMocker } from '@stamhoofd/email';
-import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { User} from '@stamhoofd/models';
+import { EmailTemplateFactory, EventFactory, EventNotification, EventNotificationFactory, EventNotificationTypeFactory, Organization, OrganizationFactory, Platform, RecordAnswerFactory, RecordCategoryFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, 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.js';

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

@@ -1,5 +1,7 @@
-import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Event, EventNotification, Platform, RegistrationPeriod } from '@stamhoofd/models';
 import { EmailTemplateType, EventNotificationStatus, EventNotification as EventNotificationStruct, PermissionLevel, RecordCategory } from '@stamhoofd/structures';
 
@@ -69,7 +71,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Invalid event',
-                        human: $t(`4275fbbe-9921-454e-852c-9c53a9803f1f`),
+                        human: $t(`%DU`),
                         field: 'events',
                     });
                 }
@@ -87,7 +89,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                         throw new SimpleError({
                             code: 'invalid_period',
                             message: 'No period found for this start date',
-                            human: Context.i18n.$t('5959a6a9-064a-413c-871f-c74a145ed569'),
+                            human: Context.i18n.$t('%8F'),
                             field: 'startDate',
                         });
                     }
@@ -96,7 +98,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                         throw new SimpleError({
                             code: 'invalid_period',
                             message: 'Period is locked',
-                            human: Context.i18n.$t('97616151-90c3-4644-8854-e228c4f355f5'),
+                            human: Context.i18n.$t('%AM'),
                             field: 'startDate',
                         });
                     }
@@ -132,7 +134,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'EventNotification not found',
-                    human: Context.i18n.$t('a0c39573-d44e-4ac0-aaeb-f9062fa1b3ce'),
+                    human: Context.i18n.$t('%AN'),
                 });
             }
 
@@ -150,12 +152,12 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
             if (!await Context.auth.canAccessEventNotification(notification, requiredPermissionLevel)) {
                 // Requires `OrganizationEventNotificationReviewer` access right for the organization
                 if (notification.status === EventNotificationStatus.Pending) {
-                    throw Context.auth.error(Context.i18n.$t('c5dcd14a-868e-4eba-a5dd-409932e44ce9'));
+                    throw Context.auth.error(Context.i18n.$t('%AO'));
                 }
                 if (notification.status === EventNotificationStatus.Accepted) {
-                    throw Context.auth.error(Context.i18n.$t('289e2f29-cdc9-4f44-92de-d7188d6563d7'));
+                    throw Context.auth.error(Context.i18n.$t('%AP'));
                 }
-                throw Context.auth.error(Context.i18n.$t('b47ce42b-ac72-451e-b871-deb07d93b5fa'));
+                throw Context.auth.error(Context.i18n.$t('%AQ'));
             }
 
             const period = await RegistrationPeriod.getByID(notification.periodId);
@@ -163,7 +165,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Period not found',
-                    human: Context.i18n.$t('16a3b696-f8da-4b2b-94b7-49c85ee1c38c'),
+                    human: Context.i18n.$t('%AR'),
                 });
             }
 
@@ -171,7 +173,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                 throw new SimpleError({
                     code: 'invalid_period',
                     message: 'Period is locked',
-                    human: Context.i18n.$t('43cc054d-cf2f-432b-9259-e7764dc929e3'),
+                    human: Context.i18n.$t('%AS'),
                 });
             }
 
@@ -234,7 +236,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'EventNotification not found',
-                    human: Context.i18n.$t('a0c39573-d44e-4ac0-aaeb-f9062fa1b3ce'),
+                    human: Context.i18n.$t('%AN'),
                 });
             }
 
@@ -259,7 +261,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid type',
-                human: Context.i18n.$t('4d8be2b1-559a-4c16-a76f-67a8ba85de7f'),
+                human: Context.i18n.$t('%AT'),
                 field: 'typeId',
             });
         }
@@ -287,7 +289,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid start date',
-                human: Context.i18n.$t('daa3726b-9b63-4f36-b41b-8f25d1b89cf4'),
+                human: Context.i18n.$t('%AU'),
                 field: 'startDate',
             });
         }
@@ -296,7 +298,7 @@ export class PatchEventNotificationsEndpoint extends Endpoint<Params, Query, Bod
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid end date',
-                human: Context.i18n.$t('d326210d-ecc0-421c-b38b-d12ae0209420'),
+                human: Context.i18n.$t('%AV'),
                 field: 'endDate',
             });
         }

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

@@ -1,6 +1,8 @@
 import { PatchableArray } from '@simonbackx/simple-encoding';
-import { Endpoint, Request } from '@simonbackx/simple-endpoints';
-import { EventFactory, Organization, OrganizationFactory, OrganizationRegistrationPeriodFactory, PlatformEventTypeFactory, RegistrationPeriodFactory, Token, User, UserFactory } from '@stamhoofd/models';
+import type { Endpoint} from '@simonbackx/simple-endpoints';
+import { Request } from '@simonbackx/simple-endpoints';
+import type { Organization, User} from '@stamhoofd/models';
+import { EventFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, PlatformEventTypeFactory, RegistrationPeriodFactory, Token, 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.js';

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

@@ -1,5 +1,7 @@
-import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { PatchableArrayDecoder, patchObject, StringDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Event, Group, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, Webshop } from '@stamhoofd/models';
 import { AuditLogSource, Event as EventStruct, Group as GroupStruct, GroupType, NamedObject, PermissionLevel } from '@stamhoofd/structures';
 
@@ -39,7 +41,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw new SimpleError({
                 code: 'invalid_period',
                 message: 'No period found for this start date: ' + Formatter.dateIso(event.startDate),
-                human: Context.i18n.$t('5959a6a9-064a-413c-871f-c74a145ed569'),
+                human: Context.i18n.$t('%8F'),
                 field: 'startDate',
             });
         }
@@ -53,7 +55,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
         }
 
         if (!await Context.auth.canAccessGroupsInPeriod(period.id, putGroup.organizationId)) {
-            throw Context.auth.error($t(`0d47541d-abf2-45b5-a06c-3a85b7fa3994`));
+            throw Context.auth.error($t(`%1HQ`));
         }
 
         if (!group) {
@@ -109,7 +111,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty groups',
-                    human: $t(`93faf169-b78d-4ad2-b13b-3b974267a632`),
+                    human: $t(`%DV`),
                 });
             }
 
@@ -117,7 +119,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty default age groups',
-                    human: $t(`2712befc-5cc5-4013-b8df-ec0861a82c36`),
+                    human: $t(`%DW`),
                 });
             }
 
@@ -125,7 +127,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty organization tag ids',
-                    human: $t(`30230574-2956-4e40-ba11-5523c24c0af8`),
+                    human: $t(`%DX`),
                 });
             }
 
@@ -158,7 +160,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'not_found',
                     message: 'Event not found',
-                    human: $t(`c5f3d2c3-9d7a-473d-ba91-63ce104a2de5`),
+                    human: $t(`%DY`),
                 });
             }
 
@@ -168,7 +170,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Cannot patch organizationCache',
-                    human: $t(`74e6eba6-596c-4e55-b178-b2a5fdbca581`),
+                    human: $t(`%DZ`),
                     field: 'meta.organizationCache',
                 });
             }
@@ -188,7 +190,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty groups',
-                    human: $t(`93faf169-b78d-4ad2-b13b-3b974267a632`),
+                    human: $t(`%DV`),
                 });
             }
 
@@ -196,7 +198,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty default age groups',
-                    human: $t(`2712befc-5cc5-4013-b8df-ec0861a82c36`),
+                    human: $t(`%DW`),
                 });
             }
 
@@ -204,7 +206,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty organization tag ids',
-                    human: $t(`30230574-2956-4e40-ba11-5523c24c0af8`),
+                    human: $t(`%DX`),
                 });
             }
 
@@ -300,7 +302,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                             throw new SimpleError({
                                 code: 'invalid_group',
                                 message: 'Group is not of the same organization',
-                                human: $t('1f64237b-84c4-43e7-b752-2875fd1eb075'),
+                                human: $t('%15c'),
                             });
                         }
                     }
@@ -317,12 +319,12 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                         throw new SimpleError({
                             code: 'not_found',
                             message: 'Webshop not found',
-                            human: $t(`c5f3d2c3-9d7a-473d-ba91-63ce104a2de5`),
+                            human: $t(`%DY`),
                             field: 'webshopId',
                         });
                     }
                     if (!await Context.auth.canAccessWebshop(webshop, PermissionLevel.Read)) {
-                        throw Context.auth.error($t('2ee1d364-8747-430d-8a33-094e01df465e'));
+                        throw Context.auth.error($t('%185'));
                     }
                     event.webshopId = webshop.id;
                 }
@@ -375,7 +377,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid typeId',
-                human: $t(`6b36fc82-d88c-49cc-ae94-4653ad37b3e3`),
+                human: $t(`%Da`),
                 field: 'typeId',
             });
         }
@@ -392,7 +394,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Empty number',
-                    human: $t(`6b72f8bd-cd5b-423f-a556-be102d3c22e9`),
+                    human: $t(`%vQ`),
                     field: 'event_required',
                 });
             }
@@ -404,7 +406,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Name is too short',
-                human: $t(`53a66432-0bf5-4193-9eb8-dbd52d86a1f8`),
+                human: $t(`%Db`),
                 field: 'name',
             });
         }
@@ -413,7 +415,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             throw new SimpleError({
                 code: 'invalid_dates',
                 message: 'End date is before start date',
-                human: $t(`318924c0-7a79-4cfa-b206-ffc27c4d32b7`),
+                human: $t(`%Dc`),
                 field: 'endDate',
             });
         }
@@ -430,9 +432,9 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'minimum_days',
                     message: 'An event with this type has a minimum of ' + type.minimumDays + ' days',
-                    human: $t(`04ff85c0-eb98-46b8-975b-8fd136ddc49a`, {
+                    human: $t(`%14D`, {
                         name: type.name,
-                        days: Formatter.pluralText(type.minimumDays, $t(`a6279389-a070-49c9-a085-bb312555e419`), $t(`fca0ce20-d696-4966-a50c-441f54f046c4`)),
+                        days: Formatter.pluralText(type.minimumDays, $t(`%1N7`), $t(`%1N6`)),
                     }),
                     field: 'startDate',
                 });
@@ -442,9 +444,9 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'maximum_days',
                     message: 'An event with this type has a maximum of ' + type.maximumDays + ' days',
-                    human: $t(`a7d005aa-ceaa-4323-8fac-a02fce174023`, {
+                    human: $t(`%14E`, {
                         name: type.name,
-                        days: Formatter.pluralText(type.maximumDays, $t(`a6279389-a070-49c9-a085-bb312555e419`), $t(`fca0ce20-d696-4966-a50c-441f54f046c4`)),
+                        days: Formatter.pluralText(type.maximumDays, $t(`%1N7`), $t(`%1N6`)),
                     }),
                     field: 'startDate',
                 });
@@ -469,7 +471,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                     throw new SimpleError({
                         code: 'type_maximum_reached',
                         message: 'Maximum number of events with this type reached',
-                        human: $t(`fb7df531-0f89-4841-b685-7b2cfb5b507d`) + ' ' + type.name + ' ' + $t(`073d20dc-88f3-4145-89f5-13cc8ad90207`) + type.maximum + ')',
+                        human: $t(`%Dd`) + ' ' + type.name + ' ' + $t(`%De`) + type.maximum + ')',
                         field: 'typeId',
                     });
                 }
@@ -478,7 +480,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
                 throw new SimpleError({
                     code: 'invalid_period',
                     message: 'No period found for this start date',
-                    human: $t(`7a38bf9d-4df7-4827-85dc-327ffe6cd50a`),
+                    human: $t(`%Df`),
                     field: 'startDate',
                 });
             }
@@ -499,7 +501,7 @@ export class PatchEventsEndpoint extends Endpoint<Params, Query, Body, ResponseB
         const originalGroupType = existingGroup.type;
 
         if (!await Context.auth.canAccessGroup(existingGroup)) {
-            throw Context.auth.error($t(`9cb60490-97be-4d11-beaf-4bdcf8b02d53`));
+            throw Context.auth.error($t(`%1N9`));
         }
 
         if (event.organizationId !== existingGroup.organizationId) {

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

@@ -1,10 +1,13 @@
-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 { ArchiverWriterAdapter, exportToExcel, XlsxTransformerSheet, XlsxWriter } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerSheet} from '@stamhoofd/excel-writer';
+import { ArchiverWriterAdapter, exportToExcel, XlsxWriter } from '@stamhoofd/excel-writer';
 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 type { ExcelExportType, IPaginatedResponse, LimitedFilteredRequest} from '@stamhoofd/structures';
+import { EmailTemplateType, ExcelExportRequest, ExcelExportResponse, Replacement, Version } from '@stamhoofd/structures';
 import { sleep } from '@stamhoofd/utility';
 import { Context } from '../../../helpers/Context.js';
 import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator.js';
@@ -65,7 +68,7 @@ export class ExportToExcelEndpoint extends Endpoint<Params, Query, Body, Respons
             throw new SimpleError({
                 code: 'not_allowed',
                 message: 'Export is pending',
-                human: $t(`a77e6624-bd1f-4374-af5a-d25cc60ee4da`),
+                human: $t(`%Dg`),
                 statusCode: 403,
             });
         }

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

@@ -1,6 +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 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 type { Readable } from 'node:stream';
 import { Context } from '../../../helpers/Context.js';
 import { FileCache } from '../../../helpers/FileCache.js';
 import { Formatter } from '@stamhoofd/utility';

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

@@ -1,5 +1,6 @@
 import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3'; // ES Modules import
-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 { File } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
@@ -7,7 +8,8 @@ import formidable from 'formidable';
 import { promises as fs } from 'fs';
 import { v4 as uuidv4 } from 'uuid';
 
-import { AutoEncoder, BooleanDecoder, Decoder, field } from '@simonbackx/simple-encoding';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, BooleanDecoder, field } from '@simonbackx/simple-encoding';
 import { Context } from '../../../helpers/Context.js';
 import { limiter } from './UploadImage.js';
 import { Image } from '@stamhoofd/models';
@@ -121,7 +123,11 @@ export class UploadFile extends Endpoint<Params, Query, Body, ResponseBody> {
             prefix += '/';
         }
 
-        prefix += (STAMHOOFD.environment ?? 'development') === 'development' ? ('development/') : ('');
+        const envPrefix = STAMHOOFD.environment !== 'production' ? STAMHOOFD.environment : null;
+
+        if (envPrefix && envPrefix !== (STAMHOOFD.SPACES_PREFIX ?? '')) {
+            prefix += envPrefix + '/';
+        }
 
         // Prepend user id to the file path
         if (request.query.isPrivate && user) {
@@ -156,7 +162,7 @@ export class UploadFile extends Endpoint<Params, Query, Body, ResponseBody> {
                 throw new SimpleError({
                     code: 'failed_to_sign',
                     message: 'Failed to sign file',
-                    human: $t('509cdb4f-131a-42a6-b3b1-a63cca231e65'),
+                    human: $t('%B6'),
                     statusCode: 500,
                 });
             }

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

@@ -1,5 +1,7 @@
-import { AutoEncoder, BooleanDecoder, Decoder, field, ObjectData } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, BooleanDecoder, field, ObjectData } 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 { Image, RateLimiter } from '@stamhoofd/models';
 import { Image as ImageStruct, ResolutionRequest } from '@stamhoofd/structures';

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

@@ -1,6 +1,8 @@
 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 type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import { GroupFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { StamhoofdFilter } from '@stamhoofd/structures';
+import { BundleDiscountGroupPriceSettings, GroupPrice, GroupType, LimitedFilteredRequest } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';
 import { initAdmin, initBundleDiscount, initPlatformAdmin } from '../../../../tests/init/index.js';

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

@@ -1,10 +1,13 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { assertSort, CountFilteredRequest, getSortFilter, Group as GroupStruct, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { CountFilteredRequest, Group as GroupStruct, StamhoofdFilter } from '@stamhoofd/structures';
+import { assertSort, getSortFilter, LimitedFilteredRequest, PaginatedResponse } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { 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 type { SQLFilterDefinitions, SQLSortDefinitions } from '@stamhoofd/sql';
+import { applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
 import { groupFilterCompilers } from '../../../sql-filters/groups.js';
@@ -115,7 +118,7 @@ export class GetGroupsEndpoint extends Endpoint<Params, Query, Body, ResponseBod
                 code: 'client_update_required',
                 statusCode: 400,
                 message: 'Er is een noodzakelijke update beschikbaar. Herlaad de pagina en wis indien nodig de cache van jouw browser.',
-                human: $t(`adb0e7c8-aed7-43f5-bfcc-a350f03aaabe`),
+                human: $t(`%G8`),
             });
         }
 

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

@@ -1,7 +1,9 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Member, MemberWithUsersRegistrationsAndGroups } from '@stamhoofd/models';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { MemberWithUsersRegistrationsAndGroups } from '@stamhoofd/models';
+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';
 type Params = { id: string };
@@ -55,7 +57,7 @@ export class GetMemberFamilyEndpoint extends Endpoint<Params, Query, Body, Respo
 
                 // Check access to this member (this will automatically give access to the family)
                 if (!await Context.auth.canAccessMember(member)) {
-                    throw Context.auth.error($t(`c9797487-3e24-4686-9bdc-2a7ec9cee8ed`));
+                    throw Context.auth.error($t(`%Dh`));
                 }
                 validatedMembers.push(member);
                 continue;
@@ -67,7 +69,7 @@ export class GetMemberFamilyEndpoint extends Endpoint<Params, Query, Body, Respo
         }
 
         if (!foundMember) {
-            throw Context.auth.error($t(`c9797487-3e24-4686-9bdc-2a7ec9cee8ed`));
+            throw Context.auth.error($t(`%Dh`));
         }
 
         return new Response(

package/src/endpoints/global/members/GetMembersCountEndpoint.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/members/GetMembersEndpoint.test.ts

@@ -1,5 +1,7 @@
-import { Endpoint, Request } from '@simonbackx/simple-endpoints';
-import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RecordCategoryFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import type { Endpoint} from '@simonbackx/simple-endpoints';
+import { Request } from '@simonbackx/simple-endpoints';
+import type { RegistrationPeriod} from '@stamhoofd/models';
+import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RecordCategoryFactory, RegistrationFactory, 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.js';

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

@@ -1,12 +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 } from '@stamhoofd/models';
 import { SQL, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
-import { CountFilteredRequest, Country, CountryCode, GroupType, LimitedFilteredRequest, MembersBlob, PaginatedResponse, PermissionLevel, StamhoofdFilter, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { CountFilteredRequest, MembersBlob, StamhoofdFilter } from '@stamhoofd/structures';
+import { GroupType, LimitedFilteredRequest, PaginatedResponse, PermissionLevel, assertSort, getSortFilter } from '@stamhoofd/structures';
+import type { CountryCode } from '@stamhoofd/types/Country';
+import { Country } from '@stamhoofd/types/Country';
 import { DataValidator } from '@stamhoofd/utility';
-
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import parsePhoneNumber from 'libphonenumber-js/max';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
@@ -109,7 +111,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                     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(`737f9ff3-8eca-40f5-8f03-d303d53de5d1`),
+                            human: $t(`%15d`),
                         });
                     }
 
@@ -202,7 +204,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
         }
 
         // Is lidnummer?
-        if (!searchFilter && (search.match(/^[0-9]{4}-[0-9]{6}-[0-9]{1,2}$/) || search.match(/^[0-9]{9,10}$/))) {
+        if (!searchFilter && (search.match(/^\d{4}-\d{6}-\d{1,2}$/) || search.match(/^\d{9,10}$/))) {
             searchFilter = {
                 memberNumber: {
                     $eq: search,
@@ -264,7 +266,7 @@ export class GetMembersEndpoint extends Endpoint<Params, Query, Body, ResponseBo
                 throw new SimpleError({
                     code: 'timeout',
                     message: 'Query took too long',
-                    human: $t(`dce51638-6129-448b-8a15-e6d778f3a76a`),
+                    human: $t(`%Cv`),
                 });
             }
             throw error;