@stamhoofd/backend 2.118.1 → 2.120.0

package/src/excel-loaders/receivable-balances.ts

@@ -1,5 +1,7 @@
-import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
-import { BalanceItemRelationType, BalanceItemWithPayments, DetailedReceivableBalance, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemStatusName, getBalanceItemTypeName, getReceivableBalanceTypeName, PaginatedResponse, ReceivableBalance } from '@stamhoofd/structures';
+import type { XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
+import type { BalanceItemWithPayments, DetailedReceivableBalance, ReceivableBalance } from '@stamhoofd/structures';
+import { BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemStatusName, getBalanceItemTypeName, getReceivableBalanceTypeName, PaginatedResponse } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetReceivableBalancesEndpoint } from '../endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.js';
@@ -20,12 +22,12 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.ReceivableBalances, {
     sheets: [
         {
             id: 'receivableBalances',
-            name: $t(`ecacb29b-6be5-4581-a0bd-5c0824b27cb9`),
+            name: $t(`%99`),
             columns: getGeneralColumns(),
         },
         {
             id: 'balanceItems',
-            name: $t(`e023f8a6-a91a-48c0-98fc-863697e1e8c6`),
+            name: $t(`%Mg`),
             transform: (data: DetailedReceivableBalance): ReceivableBalanceWithItem[] => data.balanceItems.map(balanceItem => ({
                 receivableBalance: data,
                 balanceItem,
@@ -53,7 +55,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
     return [
         {
             id: 'id',
-            name: $t(`29360811-3663-496c-8d8f-c9fdf9467a74`),
+            name: $t(`%d`),
             width: 40,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.id,
@@ -66,7 +68,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'type',
-            name: $t(`f97ad8c1-31d2-4b61-9e09-3be86eaeba08`),
+            name: $t(`%1B`),
             width: 30,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: getBalanceItemTypeName(object.balanceItem.type),
@@ -74,7 +76,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'category',
-            name: $t(`c5d24ab8-a87a-481d-a470-23e9386199f3`),
+            name: $t(`%M2`),
             width: 30,
             getValue: (object: ReceivableBalanceWithItem) => {
                 return {
@@ -84,7 +86,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'description',
-            name: $t(`9c4977db-1ce9-424b-92cf-4bbe7f6606fd`),
+            name: $t(`%6o`),
             width: 40,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.description,
@@ -92,7 +94,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'amount',
-            name: $t(`f085f874-242d-47cb-a404-96eab69662ec`),
+            name: $t(`%M4`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.amount,
@@ -105,7 +107,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'unitPrice',
-            name: $t(`7f7fdce2-1fcd-44c9-8c98-856aea11ffc3`),
+            name: $t(`%6q`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.unitPrice / 1_0000,
@@ -118,7 +120,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'price',
-            name: $t(`6f3104d4-9b8f-4946-8434-77202efae9f0`),
+            name: $t(`%1IP`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.priceWithVAT / 1_0000,
@@ -131,7 +133,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'pricePaid',
-            name: $t(`dc9f65e0-19ce-4908-8830-da48235faa70`),
+            name: $t(`%Ml`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.pricePaid / 1_0000,
@@ -144,7 +146,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'pricePending',
-            name: $t(`5c75e9bf-1b64-4d28-a435-6e33247d5170`),
+            name: $t(`%wc`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.pricePending / 1_0000,
@@ -157,7 +159,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'priceOpen',
-            name: $t(`eb0421f4-6ee9-4d81-b549-2bc4e16c4b63`),
+            name: $t(`%76`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.priceOpen / 1_0000,
@@ -170,7 +172,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'createdAt',
-            name: $t(`e5902b28-754d-42cd-b245-f403d03b8c56`),
+            name: $t(`%1JJ`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.createdAt,
@@ -183,7 +185,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'dueAt',
-            name: $t(`3d586760-01f3-42c3-82be-44cea7ad0820`),
+            name: $t(`%wW`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.dueAt,
@@ -196,7 +198,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'status',
-            name: $t(`d7003b29-cc92-4ef4-b07b-f283193ef2ae`),
+            name: $t(`%1A`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: getBalanceItemStatusName(object.balanceItem.status),
@@ -229,7 +231,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
     return [
         {
             id: 'id',
-            name: $t(`333e8879-0e98-4233-bc51-93a5c623c75e`),
+            name: $t(`%wd`),
             width: 40,
             getValue: (object: ReceivableBalance) => ({
                 value: object.id,
@@ -242,7 +244,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'name',
-            name: $t(`b9c7a57e-6dc1-48a2-bcba-a26c5f59555e`),
+            name: $t(`%Mn`),
             width: 40,
             getValue: (object: ReceivableBalance) => ({
                 value: object.object.name,
@@ -250,7 +252,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'uri',
-            name: $t(`27cfaf26-6b88-4ebc-a50a-627a9f0f9e64`),
+            name: $t(`%7C`),
             width: 16,
             getValue: (object: ReceivableBalance) => ({
                 value: object.object.uri,
@@ -258,7 +260,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'amountOpen',
-            name: $t(`eb0421f4-6ee9-4d81-b549-2bc4e16c4b63`),
+            name: $t(`%76`),
             width: 10,
             getValue: (object: ReceivableBalance) => ({
                 value: object.amountOpen / 1_0000,
@@ -271,7 +273,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'amountPending',
-            name: $t(`5c75e9bf-1b64-4d28-a435-6e33247d5170`),
+            name: $t(`%wc`),
             width: 18,
             getValue: (object: ReceivableBalance) => ({
                 value: object.amountPending / 1_0000,
@@ -284,7 +286,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'objectType',
-            name: $t(`a0dfe596-0670-48bc-a5f3-2c9308c70a17`),
+            name: $t(`%1f`),
             width: 10,
             getValue: (object: ReceivableBalance) => ({
                 value: getReceivableBalanceTypeName(object.objectType),

package/src/excel-loaders/registrations.ts

@@ -1,6 +1,8 @@
-import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import { ExcelExportType, getGroupTypeName, LimitedFilteredRequest, PlatformMember, PlatformRegistration, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember} from '@stamhoofd/structures';
+import { ExcelExportType, getGroupTypeName, PlatformRegistration, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
 import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
@@ -11,11 +13,11 @@ import { baseMemberColumns } from './members.js';
 // Assign to a typed variable to assure we have correct type checking in place
 const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
     id: 'registrations',
-    name: $t('938926c1-cb27-427d-aabd-638c5ec1d14a'),
+    name: $t('%1EI'),
     columns: [
         {
             id: 'id',
-            name: $t(`29360811-3663-496c-8d8f-c9fdf9467a74`),
+            name: $t(`%d`),
             width: 40,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.id,
@@ -23,7 +25,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'priceName',
-            name: $t(`dcc53f25-f0e9-4e3e-9f4f-e8cfa4e88755`),
+            name: $t(`%62`),
             width: 30,
             getValue: (registration: PlatformRegistration) => {
                 return {
@@ -33,7 +35,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'price',
-            name: $t(`dcc53f25-f0e9-4e3e-9f4f-e8cfa4e88755`),
+            name: $t(`%62`),
             width: 30,
             getValue: (registration: PlatformRegistration) => {
                 return {
@@ -49,7 +51,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         {
             id: 'toPay',
             width: 30,
-            name: $t(`3a97e6cb-012d-4007-9c54-49d3e5b72909`),
+            name: $t(`%m0`),
             getValue: (registration: PlatformRegistration) => {
                 return {
                     value: registration.balances.reduce((sum, r) => sum + (r.amountOpen + r.amountPending), 0) / 1_0000,
@@ -64,7 +66,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'outstandingBalance',
-            name: $t(`beb45452-dee7-4a7f-956c-e6db06aac20f`),
+            name: $t(`%76`),
             width: 30,
             getValue: (v) => {
                 return {
@@ -80,7 +82,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'registeredAt',
-            name: $t(`8bec8990-4632-40b0-93f3-f27a3f2ddbdb`),
+            name: $t(`%zg`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.registeredAt,
@@ -93,7 +95,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'startDate',
-            name: $t(`bbe0af99-b574-4719-a505-ca2285fa86e4`),
+            name: $t(`%7e`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.startDate,
@@ -106,7 +108,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'endDate',
-            name: $t(`aef10d71-39c4-4cdb-8252-5fd31781abd8`),
+            name: $t(`%wB`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.endDate,
@@ -119,7 +121,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'createdAt',
-            name: $t('63a86cdf-8a76-4e8c-9073-4f0b8970e808'),
+            name: $t('%1IG'),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.member.member.createdAt,
@@ -132,39 +134,39 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'organization',
-            name: $t('2f325358-6e2f-418c-9fea-31a14abbc17a'),
+            name: $t('%5E'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
                 return ({
-                    value: organization?.name ?? $t('836c2cd3-32a3-43f2-b09c-600170fcd9cb'),
+                    value: organization?.name ?? $t('%Gr'),
                 });
             },
         },
         {
             id: 'uri',
-            name: $t('9d283cbb-7ba2-4a16-88ec-ff0c19f39674'),
+            name: $t('%7C'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
                 return ({
-                    value: organization?.uri ?? $t('836c2cd3-32a3-43f2-b09c-600170fcd9cb'),
+                    value: organization?.uri ?? $t('%Gr'),
                 });
             },
         },
         {
             id: 'groupRegistration',
-            name: $t('7289b10e-a284-40ea-bc57-8287c6566a82'),
+            name: $t('%8t'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 let value: string;
 
                 if (registration.payingOrganizationId) {
                     const organization = registration.member.organizations.find(o => o.id === registration.payingOrganizationId);
-                    value = organization ? organization.name : $t(`bd1e59c8-3d4c-4097-ab35-0ce7b20d0e50`);
+                    value = organization ? organization.name : $t(`%Gr`);
                 }
                 else {
-                    value = $t(`b8b730fb-f1a3-4c13-8ec4-0aebe08a1449`);
+                    value = $t(`%18s`);
                 }
 
                 return ({
@@ -174,7 +176,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'trialUntil',
-            name: $t(`1f2e9d09-717b-4c17-9bbe-dce3f3dcbff0`),
+            name: $t(`%1IH`),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 let value: Date | null = null;
@@ -213,7 +215,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
 
                     return [{
                         id: `optionMenu.${menuId}.${optionId}${returnAmount ? '.amount' : ''}`,
-                        name: $t(`d89d7fcd-ecf3-40a2-afb6-f51c3f6c9bc6`),
+                        name: $t(`%wO`),
                         width: 30,
                         getValue: (registration: PlatformRegistration) => {
                             const options = registration.options.filter(o => o.optionMenu.id === menuId && o.option.id === optionId);
@@ -241,7 +243,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
                 return [
                     {
                         id: `optionMenu.${menuId}`,
-                        name: $t(`99e37a95-6a68-4921-a8db-08fb136f87dd`),
+                        name: $t(`%Tb`),
                         width: 30,
                         getValue: (registration: PlatformRegistration) => {
                             const options = registration.options.filter(o => o.optionMenu.id === menuId);
@@ -295,7 +297,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         })),
         {
             id: 'organization',
-            name: $t(`afd7843d-f355-445b-a158-ddacf469a5b1`),
+            name: $t(`%wA`),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 return {
@@ -305,7 +307,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'uri',
-            name: $t(`27cfaf26-6b88-4ebc-a50a-627a9f0f9e64`),
+            name: $t(`%7C`),
             width: 30,
             getValue: (registration: PlatformRegistration) => {
                 return {
@@ -315,7 +317,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'group',
-            name: $t(`0c230001-c3be-4a8e-8eab-23dc3fd96e52`),
+            name: $t(`%wH`),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 return {
@@ -325,7 +327,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'defaultAgeGroup',
-            name: $t(`0ef2bbb3-0b3c-411a-8901-a454cff1f839`),
+            name: $t(`%wI`),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const defaultAgeGroupId = registration.group.defaultAgeGroupId;
@@ -335,13 +337,13 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
                     };
                 }
                 return {
-                    value: PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === defaultAgeGroupId)?.name ?? $t(`6aeee253-beb2-4548-b60e-30836afcf2f0`),
+                    value: PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === defaultAgeGroupId)?.name ?? $t(`%wJ`),
                 };
             },
         },
         {
             id: 'group.type',
-            name: $t('4fda497f-b2d8-43ef-b08c-a3e4e0b472b4'),
+            name: $t('%1LP'),
             width: 20,
             getValue: (registration: PlatformRegistration) => {
                 return {

package/src/helpers/AddressValidator.test.ts

@@ -1,5 +1,6 @@
 import { City, PostalCode, Province } from '@stamhoofd/models';
-import { Address, Country } from '@stamhoofd/structures';
+import { Address } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 
 import { AddressValidator } from './AddressValidator.js';
 

package/src/helpers/AddressValidator.ts

@@ -1,8 +1,11 @@
 import { Database } from '@simonbackx/simple-database';
-import { ArrayDecoder, AutoEncoder, Decoder, field, ObjectData, StringDecoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
+import { ArrayDecoder, AutoEncoder, field, ObjectData, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { City, PostalCode, Street } from '@stamhoofd/models';
-import { Address, Country, ValidatedAddress } from '@stamhoofd/structures';
+import type { Address } from '@stamhoofd/structures';
+import { ValidatedAddress } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import { sleep, StringCompare } from '@stamhoofd/utility';
 import axios from 'axios';
 import { v4 as uuidv4 } from 'uuid';
@@ -20,17 +23,17 @@ export class AddressValidatorStatic {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Invalid postal code format (NL)',
-                    human: $t(`0677422e-58c0-4e6a-9f71-512323d708c5`),
+                    human: $t(`%Fb`),
                     field: 'postalCode',
                 });
             }
 
             const numbers = stripped.slice(0, 4);
-            if (!/[0-9]{4}/.test(numbers)) {
+            if (!/\d{4}/.test(numbers)) {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Invalid postal code format (NL)',
-                    human: $t(`0677422e-58c0-4e6a-9f71-512323d708c5`),
+                    human: $t(`%Fb`),
                     field: 'postalCode',
                 });
             }
@@ -44,7 +47,7 @@ export class AddressValidatorStatic {
 
         if (postalCode.length == 0) {
             const numbers = address.city.substring(0, 4);
-            if (!/[0-9]{4}/.test(numbers)) {
+            if (!/\d{4}/.test(numbers)) {
                 postalCode = numbers;
                 address.city = address.city.substring(4).trim();
             }
@@ -52,7 +55,7 @@ export class AddressValidatorStatic {
                 throw new SimpleError({
                     code: 'invalid_field',
                     message: 'Postal code is required',
-                    human: $t(`3aee5a0a-d30d-4d30-ba6e-ccfd5689d198`),
+                    human: $t(`%Fc`),
                     field: 'postalCode',
                 });
             }
@@ -75,7 +78,7 @@ export class AddressValidatorStatic {
             throw new SimpleError({
                 code: 'invalid_field',
                 message: 'Invalid postal code or city',
-                human: $t(`683fff47-012a-48e6-838c-66c2d13e22a4`),
+                human: $t(`%Fd`),
                 field: 'postalCode',
             });
         }
@@ -129,7 +132,7 @@ export class AddressValidatorStatic {
                         throw new SimpleError({
                             code: 'invalid_field',
                             message: 'Invalid street',
-                            human: $t(`3c20da07-3302-420e-867d-627ae4707e23`),
+                            human: $t(`%Fe`),
                             field: 'street',
                         });
                     }
@@ -137,7 +140,7 @@ export class AddressValidatorStatic {
                     throw new SimpleError({
                         code: 'invalid_field',
                         message: 'Invalid street, do you mean ' + bestStreet.name + '?',
-                        human: $t('f35e3d3a-880e-4703-a018-a24eed53bf64', { street: bestStreet.name }),
+                        human: $t('%Fa', { street: bestStreet.name }),
                         field: 'street',
                     });
                 }