@stamhoofd/backend 2.107.2 → 2.108.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.107.2",
+    "version": "2.108.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -51,14 +51,14 @@
         "@simonbackx/simple-encoding": "2.22.0",
         "@simonbackx/simple-endpoints": "1.20.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.107.2",
-        "@stamhoofd/backend-middleware": "2.107.2",
-        "@stamhoofd/email": "2.107.2",
-        "@stamhoofd/models": "2.107.2",
-        "@stamhoofd/queues": "2.107.2",
-        "@stamhoofd/sql": "2.107.2",
-        "@stamhoofd/structures": "2.107.2",
-        "@stamhoofd/utility": "2.107.2",
+        "@stamhoofd/backend-i18n": "2.108.0",
+        "@stamhoofd/backend-middleware": "2.108.0",
+        "@stamhoofd/email": "2.108.0",
+        "@stamhoofd/models": "2.108.0",
+        "@stamhoofd/queues": "2.108.0",
+        "@stamhoofd/sql": "2.108.0",
+        "@stamhoofd/structures": "2.108.0",
+        "@stamhoofd/utility": "2.108.0",
         "archiver": "^7.0.1",
         "axios": "^1.8.2",
         "cookie": "^0.7.0",
@@ -76,5 +76,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "33deb06a0bac15cc46fe141bc3dcf1dafb6e82a1"
+    "gitHead": "c8dd24207c94a4c077448545cdfcb94369a7ef47"
 }

package/src/endpoints/admin/members/ChargeMembersEndpoint.ts

@@ -4,10 +4,10 @@ import { SimpleError } from '@simonbackx/simple-errors';
 import { ChargeMembersRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';
 
 import { QueueHandler } from '@stamhoofd/queues';
-import { Context } from '../../../helpers/Context';
-import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator';
-import { MemberCharger } from '../../../helpers/MemberCharger';
-import { GetMembersEndpoint } from '../../global/members/GetMembersEndpoint';
+import { Context } from '../../../helpers/Context.js';
+import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator.js';
+import { MemberCharger } from '../../../helpers/MemberCharger.js';
+import { GetMembersEndpoint } from '../../global/members/GetMembersEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;
@@ -31,7 +31,7 @@ export class ChargeMembersEndpoint extends Endpoint<Params, Query, Body, Respons
         return [false];
     }
 
