@stamhoofd/backend 2.71.0 → 2.73.0

package/src/endpoints/global/platform/PatchPlatformEnpoint.ts

@@ -8,9 +8,9 @@ import { QueueHandler } from '@stamhoofd/queues';
 import { Context } from '../../../helpers/Context';
 import { MembershipCharger } from '../../../helpers/MembershipCharger';
 import { PeriodHelper } from '../../../helpers/PeriodHelper';
+import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 import { TagHelper } from '../../../helpers/TagHelper';
 import { PlatformMembershipService } from '../../../services/PlatformMembershipService';
-import { SetupStepUpdater } from '../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -265,6 +265,16 @@ export class PatchPlatformEndpoint extends Endpoint<
         newPremiseTypes: PlatformPremiseType[],
         oldPremiseTypes: PlatformPremiseType[],
     ) {
+        // should be updated because the step will be removed
+        if (newPremiseTypes.length === 0 && oldPremiseTypes.length !== 0) {
+            return true;
+        }
+
+        // should be updated because the step will be added
+        if (newPremiseTypes.length !== 0 && oldPremiseTypes.length === 0) {
+            return true;
+        }
+
         for (const premiseType of newPremiseTypes) {
             const id = premiseType.id;
             const oldVersion = oldPremiseTypes.find(x => x.id === id);

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

@@ -2,13 +2,13 @@ import { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder, PatchableArra
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Document, Member, RateLimiter } from '@stamhoofd/models';
-import { AuditLogType, MemberDetails, MembersBlob, MemberWithRegistrationsBlob } from '@stamhoofd/structures';
+import { MemberDetails, MembersBlob, MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../helpers/Context';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer';
 import { PatchOrganizationMembersEndpoint } from '../../global/members/PatchOrganizationMembersEndpoint';
-import { AuditLogService } from '../../../services/AuditLogService';
+import { shouldCheckIfMemberIsDuplicateForPatch, shouldCheckIfMemberIsDuplicateForPut } from '../members/shouldCheckIfMemberIsDuplicate';
 type Params = Record<string, never>;
 type Query = undefined;
 type Body = PatchableArrayAutoEncoder<MemberWithRegistrationsBlob>;
@@ -61,10 +61,12 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
 
             this.throwIfInvalidDetails(member.details);
 
-            const duplicate = await PatchOrganizationMembersEndpoint.checkDuplicate(member, struct.details.securityCode);
-            if (duplicate) {
-                addedMembers.push(duplicate);
-                continue;
+            if (shouldCheckIfMemberIsDuplicateForPut(struct)) {
+                const duplicate = await PatchOrganizationMembersEndpoint.checkDuplicate(member, struct.details.securityCode);
+                if (duplicate) {
+                    addedMembers.push(duplicate);
+                    continue;
+                }
             }
 
             await member.save();
@@ -86,6 +88,8 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
             const securityCode = struct.details?.securityCode; // will get cleared after the filter
             struct = await Context.auth.filterMemberPatch(member, struct);
 
+            let shouldCheckDuplicate = false;
+
             if (struct.details) {
                 if (struct.details.isPut()) {
                     throw new SimpleError({
@@ -96,6 +100,8 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
                     });
                 }
 
+                shouldCheckDuplicate = shouldCheckIfMemberIsDuplicateForPatch(struct, member.details);
+
                 member.details.patchOrPut(struct.details);
                 member.details.cleanData();
                 this.throwIfInvalidDetails(member.details);
@@ -110,14 +116,16 @@ export class PatchUserMembersEndpoint extends Endpoint<Params, Query, Body, Resp
                 });
             }
 
-            const duplicate = await PatchOrganizationMembersEndpoint.checkDuplicate(member, securityCode);
-            if (duplicate) {
+            if (shouldCheckDuplicate) {
+                const duplicate = await PatchOrganizationMembersEndpoint.checkDuplicate(member, securityCode);
+                if (duplicate) {
                 // Remove the member from the list
-                members.splice(members.findIndex(m => m.id === member.id), 1);
+                    members.splice(members.findIndex(m => m.id === member.id), 1);
 
-                // Add new
-                addedMembers.push(duplicate);
-                continue;
+                    // Add new
+                    addedMembers.push(duplicate);
+                    continue;
+                }
             }
 
             await member.save();

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

@@ -359,10 +359,14 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
         const createdBalanceItems: BalanceItem[] = [];
         const unrelatedCreatedBalanceItems: BalanceItem[] = [];
+        const deletedBalanceItems: BalanceItem[] = [];
         const shouldMarkValid = whoWillPayNow === 'nobody' || checkout.paymentMethod === PaymentMethod.Transfer || checkout.paymentMethod === PaymentMethod.PointOfSale || checkout.paymentMethod === PaymentMethod.Unknown;
 
         // Create negative balance items
-        for (const registrationStruct of [...checkout.cart.deleteRegistrations, ...checkout.cart.items.flatMap(i => i.replaceRegistrations)]) {
+        for (const { registration: registrationStruct, deleted } of [
+            ...checkout.cart.deleteRegistrations.map(r => ({ registration: r, deleted: true })),
+            ...checkout.cart.items.flatMap(i => i.replaceRegistrations).map(r => ({ registration: r, deleted: false })),
+        ]) {
             if (whoWillPayNow !== 'nobody') {
                 // this also fixes the issue that we cannot delete the registration right away if we would need to wait for a payment
                 throw new SimpleError({
@@ -398,7 +402,11 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             // We can alter right away since whoWillPayNow is nobody, and shouldMarkValid will always be true
             // Find all balance items of this registration and set them to zero
-            await BalanceItem.deleteForDeletedRegistration(existingRegistration.id);
+            deletedBalanceItems.push(...(await BalanceItem.deleteForDeletedRegistration(existingRegistration.id, {
+                cancellationFeePercentage: deleted ? checkout.cancellationFeePercentage : 0,
+            })));
+
+            // todo: add cancelation fee
 
             // Clear the registration
             let group = groups.find(g => g.id === existingRegistration.groupId);
@@ -695,7 +703,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         }
 
         // Reallocate
-        await BalanceItemService.reallocate([...createdBalanceItems, ...unrelatedCreatedBalanceItems], organization.id);
+        await BalanceItemService.reallocate([...createdBalanceItems, ...unrelatedCreatedBalanceItems, ...deletedBalanceItems], organization.id);
 
         // Update occupancy
         for (const group of groups) {

package/src/endpoints/global/sso/GetSSOEndpoint.ts

@@ -44,6 +44,13 @@ export class GetOrganizationSSOEndpoint extends Endpoint<Params, Query, Body, Re
             throw Context.auth.error();
         }
 
-        return new Response(service.configuration);
+        const configuration = service.configuration.clone();
+
+        // Remove secret by placeholder asterisks
+        if (configuration.clientSecret.length > 0) {
+            configuration.clientSecret = OpenIDClientConfiguration.placeholderClientSecret;
+        }
+
+        return new Response(configuration);
     }
 }

package/src/endpoints/global/sso/SetSSOEndpoint.ts

@@ -41,6 +41,10 @@ export class SetOrganizationSSOEndpoint extends Endpoint<Params, Query, Body, Re
             throw Context.auth.error();
         }
 
+        if (request.body.clientSecret === OpenIDClientConfiguration.placeholderClientSecret) {
+            delete request.body.clientSecret;
+        }
+
         const newConfig: OpenIDClientConfiguration = service.configuration.patch(request.body);
         await service.setConfiguration(newConfig);
 

package/src/endpoints/organization/dashboard/documents/GetDocumentsCountEndpoint.ts

@@ -35,7 +35,7 @@ export class GetDocumentsCountEndpoint extends Endpoint<Params, Query, Body, Res
             throw Context.auth.error();
         }
 
-        const query = GetDocumentsEndpoint.buildQuery(request.query);
+        const query = await GetDocumentsEndpoint.buildQuery(request.query);
 
         const count = await query
             .count();

package/src/endpoints/organization/dashboard/documents/GetDocumentsEndpoint.ts

@@ -38,7 +38,7 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
         return [false];
     }
 
-    static buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
+    static async buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
         const organization = Context.organization!;
 
         const documentTable: string = Document.table;
@@ -46,25 +46,25 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
         const query = SQL
             .select(SQL.wildcard(documentTable))
             .from(SQL.table(documentTable))
-            .where(compileToSQLFilter({
+            .where(await compileToSQLFilter({
                 organizationId: organization.id,
             }, filterCompilers));
 
         if (q.filter) {
-            query.where(compileToSQLFilter(q.filter, filterCompilers));
+            query.where(await compileToSQLFilter(q.filter, filterCompilers));
         }
 
         if (q.search) {
             const searchFilter: StamhoofdFilter | null = getDocumentSearchFilter(q.search);
 
             if (searchFilter) {
-                query.where(compileToSQLFilter(searchFilter, filterCompilers));
+                query.where(await compileToSQLFilter(searchFilter, filterCompilers));
             }
         }
 
         if (q instanceof LimitedFilteredRequest) {
             if (q.pageFilter) {
-                query.where(compileToSQLFilter(q.pageFilter, filterCompilers));
+                query.where(await compileToSQLFilter(q.pageFilter, filterCompilers));
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
@@ -76,7 +76,7 @@ export class GetDocumentsEndpoint extends Endpoint<Params, Query, Body, Response
     }
 
     static async buildData(requestQuery: LimitedFilteredRequest) {
-        const query = this.buildQuery(requestQuery);
+        const query = await this.buildQuery(requestQuery);
         const data = await query.fetch();
 
         const documents: Document[] = Document.fromRows(data, Document.table);

package/src/endpoints/organization/dashboard/organization/PatchOrganizationEndpoint.ts

@@ -8,9 +8,9 @@ import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { BuckarooHelper } from '../../../../helpers/BuckarooHelper';
 import { Context } from '../../../../helpers/Context';
+import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 import { TagHelper } from '../../../../helpers/TagHelper';
 import { ViesHelper } from '../../../../helpers/ViesHelper';
-import { SetupStepUpdater } from '../../../../helpers/SetupStepUpdater';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -126,6 +126,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 organization.privateMeta.privateKey = request.body.privateMeta.privateKey ?? organization.privateMeta.privateKey;
                 organization.privateMeta.featureFlags = patchObject(organization.privateMeta.featureFlags, request.body.privateMeta.featureFlags);
                 organization.privateMeta.balanceNotificationSettings = patchObject(organization.privateMeta.balanceNotificationSettings, request.body.privateMeta.balanceNotificationSettings);
+                organization.privateMeta.recordAnswers = request.body.privateMeta.recordAnswers.applyTo(organization.privateMeta.recordAnswers);
 
                 if (request.body.privateMeta.mollieProfile !== undefined) {
                     organization.privateMeta.mollieProfile = patchObject(organization.privateMeta.mollieProfile, request.body.privateMeta.mollieProfile);

package/src/endpoints/organization/dashboard/payments/GetPaymentsEndpoint.ts

@@ -5,11 +5,11 @@ import { Payment } from '@stamhoofd/models';
 import { SQL, compileToSQLFilter, compileToSQLSorter } from '@stamhoofd/sql';
 import { CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, PaymentGeneral, StamhoofdFilter, TransferSettings, assertSort, getSortFilter } from '@stamhoofd/structures';
 
+import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
 import { paymentFilterCompilers } from '../../../../sql-filters/payments';
 import { paymentSorters } from '../../../../sql-sorters/payments';
-import { SQLResultNamespacedRow } from '@simonbackx/simple-database';
 
 type Params = Record<string, never>;
 type Query = LimitedFilteredRequest;
@@ -59,11 +59,11 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             );
 
         if (scopeFilter) {
-            query.where(compileToSQLFilter(scopeFilter, filterCompilers));
+            query.where(await compileToSQLFilter(scopeFilter, filterCompilers));
         }
 
         if (q.filter) {
-            query.where(compileToSQLFilter(q.filter, filterCompilers));
+            query.where(await compileToSQLFilter(q.filter, filterCompilers));
         }
 
         if (q.search) {
@@ -142,13 +142,13 @@ export class GetPaymentsEndpoint extends Endpoint<Params, Query, Body, ResponseB
             }
 
             if (searchFilter) {
-                query.where(compileToSQLFilter(searchFilter, filterCompilers));
+                query.where(await compileToSQLFilter(searchFilter, filterCompilers));
             }
         }
 
         if (q instanceof LimitedFilteredRequest) {
             if (q.pageFilter) {
-                query.where(compileToSQLFilter(q.pageFilter, filterCompilers));
+                query.where(await compileToSQLFilter(q.pageFilter, filterCompilers));
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);

package/src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint.ts

@@ -3,7 +3,7 @@ import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-
 import { SimpleError } from '@simonbackx/simple-errors';
 import { CachedBalance } from '@stamhoofd/models';
 import { compileToSQLFilter, compileToSQLSorter } from '@stamhoofd/sql';
-import { ReceivableBalance as ReceivableBalanceStruct, CountFilteredRequest, LimitedFilteredRequest, PaginatedResponse, StamhoofdFilter, assertSort, getSortFilter, ReceivableBalanceType } from '@stamhoofd/structures';
+import { assertSort, CountFilteredRequest, DetailedReceivableBalance, getSortFilter, LimitedFilteredRequest, PaginatedResponse, ReceivableBalance as ReceivableBalanceStruct, StamhoofdFilter } from '@stamhoofd/structures';
 
 import { AuthenticatedStructures } from '../../../../helpers/AuthenticatedStructures';
 import { Context } from '../../../../helpers/Context';
@@ -54,23 +54,49 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
             .select();
 
         if (scopeFilter) {
-            query.where(compileToSQLFilter(scopeFilter, filterCompilers));
+            query.where(await compileToSQLFilter(scopeFilter, filterCompilers));
         }
 
         if (q.filter) {
-            query.where(compileToSQLFilter(q.filter, filterCompilers));
+            query.where(await compileToSQLFilter(q.filter, filterCompilers));
         }
 
         if (q.search) {
-            throw new SimpleError({
-                code: 'not_implemented',
-                message: 'Zoeken in openstaande bedragen is voorlopig nog niet mogelijk',
-            });
+            let searchFilter: StamhoofdFilter | null = null;
+
+            searchFilter = {
+                $or: [
+                    {
+                        organizations: {
+                            $elemMatch: {
+                                $or: [
+                                    { name: { $contains: q.search } },
+                                    { uri: q.search },
+                                ],
+                            },
+                        },
+                    },
+                    {
+                        members: {
+                            $elemMatch: { name: { $contains: q.search } },
+                        },
+                    },
+                    {
+                        users: {
+                            $elemMatch: { name: { $contains: q.search } },
+                        },
+                    },
+                ],
+            };
+
+            if (searchFilter) {
+                query.where(await compileToSQLFilter(searchFilter, filterCompilers));
+            }
         }
 
         if (q instanceof LimitedFilteredRequest) {
             if (q.pageFilter) {
-                query.where(compileToSQLFilter(q.pageFilter, filterCompilers));
+                query.where(await compileToSQLFilter(q.pageFilter, filterCompilers));
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
@@ -81,7 +107,7 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
         return query;
     }
 
-    static async buildData(requestQuery: LimitedFilteredRequest) {
+    static async buildDataHelper(requestQuery: LimitedFilteredRequest) {
         const query = await GetReceivableBalancesEndpoint.buildQuery(requestQuery);
         const data = await query.fetch();
 
@@ -107,12 +133,28 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
             }
         }
 
+        return { data, next };
+    }
+
+    static async buildData(requestQuery: LimitedFilteredRequest) {
+        const { data, next } = await GetReceivableBalancesEndpoint.buildDataHelper(requestQuery);
+
         return new PaginatedResponse<ReceivableBalanceStruct[], LimitedFilteredRequest>({
             results: await AuthenticatedStructures.receivableBalances(data),
             next,
         });
     }
 
+    static async buildDetailedData(requestQuery: LimitedFilteredRequest) {
+        const organization = Context.organization ?? await Context.setOrganizationScope();
+        const { data, next } = await GetReceivableBalancesEndpoint.buildDataHelper(requestQuery);
+
+        return new PaginatedResponse<DetailedReceivableBalance[], LimitedFilteredRequest>({
+            results: await AuthenticatedStructures.detailedReceivableBalances(organization.id, data),
+            next,
+        });
+    }
+
     async handle(request: DecodedRequest<Params, Query, Body>) {
         await Context.setOrganizationScope();
         await Context.authenticate();

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

@@ -35,7 +35,7 @@ export class GetWebshopOrdersCountEndpoint extends Endpoint<Params, Query, Body,
             throw Context.auth.error();
         }
 
-        const query = GetWebshopOrdersEndpoint.buildQuery(request.query);
+        const query = await GetWebshopOrdersEndpoint.buildQuery(request.query);
 
         const count = await query
             .count();

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

@@ -35,7 +35,7 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
         return [false];
     }
 
-    static buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
+    static async buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
         // todo: filter userId???
         const organization = Context.organization!;
 
@@ -44,7 +44,7 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
         const query = SQL
             .select(SQL.wildcard(ordersTable))
             .from(SQL.table(ordersTable))
-            .where(compileToSQLFilter({
+            .where(await compileToSQLFilter({
                 organizationId: organization.id,
                 number: {
                     $neq: null,
@@ -52,20 +52,20 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
             }, filterCompilers));
 
         if (q.filter) {
-            query.where(compileToSQLFilter(q.filter, filterCompilers));
+            query.where(await compileToSQLFilter(q.filter, filterCompilers));
         }
 
         if (q.search) {
             const searchFilter: StamhoofdFilter | null = getOrderSearchFilter(q.search, parsePhoneNumber);
 
             if (searchFilter) {
-                query.where(compileToSQLFilter(searchFilter, filterCompilers));
+                query.where(await compileToSQLFilter(searchFilter, filterCompilers));
             }
         }
 
         if (q instanceof LimitedFilteredRequest) {
             if (q.pageFilter) {
-                query.where(compileToSQLFilter(q.pageFilter, filterCompilers));
+                query.where(await compileToSQLFilter(q.pageFilter, filterCompilers));
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
@@ -77,7 +77,7 @@ export class GetWebshopOrdersEndpoint extends Endpoint<Params, Query, Body, Resp
     }
 
     static async buildData(requestQuery: LimitedFilteredRequest) {
-        const query = this.buildQuery(requestQuery);
+        const query = await this.buildQuery(requestQuery);
         const data = await query.fetch();
 
         const orders: Order[] = Order.fromRows(data, Order.table);

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

@@ -34,7 +34,7 @@ export class GetWebshopTicketsEndpoint extends Endpoint<Params, Query, Body, Res
         return [false];
     }
 
-    static buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
+    static async buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
         const organization = Context.organization!;
 
         const ticketsTable: string = Ticket.table;
@@ -42,12 +42,12 @@ export class GetWebshopTicketsEndpoint extends Endpoint<Params, Query, Body, Res
         const query = SQL
             .select(SQL.wildcard(ticketsTable))
             .from(SQL.table(ticketsTable))
-            .where(compileToSQLFilter({
+            .where(await Promise.resolve(compileToSQLFilter({
                 organizationId: organization.id,
-            }, filterCompilers));
+            }, filterCompilers)));
 
         if (q.filter) {
-            query.where(compileToSQLFilter(q.filter, filterCompilers));
+            query.where(await Promise.resolve(compileToSQLFilter(q.filter, filterCompilers)));
         }
 
         // currently no search supported, probably not needed?
@@ -56,7 +56,7 @@ export class GetWebshopTicketsEndpoint extends Endpoint<Params, Query, Body, Res
 
         if (q instanceof LimitedFilteredRequest) {
             if (q.pageFilter) {
-                query.where(compileToSQLFilter(q.pageFilter, filterCompilers));
+                query.where(await Promise.resolve(compileToSQLFilter(q.pageFilter, filterCompilers)));
             }
 
             q.sort = assertSort(q.sort, [{ key: 'id' }]);
@@ -68,7 +68,7 @@ export class GetWebshopTicketsEndpoint extends Endpoint<Params, Query, Body, Res
     }
 
     static async buildData(requestQuery: LimitedFilteredRequest) {
-        const query = this.buildQuery(requestQuery);
+        const query = await this.buildQuery(requestQuery);
         const data = await query.fetch();
 
         const tickets: Ticket[] = Ticket.fromRows(data, Ticket.table);

package/src/excel-loaders/members.ts

@@ -204,6 +204,14 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
                 };
             },
         },
+        {
+            id: 'nationalRegisterNumber',
+            name: 'Rijksregisternummer',
+            width: 30,
+            getValue: ({ patchedMember: object }: PlatformMember) => ({
+                value: object.details.nationalRegisterNumber?.toString() ?? '',
+            }),
+        },
 
         ...XlsxTransformerColumnHelper.creatColumnsForParents(),