@stamhoofd/backend 2.119.0 → 2.120.0

package/src/endpoints/organization/dashboard/webshops/PatchWebshopEndpoint.ts

@@ -1,5 +1,6 @@
-import { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, 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 { Webshop } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';
@@ -74,7 +75,7 @@ export class PatchWebshopEndpoint extends Endpoint<Params, Query, Body, Response
 
             if (request.body.domain !== undefined) {
                 if (request.body.domain !== null) {
-                    const cleaned = request.body.domain.toLowerCase().replace(/[^a-zA-Z0-9-.]/g, '');
+                    const cleaned = request.body.domain.toLowerCase().replace(/[^a-z0-9-.]/gi, '');
 
                     if (cleaned !== webshop.domain) {
                         webshop.domain = cleaned;

package/src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.ts

@@ -1,5 +1,7 @@
-import { ArrayDecoder, AutoEncoderPatchType, Data, Decoder, PatchableArray, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Data, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import { ArrayDecoder, PatchableArray, PatchableArrayDecoder, 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 { BalanceItem, BalanceItemPayment, Order, Payment, Webshop, WebshopCounter } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';

package/src/endpoints/organization/dashboard/webshops/PatchWebshopTicketsEndpoint.ts

@@ -1,5 +1,7 @@
-import { ArrayDecoder, AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { AutoEncoderPatchType, Decoder } from '@simonbackx/simple-encoding';
+import { ArrayDecoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
 import { Ticket, Token, Webshop } from '@stamhoofd/models';
 import { PermissionLevel, TicketPrivate } from '@stamhoofd/structures';

package/src/endpoints/organization/dashboard/webshops/SearchUitpasEventsEndpoint.ts

@@ -1,8 +1,10 @@
-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 { UitpasService } from '../../../../services/uitpas/UitpasService.js';
-import { AutoEncoder, Decoder, field, StringDecoder } from '@simonbackx/simple-encoding';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { Context } from '../../../../helpers/Context.js';
-import { UitpasEventsResponse } from '@stamhoofd/structures';
+import type { UitpasEventsResponse } from '@stamhoofd/structures';
 import { SimpleError } from '@simonbackx/simple-errors';
 
 type Params = Record<string, never>;

package/src/endpoints/organization/dashboard/webshops/VerifyWebshopDomainEndpoint.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 { Token, Webshop } from '@stamhoofd/models';
 import { QueueHandler } from '@stamhoofd/queues';

package/src/endpoints/organization/shared/ExchangePaymentEndpoint.ts

@@ -1,8 +1,10 @@
-import { AutoEncoder, BooleanDecoder, Decoder, field } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { Decoder} from '@simonbackx/simple-encoding';
+import { AutoEncoder, BooleanDecoder, field } 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 { Order } from '@stamhoofd/models';
-import { PaymentGeneral } from '@stamhoofd/structures';
+import type { PaymentGeneral } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/organization/shared/GetDocumentHtml.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 { signInternal } from '@stamhoofd/backend-env';
 import { Document, Organization } from '@stamhoofd/models';

package/src/endpoints/organization/shared/GetPaymentEndpoint.ts

@@ -1,7 +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 { SimpleError } from '@simonbackx/simple-errors';
 import { Payment } from '@stamhoofd/models';
-import { PaymentGeneral } from '@stamhoofd/structures';
+import type { PaymentGeneral } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/organization/shared/GetUitpasNumberDetailsEndpoint.ts

@@ -1,7 +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 { UitpasNumberDetails, UitpasNumbersGetDetailsRequest } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { isSimpleError, isSimpleErrors, SimpleError, SimpleErrors } from '@simonbackx/simple-errors';
 import { uitpasApiResponseToSocialTariff } from '../../../helpers/updateMemberDetailsUitpasNumber.js';
 import { UitpasService } from '../../../services/uitpas/UitpasService.js';

package/src/endpoints/organization/shared/auth/GetOrganizationEndpoint.ts

@@ -1,5 +1,6 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { Organization as OrganizationStruct } from '@stamhoofd/structures';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import type { Organization as OrganizationStruct } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../../helpers/Context.js';

package/src/endpoints/organization/webshops/CheckWebshopDiscountCodesEndpoint.ts

@@ -1,8 +1,9 @@
 import { ArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-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 { Webshop, WebshopDiscountCode } from '@stamhoofd/models';
-import { DiscountCode } from '@stamhoofd/structures';
+import type { DiscountCode } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
 

package/src/endpoints/organization/webshops/GetOrderByPaymentEndpoint.ts

@@ -1,9 +1,10 @@
 import { PartialWithoutMethods } from '@simonbackx/simple-encoding';
-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 { Order } from '@stamhoofd/models';
 import { Payment } from '@stamhoofd/models';
-import { Order as OrderStruct } from '@stamhoofd/structures';
+import type { Order as OrderStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
 type Params = { id: string; paymentId: string };

package/src/endpoints/organization/webshops/GetOrderEndpoint.ts

@@ -1,7 +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 { SimpleError } from '@simonbackx/simple-errors';
 import { Order } from '@stamhoofd/models';
-import { Order as OrderStruct } from '@stamhoofd/structures';
+import type { Order as OrderStruct } from '@stamhoofd/structures';
 
 import { Context } from '../../../helpers/Context.js';
 type Params = { id: string; orderId: string };

package/src/endpoints/organization/webshops/GetTicketsEndpoint.ts

@@ -1,5 +1,7 @@
-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 { Order, Ticket } from '@stamhoofd/models';
 import { TicketOrder, TicketPublic } from '@stamhoofd/structures';

package/src/endpoints/organization/webshops/GetWebshopEndpoint.ts

@@ -1,7 +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 { SimpleError } from '@simonbackx/simple-errors';
 import { Webshop } from '@stamhoofd/models';
-import { PrivateWebshop, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import type { PrivateWebshop, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.test.ts

@@ -1,6 +1,10 @@
-import { Request, Response } from '@simonbackx/simple-endpoints';
-import { Organization, OrganizationFactory, StripeAccount, Token, User, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
-import { Address, Cart, CartItem, CartItemOption, Country, Customer, Option, OptionMenu, OrderData, OrderResponse, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
+import type { Response } from '@simonbackx/simple-endpoints';
+import { Request } from '@simonbackx/simple-endpoints';
+import type { Organization, StripeAccount, User} from '@stamhoofd/models';
+import { OrganizationFactory, Token, UserFactory, Webshop, WebshopFactory } from '@stamhoofd/models';
+import type { OrderResponse} from '@stamhoofd/structures';
+import { Address, Cart, CartItem, CartItemOption, Customer, Option, OptionMenu, OrderData, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
+import { Country } from '@stamhoofd/types/Country';
 import sinon from 'sinon';
 
 import { StripeMocker } from '../../../../tests/helpers/StripeMocker.js';

package/src/endpoints/organization/webshops/PlaceOrderEndpoint.ts

@@ -1,6 +1,7 @@
 import { createMollieClient, PaymentMethod as molliePaymentMethod } from '@mollie/api-client';
-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 { Email } from '@stamhoofd/email';
 import { BalanceItem, BalanceItemPayment, MolliePayment, MollieToken, Order, PayconiqPayment, Payment, RateLimiter, Webshop, WebshopDiscountCode } from '@stamhoofd/models';

package/src/endpoints/organization/webshops/RetrieveUitpasSocialTariffPriceEndpoint.ts

@@ -1,8 +1,9 @@
-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 { UitpasPriceCheckRequest, UitpasPriceCheckResponse } from '@stamhoofd/structures';
 
-import { Decoder } from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { Context } from '../../../helpers/Context.js';
 import { UitpasService } from '../../../services/uitpas/UitpasService.js';
 

package/src/endpoints/system/HealthEndpoint.test.ts

@@ -0,0 +1,44 @@
+import { Request } from '@simonbackx/simple-endpoints';
+import { TestUtils } from '@stamhoofd/test-utils';
+import { testServer } from '../../../tests/helpers/TestServer.js';
+import { StartupHealthService } from '../../services/StartupHealthService.js';
+import { HealthEndpoint } from './HealthEndpoint.js';
+
+describe('Endpoint.HealthEndpoint', () => {
+    const endpoint = new HealthEndpoint();
+    const key = 'health-test-key';
+
+    beforeEach(() => {
+        TestUtils.setEnvironment('HEALTH_ACCESS_KEY', key);
+        StartupHealthService.clearForTesting();
+    });
+
+    afterEach(() => {
+        StartupHealthService.clearForTesting();
+    });
+
+    test('Returns 200 when healthy', async () => {
+        const request = Request.get({
+            path: '/health',
+            query: { key },
+        });
+
+        const response = await testServer.test(endpoint, request);
+        expect(response.status).toBe(200);
+        expect(response.body.status).toBe('ok');
+    });
+
+    test('Returns 503 with startup error details', async () => {
+        StartupHealthService.markUnhealthy('MySQL collation mismatch: expected utf8mb4_0900_ai_ci, got collation_connection=utf8mb4_general_ci');
+
+        const request = Request.get({
+            path: '/health',
+            query: { key },
+        });
+
+        const response = await testServer.test(endpoint, request);
+        expect(response.status).toBe(503);
+        expect(response.body.status).toBe('error');
+        expect(response.body.errors).toContain('MySQL collation mismatch: expected utf8mb4_0900_ai_ci, got collation_connection=utf8mb4_general_ci');
+    });
+});

package/src/endpoints/system/HealthEndpoint.ts

@@ -1,7 +1,9 @@
-import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { ArrayDecoder, 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 { CpuService } from '../../services/CpuService.js';
+import { StartupHealthService } from '../../services/StartupHealthService.js';
 
 type Params = Record<string, never>;
 type Body = undefined;
@@ -14,6 +16,9 @@ class Query extends AutoEncoder {
 export class ResponseBody extends AutoEncoder {
     @field({ decoder: StringDecoder })
     status: 'ok' | 'error';
+
+    @field({ decoder: new ArrayDecoder(StringDecoder), optional: true })
+    errors?: string[];
 }
 
 /**
@@ -57,14 +62,17 @@ export class HealthEndpoint extends Endpoint<Params, Query, Body, ResponseBody>
             });
         }
 
-        const health = ResponseBody.create({
-            status: 'ok',
-        });
+        const errors = [...StartupHealthService.getErrors()];
 
         if (CpuService.getAverage(60) > 80) {
-            health.status = 'error';
+            errors.push('CPU usage is too high');
         }
 
+        const health = ResponseBody.create({
+            status: errors.length > 0 ? 'error' : 'ok',
+            errors: errors.length > 0 ? errors : undefined,
+        });
+
         const response = new Response(
             health,
         );

package/src/excel-loaders/balance-items.ts

@@ -1,6 +1,8 @@
-import { XlsxBuiltInNumberFormat, XlsxTransformerColumn } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerColumn } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemRelationType, BalanceItemWithPayments, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentStatus } from '@stamhoofd/structures';
+import type { BalanceItemWithPayments} from '@stamhoofd/structures';
+import { BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentStatus } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetBalanceItemsEndpoint } from '../endpoints/organization/dashboard/balance-items/GetBalanceItemsEndpoint.js';

package/src/excel-loaders/event-notifications.ts

@@ -1,5 +1,7 @@
-import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
-import { EventNotification, EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
+import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
+import type { EventNotification, LimitedFilteredRequest} from '@stamhoofd/structures';
+import { EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';

package/src/excel-loaders/index.ts

@@ -4,3 +4,4 @@ import './organizations.js';
 import './receivable-balances.js';
 import './event-notifications.js';
 import './balance-items.js';
+import './platform-memberships.js';

package/src/excel-loaders/members.ts

@@ -1,6 +1,8 @@
-import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerColumn, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
-import { ExcelExportType, Gender, GroupType, LimitedFilteredRequest, MembershipStatus, PlatformFamily, PlatformMember, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, PlatformMember} from '@stamhoofd/structures';
+import { ExcelExportType, Gender, GroupType, MembershipStatus, PlatformFamily, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint.js';

package/src/excel-loaders/organizations.ts

@@ -1,7 +1,8 @@
 import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
-import { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
-import { ExcelExportType, LimitedFilteredRequest, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct, Premise } from '@stamhoofd/structures';
+import type { LimitedFilteredRequest, Premise } from '@stamhoofd/structures';
+import { ExcelExportType, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, MemberWithRegistrationsBlob, Organization as OrganizationStruct, PaginatedResponse, Platform as PlatformStruct } from '@stamhoofd/structures';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint.js';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';

package/src/excel-loaders/payments.ts

@@ -1,7 +1,9 @@
 import { field } from '@simonbackx/simple-encoding';
-import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import type { XlsxTransformerColumn, XlsxTransformerConcreteColumn } from '@stamhoofd/excel-writer';
+import { XlsxBuiltInNumberFormat } from '@stamhoofd/excel-writer';
 import { StripeAccount } from '@stamhoofd/models';
-import { BalanceItemPaymentDetailed, BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentGeneral, PaymentMethodHelper, PaymentStatusHelper, StripeAccount as StripeAccountStruct } from '@stamhoofd/structures';
+import type { BalanceItemPaymentDetailed} from '@stamhoofd/structures';
+import { BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentGeneral, PaymentMethodHelper, PaymentStatusHelper, StripeAccount as StripeAccountStruct } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
 import { GetPaymentsEndpoint } from '../endpoints/organization/dashboard/payments/GetPaymentsEndpoint.js';

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

@@ -0,0 +1,202 @@
+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('Type'),
+            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('Startdatum'),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.startDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'endDate',
+            name: $t('Einddatum'),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.endDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'price',
+            name: $t('Prijs'),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.price / 1_0000,
+                    style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+                };
+            },
+        },
+        {
+            id: 'priceWithoutDiscount',
+            name:  $t(`Prijs zonder korting`),
+            width: 10,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.priceWithoutDiscount / 1_0000,
+                    style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                    },
+                },
+                };
+            },
+        },
+        {
+            id: 'trialUntil',
+            name: $t(`Einde proefperiode`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.trialUntil,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'freeAmount',
+            name: $t(`Dagen gratis`),
+            width: 40,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.freeAmount,
+            }),
+        },
+        {
+            id: 'createdAt',
+            name: $t(`Aanmaakdatum`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.createdAt,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'expireDate',
+            name: $t(`Vervaldatum`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => {
+                return {
+                    value: membership.expireDate,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.DateSlash,
+                        },
+                    },
+                };
+            },
+        },
+        // member
+        {
+            id: 'member.memberNumber',
+            name: $t(`Lidnummer`),
+            width: 20,
+            getValue: (membership: PlatformMembership) => ({
+                value: membership.member.memberNumber,
+            }),
+        },
+        {
+            id: 'member.firstName',
+            name: $t(`Voornaam lid`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.member.firstName,
+            }),
+        },
+        {
+            id: 'member.lastName',
+            name: $t(`Achternaam lid`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.member.lastName,
+            }),
+        },
+        // organization
+        {
+            id: 'organization.name',
+            name: $t(`Naam vereniging`),
+            width: 20,
+            getValue:(membership: PlatformMembership) => ({
+                value: membership.organization.name,
+            }),
+        },
+        {
+            id: 'organization.uri',
+            name: $t(`Nummer vereniging`),
+            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';

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';

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';