-    private static throwIfInvalidBody(body: Body) {
+    static throwIfInvalidBody(body: Body) {
         if (!body.description?.trim()?.length) {
             throw new SimpleError({
                 code: 'invalid_field',

package/src/endpoints/admin/registrations/ChargeRegistrationsEndpoint.ts

@@ -0,0 +1,87 @@
+import { Decoder } from '@simonbackx/simple-encoding';
+import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import { SimpleError } from '@simonbackx/simple-errors';
+import { ChargeMembersRequest, LimitedFilteredRequest, PermissionLevel } from '@stamhoofd/structures';
+
+import { QueueHandler } from '@stamhoofd/queues';
+import { Context } from '../../../helpers/Context.js';
+import { fetchToAsyncIterator } from '../../../helpers/fetchToAsyncIterator.js';
+import { MemberCharger } from '../../../helpers/MemberCharger.js';
+import { GetRegistrationsEndpoint } from '../../global/registration/GetRegistrationsEndpoint.js';
+import { ChargeMembersEndpoint } from '../members/ChargeMembersEndpoint.js';
+
+type Params = Record<string, never>;
+type Query = LimitedFilteredRequest;
+type Body = ChargeMembersRequest;
+type ResponseBody = undefined;
+
+export class ChargeRegistrationsEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+    queryDecoder = LimitedFilteredRequest as Decoder<LimitedFilteredRequest>;
+    bodyDecoder = ChargeMembersRequest as Decoder<ChargeMembersRequest>;
+
+    protected doesMatch(request: Request): [true, Params] | [false] {
+        if (request.method !== 'POST') {
+            return [false];
+        }
+
+        const params = Endpoint.parseParameters(request.url, '/admin/charge-registrations', {});
+
+        if (params) {
+            return [true, params as Params];
+        }
+        return [false];
+    }
+
+    async handle(request: DecodedRequest<Params, Query, Body>) {
+        const organization = await Context.setOrganizationScope();
+        const body = request.body;
+
+        await Context.authenticate();
+
+        if (!await Context.auth.canManagePayments(organization.id)) {
+            throw Context.auth.error();
+        }
+
+        ChargeMembersEndpoint.throwIfInvalidBody(body);
+
+        const queueId = 'charge-registrations';
+
+        if (QueueHandler.isRunning(queueId)) {
+            throw new SimpleError({
+                code: 'charge_pending',
+                message: 'Charge registrations already pending',
+                human: $t(`d2b84fdd-035b-4307-a897-000081aa814f`),
+            });
+        }
+
+        await QueueHandler.schedule(queueId, async () => {
+            const dataGenerator = fetchToAsyncIterator(request.query, {
+                fetch: request => GetRegistrationsEndpoint.buildData(request, PermissionLevel.Write),
+            });
+
+            const chargedMemberIds = new Set<string>();
+
+            for await (const data of dataGenerator) {
+                for (const registration of data.registrations) {
+                    const memberId = registration.member.id;
+
+                    // only charge members once
+                    if (!chargedMemberIds.has(memberId)) {
+                        chargedMemberIds.add(memberId);
+                        await MemberCharger.charge({
+                            chargingOrganizationId: organization.id,
+                            memberToCharge: registration.member,
+                            price: body.price,
+                            amount: body.amount ?? 1,
+                            description: body.description,
+                            dueAt: body.dueAt,
+                            createdAt: body.createdAt,
+                        });
+                    }
+                }
+            }
+        });
+
+        return new Response(undefined);
+    }
+}

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

@@ -2,8 +2,8 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
-import { GetMembersEndpoint } from './GetMembersEndpoint';
+import { Context } from '../../../helpers/Context.js';
+import { GetMembersEndpoint } from './GetMembersEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = CountFilteredRequest;

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

@@ -2,8 +2,8 @@ import { Decoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 
-import { Context } from '../../../helpers/Context';
-import { GetRegistrationsEndpoint } from './GetRegistrationsEndpoint';
+import { Context } from '../../../helpers/Context.js';
+import { GetRegistrationsEndpoint } from './GetRegistrationsEndpoint.js';
 
 type Params = Record<string, never>;
 type Query = CountFilteredRequest;

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

@@ -8,13 +8,13 @@ import { CountFilteredRequest, GroupType, LimitedFilteredRequest, PaginatedRespo
 import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { RegistrationsBlob } from '@stamhoofd/structures/dist/src/members/RegistrationsBlob';
 import { RegistrationWithMemberBlob } from '@stamhoofd/structures/dist/src/members/RegistrationWithMemberBlob';
-import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
-import { Context } from '../../../helpers/Context';
-import { LimitedFilteredRequestHelper } from '../../../helpers/LimitedFilteredRequestHelper';
-import { groupJoin, registrationFilterCompilers } from '../../../sql-filters/registrations';
-import { registrationSorters } from '../../../sql-sorters/registrations';
-import { GetMembersEndpoint } from '../members/GetMembersEndpoint';
-import { validateGroupFilter } from '../members/helpers/validateGroupFilter';
+import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
+import { Context } from '../../../helpers/Context.js';
+import { LimitedFilteredRequestHelper } from '../../../helpers/LimitedFilteredRequestHelper.js';
+import { groupJoin, registrationFilterCompilers } from '../../../sql-filters/registrations.js';
+import { registrationSorters } from '../../../sql-sorters/registrations.js';
+import { GetMembersEndpoint } from '../members/GetMembersEndpoint.js';
+import { validateGroupFilter } from '../members/helpers/validateGroupFilter.js';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;
@@ -160,6 +160,8 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
             .setMaxExecutionTime(15 * 1000)
             .where('registeredAt', '!=', null);
 
+        query;
+
         if (scopeFilter) {
             query.where(await compileToSQLFilter(scopeFilter, filterCompilers));
         }

package/src/excel-loaders/members.ts

@@ -340,7 +340,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
                                                         },
                                                     }
                                                 : {},
-                                            value: options.length === 1 && returnAmount ? options[0].amount : options.map(option => returnAmount ? option.amount : option).join(', '),
+                                            value: options.map(option => returnAmount ? option.amount : option.option.name).join(', '),
                                         };
                                     },
                                 },

package/src/excel-loaders/registrations.ts

@@ -1,12 +1,12 @@
 import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { Platform } from '@stamhoofd/models';
 import { ExcelExportType, LimitedFilteredRequest, PlatformMember, PlatformRegistration, Platform as PlatformStruct, UnencodeablePaginatedResponse } from '@stamhoofd/structures';
-import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint';
-import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
-import { Context } from '../helpers/Context';
-import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
-import { baseMemberColumns } from './members';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint.js';
+import { GetRegistrationsEndpoint } from '../endpoints/global/registration/GetRegistrationsEndpoint.js';
+import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures.js';
+import { Context } from '../helpers/Context.js';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper.js';
+import { baseMemberColumns } from './members.js';
 
 // Assign to a typed variable to assure we have correct type checking in place
 const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
@@ -22,7 +22,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
             }),
         },
         {
-            id: 'price',
+            id: 'priceName',
             name: $t(`dcc53f25-f0e9-4e3e-9f4f-e8cfa4e88755`),
             width: 30,
             getValue: (registration: PlatformRegistration) => {
@@ -31,6 +31,56 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
                 };
             },
         },
