@stamhoofd/backend 2.119.0 → 2.120.1

package/src/excel-loaders/platform-memberships.ts

@@ -0,0 +1,262 @@
+import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
+import type { LimitedFilteredRequest, PlatformMembership } from '@stamhoofd/structures';
+import { ExcelExportType, PaginatedResponse, Platform } from '@stamhoofd/structures';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { GetPlatformMembershipsEndpoint } from '../endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.js';
+
+// Assign to a typed variable to assure we have correct type checking in place
+const sheet: XlsxTransformerSheet<PlatformMembership> = {
+    id: 'platform-memberships',
+    name: $t('%1EI'),
+    columns: [
+        {
+            id: 'id',
+            name: $t(`%d`),
+            width: 40,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.id,
+            }),
+        },
+        {
+            id: 'type',
+            name: $t('%1LP'),
+            width: 40,
+            getValue: (membership: PlatformMembership) => {
+                const membershipType = Platform.shared.config.membershipTypes.find(m => m.id === membership.membershipTypeId);
+                const value = membershipType ? membershipType.name : '';
+                return {value};
+            },
+        },
+        {
+            id: 'startDate',
+            name: $t('%1Of'),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.startDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'endDate',
+            name: $t('%1P8'),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.endDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'price',
+            name: $t('%1IP'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.price / 1_0000,
+                    style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+                };
+            },
+        },
+        {
+            id: 'priceWithoutDiscount',
+            name:  $t(`%1Nm`),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.priceWithoutDiscount / 1_0000,
+                    style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+                };
+            },
+        },
+        {
+            id: 'trialUntil',
+            name: $t(`%1PU`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.trialUntil,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'freeAmount',
+            name: $t(`%1Oo`),
+            width: 40,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.freeAmount,
+            }),
+        },
+        {
+            id: 'createdAt',
+            name: $t(`%1Jc`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.createdAt,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'expireDate',
+            name: $t(`%1J7`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.expireDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        // balance item
+        {
+            id: 'balanceItem.createdAt',
+            name: $t(`%1OM`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.balanceItem?.createdAt ?? null,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'balanceItem.priceOpen',
+            name: $t('%1Ni'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.priceOpen ? ((membership.balanceItem?.priceOpen ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'balanceItem.pricePaid',
+            name: $t('%1OD'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.pricePaid ? ((membership.balanceItem?.pricePaid ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'balanceItem.pricePending',
+            name: $t('%1OL'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.balanceItem?.pricePending ? ((membership.balanceItem?.pricePending ?? 0) / 1_0000) : null,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+
+        // member
+        {
+            id: 'member.memberNumber',
+            name: $t(`%19j`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.member.memberNumber,
+            }),
+        },
+        {
+            id: 'member.firstName',
+            name: $t(`%1O8`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.member.firstName,
+            }),
+        },
+        {
+            id: 'member.lastName',
+            name: $t(`%1Or`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.member.lastName,
+            }),
+        },
+        // organization
+        {
+            id: 'organization.name',
+            name: $t(`%1PW`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.organization.name,
+            }),
+        },
+        {
+            id: 'organization.uri',
+            name: $t(`%1PZ`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.organization.uri,
+            }),
+        }
+    ],
+};
+
+
+ExportToExcelEndpoint.loaders.set(ExcelExportType.PlatformMemberships, {
+    fetch: async (query: LimitedFilteredRequest) => {
+        const data = await GetPlatformMembershipsEndpoint.buildData(query);
+
+        return new PaginatedResponse({
+            results: data.results,
+            next: data.next,
+        });
+    },
+    sheets: [
+        sheet,
+    ],
+});

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';
@@ -144,7 +146,7 @@ function getBalanceItemColumns(): XlsxTransformerColumn<ReceivableBalanceWithIte
         },
         {
             id: 'pricePending',
-            name: $t(`%wc`),
+            name: $t(`%1PL`),
             width: 20,
             getValue: (object: ReceivableBalanceWithItem) => ({
                 value: object.balanceItem.pricePending / 1_0000,
@@ -250,7 +252,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 16,
             getValue: (object: ReceivableBalance) => ({
                 value: object.object.uri,
@@ -271,7 +273,7 @@ function getGeneralColumns(): XlsxTransformerConcreteColumn<ReceivableBalance>[]
         },
         {
             id: 'amountPending',
-            name: $t(`%wc`),
+            name: $t(`%1PL`),
             width: 18,
             getValue: (object: ReceivableBalance) => ({
                 value: object.amountPending / 1_0000,

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';
@@ -93,7 +95,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'startDate',
-            name: $t(`%7e`),
+            name: $t(`%1Of`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.startDate,
@@ -106,7 +108,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'endDate',
-            name: $t(`%wB`),
+            name: $t(`%1P8`),
             width: 20,
             getValue: (registration: PlatformRegistration) => ({
                 value: registration.endDate,
@@ -132,7 +134,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'organization',
-            name: $t('%5E'),
+            name: $t('%1PI'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
@@ -143,7 +145,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'uri',
-            name: $t('%7C'),
+            name: $t('%1O1'),
             width: 40,
             getValue: (registration: PlatformRegistration) => {
                 const organization = registration.member.family.getOrganization(registration.group.organizationId);
@@ -305,7 +307,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
         },
         {
             id: 'uri',
-            name: $t(`%7C`),
+            name: $t(`%1O1`),
             width: 30,
             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';
@@ -26,7 +29,7 @@ export class AddressValidatorStatic {
             }
 
             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)',
@@ -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();
             }