+        {
+            id: 'price',
+            name: $t(`dcc53f25-f0e9-4e3e-9f4f-e8cfa4e88755`),
+            width: 30,
+            getValue: (registration: PlatformRegistration) => {
+                return {
+                    value: registration.balances.reduce((sum, r) => sum + (r.amountOpen + r.amountPaid + r.amountPending), 0) / 1_0000,
+                    style: {
+                        numberFormat: {
+                            id: XlsxBuiltInNumberFormat.Currency2DecimalWithRed,
+                        },
+                    },
+                };
+            },
+        },
+        {
+            id: 'registeredAt',
+            name: $t(`Inschrijvingsdatum`),
+            width: 20,
+            getValue: (registration: PlatformRegistration) => ({
+                value: registration.registeredAt,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'organization',
+            name: $t('2f325358-6e2f-418c-9fea-31a14abbc17a'),
+            width: 40,
+            getValue: (registration: PlatformRegistration) => {
+                const organization = registration.member.family.getOrganization(registration.group.organizationId);
+                return ({
+                    value: organization?.name ?? $t('836c2cd3-32a3-43f2-b09c-600170fcd9cb'),
+                });
+            },
+        },
+        {
+            id: 'uri',
+            name: $t('9d283cbb-7ba2-4a16-88ec-ff0c19f39674'),
+            width: 40,
+            getValue: (registration: PlatformRegistration) => {
+                const organization = registration.member.family.getOrganization(registration.group.organizationId);
+                return ({
+                    value: organization?.uri ?? $t('836c2cd3-32a3-43f2-b09c-600170fcd9cb'),
+                });
+            },
+        },
         // option menu
         {
             match(id) {
@@ -71,7 +121,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformRegistration> = {
                                             },
                                         }
                                     : {},
-                                value: options.length === 1 && returnAmount ? options[0].amount : options.map(option => returnAmount ? option.amount : option).join(', '),
+                                value: options.map(option => returnAmount ? option.amount : option.option.name).join(', '),
                             };
                         },
                     }];

package/src/helpers/MemberCharger.ts

@@ -3,17 +3,29 @@ import { BalanceItemType, MemberWithRegistrationsBlob } from '@stamhoofd/structu
 
 export class MemberCharger {
     static async chargeMany({ chargingOrganizationId, membersToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; membersToCharge: MemberWithRegistrationsBlob[]; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {
-        const balanceItems = membersToCharge.map(memberBeingCharged => MemberCharger.createBalanceItem({
+        await Promise.all(membersToCharge.map(memberToCharge => MemberCharger.charge({
             price,
             amount,
             description,
             chargingOrganizationId,
-            memberBeingCharged,
+            memberToCharge,
             dueAt,
             createdAt,
-        }));
+        })));
+    }
+
+    static async charge({ chargingOrganizationId, memberToCharge, price, amount, description, dueAt, createdAt }: { chargingOrganizationId: string; memberToCharge: MemberWithRegistrationsBlob; price: number; amount?: number; description: string; dueAt: Date | null; createdAt: Date | null }) {
+        const balanceItem = MemberCharger.createBalanceItem({
+            price,
+            amount,
+            description,
+            chargingOrganizationId,
+            memberBeingCharged: memberToCharge,
+            dueAt,
+            createdAt,
+        });
 
-        await Promise.all(balanceItems.map(balanceItem => balanceItem.save()));
+        await balanceItem.save();
     }
 
     private static createBalanceItem({ price, amount, description, chargingOrganizationId, memberBeingCharged, dueAt, createdAt }: { price: number; amount?: number; description: string; chargingOrganizationId: string; memberBeingCharged: MemberWithRegistrationsBlob; dueAt: Date | null; createdAt: Date | null }): BalanceItem {

package/src/helpers/fetchToAsyncIterator.ts

@@ -1,5 +1,5 @@
 import { IPaginatedResponse, LimitedFilteredRequest } from '@stamhoofd/structures';
-import { FileSignService } from '../services/FileSignService';
+import { FileSignService } from '../services/FileSignService.js';
 
 export function fetchToAsyncIterator<T>(
     initialFilter: LimitedFilteredRequest,

package/src/sql-sorters/registrations.ts

@@ -63,7 +63,7 @@ export const registrationSorters: SQLSortDefinitions<RegistrationWithMemberBlob>
     },
     'member.birthDay': {
         getValue(a) {
-            return a.member.details.birthDay === null ? null : Formatter.dateIso(a.member.details.birthDay as Date);
+            return a.member.details.birthDay === null ? null : Formatter.dateIso(a.member.details.birthDay);
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({