@stamhoofd/backend 2.120.6 → 2.122.0

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

@@ -1,7 +1,7 @@
 import { PatchMap } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
 import { EmailMocker } from '@stamhoofd/email';
-import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { BalanceItemFactory, Group, GroupFactory, Member, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, BalanceItemCartItem, BalanceItemStatus, BalanceItemType, BooleanStatus, Company, GroupOption, GroupOptionMenu, IDRegisterCart, IDRegisterCheckout, IDRegisterItem, OrganizationPackages, PaymentCustomer, PaymentMethod, PermissionLevel, Permissions, PermissionsResourceType, ReduceablePrice, RegisterItemOption, ResourcePermissions, STPackageStatus, STPackageType, UitpasNumberDetails, UitpasSocialTariff, UitpasSocialTariffStatus, UserPermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
@@ -865,7 +865,7 @@ describe('Endpoint.RegisterMembers', () => {
 
             expect(response.body).toBeDefined();
             expect(response.body.registrations.length).toBe(1);
-            expect(response.body.paymentUrl).toMatch(/payconiq\.com/);
+            expect(response.body.paymentUrl).toMatch(/payconiq-checkout\.test/);
 
             expect(response.body.registrations[0]).toMatchObject({
                 registeredAt: null,
@@ -925,8 +925,7 @@ describe('Endpoint.RegisterMembers', () => {
                 expect(trialUntil!.getFullYear()).toBe(2023);
                 expect(trialUntil!.getMonth()).toBe(4);
                 expect(trialUntil!.getDate()).toBe(19);
-            }
-            finally {
+            } finally {
                 vitest.useRealTimers();
             }
         }, 20_00000);
@@ -2316,6 +2315,91 @@ describe('Endpoint.RegisterMembers', () => {
         test('Should fail if company does not exist on organization', async () => {
             const { organization, group, groupPrice, member, token, organization2 } = await initDualData();
 
+            const c = Company.create({
+                name: 'test company A',
+            });
+            organization2.meta.companies = [c];
+            await organization2.save();
+
+            const body = IDRegisterCheckout.create({
+                cart: IDRegisterCart.create({
+                    items: [
+                        IDRegisterItem.create({
+                            id: uuidv4(),
+                            replaceRegistrationIds: [],
+                            options: [],
+                            groupPrice,
+                            organizationId: organization.id,
+                            groupId: group.id,
+                            memberId: member.id,
+                        }),
+                    ],
+                    balanceItems: [
+                    ],
+                    deleteRegistrationIds: [],
+                }),
+                administrationFee: 0,
+                freeContribution: 0,
+                paymentMethod: PaymentMethod.PointOfSale,
+                totalPrice: 25_0000,
+                customer: PaymentCustomer.create({
+                    company: Company.create({ // different id (important for the test)
+                        name: 'test company',
+                    }),
+                }),
+                asOrganizationId: organization2.id,
+            });
+
+            await expect(post(body, organization, token))
+                .rejects
+                .toThrow(/Cannot set company data/);
+        });
+
+        test('Should not fail if using default company on organization', async () => {
+            const { organization, group, groupPrice, member, token, organization2 } = await initDualData();
+            organization2.meta.companies = [];
+            await organization2.save();
+
+            const body = IDRegisterCheckout.create({
+                cart: IDRegisterCart.create({
+                    items: [
+                        IDRegisterItem.create({
+                            id: uuidv4(),
+                            replaceRegistrationIds: [],
+                            options: [],
+                            groupPrice,
+                            organizationId: organization.id,
+                            groupId: group.id,
+                            memberId: member.id,
+                        }),
+                    ],
+                    balanceItems: [
+                    ],
+                    deleteRegistrationIds: [],
+                }),
+                administrationFee: 0,
+                freeContribution: 0,
+                paymentMethod: PaymentMethod.PointOfSale,
+                totalPrice: 25_0000,
+                customer: PaymentCustomer.create({
+                    company: organization2.defaultCompanies[0],
+                }),
+                asOrganizationId: organization2.id,
+            });
+
+            const result = await post(body, organization, token);
+            expect(result.body.registrations.length).toEqual(1);
+        });
+
+        test('Should fail if company exists but is patched on organization', async () => {
+            const { organization, group, groupPrice, member, token, organization2 } = await initDualData();
+
+            const c = Company.create({
+                name: 'test company A',
+            });
+            organization2.meta.companies = [c];
+            await organization2.save();
+
             const body = IDRegisterCheckout.create({
                 cart: IDRegisterCart.create({
                     items: [
@@ -2338,7 +2422,7 @@ describe('Endpoint.RegisterMembers', () => {
                 paymentMethod: PaymentMethod.PointOfSale,
                 totalPrice: 25_0000,
                 customer: PaymentCustomer.create({
-                    company: Company.create({
+                    company: c.patch({
                         name: 'test company',
                     }),
                 }),
@@ -2347,7 +2431,7 @@ describe('Endpoint.RegisterMembers', () => {
 
             await expect(post(body, organization, token))
                 .rejects
-                .toThrow('Oeps, de facturatiegegevens die je probeerde te selecteren lijken niet meer te bestaan.');
+                .toThrow(/Cannot change company data/);
         });
     });
 

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

@@ -1,21 +1,17 @@
-import { createMollieClient, PaymentMethod as molliePaymentMethod } from '@mollie/api-client';
 import { ManyToOneRelation } from '@simonbackx/simple-database';
 import type { Decoder } from '@simonbackx/simple-encoding';
-import type { DecodedRequest, Request} 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 { Email } from '@stamhoofd/email';
-import type { MemberWithUsersRegistrationsAndGroups, Organization, Payment} from '@stamhoofd/models';
-import { BalanceItem, BalanceItemPayment, CachedBalance, Group, Member, MolliePayment, MollieToken, PayconiqPayment, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
-import type { BalanceItem as BalanceItemStruct, PlatformMember, RegisterItem} from '@stamhoofd/structures';
-import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, IDRegisterCheckout, PaymentCustomer, PaymentMethod, PaymentMethodHelper, PaymentProvider, PaymentStatus, Payment as PaymentStruct, PaymentType, PermissionLevel, PlatformFamily, ReceivableBalanceType, RegisterResponse, TranslatedString, Version } from '@stamhoofd/structures';
-import { Formatter, sleep } from '@stamhoofd/utility';
+import type { MemberWithUsersRegistrationsAndGroups, Organization, Payment } from '@stamhoofd/models';
+import { BalanceItem, CachedBalance, Group, Member, Platform, RateLimiter, Registration } from '@stamhoofd/models';
+import type { BalanceItem as BalanceItemStruct, PlatformMember, RegisterItem } from '@stamhoofd/structures';
+import { BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, IDRegisterCheckout, Payment as PaymentStruct, PermissionLevel, PlatformFamily, ReceivableBalanceType, RegisterResponse, TranslatedString } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
 
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
-import { BuckarooHelper } from '../../../helpers/BuckarooHelper.js';
 import { Context } from '../../../helpers/Context.js';
-import { ServiceFeeHelper } from '../../../helpers/ServiceFeeHelper.js';
-import { StripeHelper } from '../../../helpers/StripeHelper.js';
 import { updateMemberDetailsUitpasNumber } from '../../../helpers/updateMemberDetailsUitpasNumber.js';
 import { BalanceItemService } from '../../../services/BalanceItemService.js';
 import { PaymentService } from '../../../services/PaymentService.js';
@@ -88,8 +84,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             // We won't create a payment. The balance will get added to the outstanding amount of the member / already paying organization
             whoWillPayNow = 'nobody';
-        }
-        else if (request.body.asOrganizationId && request.body.asOrganizationId !== organization.id) {
+        } else if (request.body.asOrganizationId && request.body.asOrganizationId !== organization.id) {
             // Paying balance to a different organization requires finance permissions
             // we'll check later if you are also registering members, which requires full permissions
             if (!await Context.auth.canManageFinances(request.body.asOrganizationId)) {
@@ -111,8 +106,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             try {
                 limiter.track(organization.id, 1);
-            }
-            catch (e) {
+            } catch (e) {
                 Email.sendWebmaster({
                     subject: '[Limiet] Limiet bereikt voor aantal inschrijvingen',
                     text: 'Beste, \nDe limiet werd bereikt voor het aantal inschrijvingen per dag. \nVereniging: ' + organization.id + ' (' + organization.name + ')' + '\n\n' + e.message + '\n\nStamhoofd',
@@ -135,6 +129,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
         // Validate balance items (can only happen serverside)
         const balanceItemIds = request.body.cart.balanceItems.map(i => i.item.id);
+        console.log('cart ids', balanceItemIds);
         let memberBalanceItemsStructs: BalanceItemStruct[] = [];
         let balanceItemsModels: BalanceItem[] = [];
         if (balanceItemIds.length > 0) {
@@ -154,8 +149,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 [...request.body.memberIds, ...deleteRegistrationModels.map(i => i.memberId), ...balanceItemsModels.map(i => i.memberId).filter(m => m !== null)],
             );
             members = await Member.getBlobByIds(...memberIds);
-        }
-        else {
+        } else {
             // Load the user family (required to correctly calculate discounts across family members)
             members = await Member.getMembersWithRegistrationForUser(user);
         }
@@ -194,8 +188,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
                 try {
                     isUpdated = await updateMemberDetailsUitpasNumber(member.details);
-                }
-                catch (e) {
+                } catch (e) {
                     // catch all errors
                 }
 
@@ -250,8 +243,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     });
                 }
             }
-        }
-        else {
+        } else {
             const blob = await AuthenticatedStructures.membersBlob(members, true);
             const family = PlatformFamily.create(blob, {
                 platform: await Platform.getSharedStruct(),
@@ -295,8 +287,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 // Safe and important to ignore: we are only updating the outstanding amounts
                 // If we would throw here, that could leak personal data (e.g. that the user uses financial support)
                 request.body.totalPrice = totalPrice;
-            }
-            else {
+            } else {
                 // when whoWillPay = organization/member, we should throw or the payment amount could be different / incorrect.
                 // This never leaks information because in this case the user already has full access to the organization (asOrganizationId) or the member
                 throw new SimpleError({
@@ -419,8 +410,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             if (checkout.isAdminFromSameOrganization) {
                 registration.sendConfirmationEmail = checkout.sendConfirmationEmail;
-            }
-            else {
+            } else {
                 registration.sendConfirmationEmail = true;
                 if (checkout.asOrganizationId) {
                     // use group default
@@ -550,8 +540,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             if (registration.payingOrganizationId) {
                 // We no longer also charge the member. This has been removed, ref STA-288
                 balanceItem.payingOrganizationId = registration.payingOrganizationId;
-            }
-            else {
+            } else {
                 balanceItem.memberId = registration.memberId;
 
                 if (!checkout.asOrganizationId) {
@@ -782,8 +771,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
 
             if (request.body.asOrganizationId) {
                 balanceItem.payingOrganizationId = request.body.asOrganizationId;
-            }
-            else {
+            } else {
                 balanceItem.userId = user.id;
 
                 // Connect this to the oldest member
@@ -832,6 +820,21 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 createdBalanceItems.push(balanceItem);
             }
 
+            // Apply discounts
+            // Automatically add discounts
+            /* const { price: totalPriceBefore, roundingAmount: roundingAmountBefore } = PaymentService.calculateTotalPrice({
+                balanceItems: mappedBalanceItems,
+                organization
+            })
+
+            await BalanceItemService.applyDiscountsToCheckout({
+                totalPrice: totalPriceBefore - roundingAmountBefore,
+                balanceItems: mappedBalanceItems,
+                sellingOrganizationId: organization.id,
+                payingOrganizationId: payingOrganization?.id,
+                payingUserId: user?.id
+            }); */
+
             try {
                 const response = await PaymentService.createPayment({
                     balanceItems: mappedBalanceItems,
@@ -841,6 +844,10 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     members,
                     serviceFeeType: 'members',
                     payingOrganization,
+                    createMandate: null,
+                    useMandate: null,
+                    paymentConfiguration: organization.meta.registrationPaymentConfiguration,
+                    privatePaymentConfiguration: organization.privateMeta.registrationPaymentConfiguration,
                 });
 
                 if (response) {
@@ -848,13 +855,11 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                     paymentQRCode = response.paymentQRCode;
                     payment = response.payment;
                 }
-            }
-            finally {
+            } finally {
                 // Update cached balance items pending amount (only created balance items, because those are involved in the payment)
                 await BalanceItemService.updatePaidAndPending(createdBalanceItems);
             }
-        }
-        else {
+        } else {
             // Mark as paid/valid without creating a payment
             for (const balanceItem of markValidList) {
                 await BalanceItemService.markPaid(balanceItem, null, organization);
@@ -880,7 +885,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
         await Member.loadRegistrations(members, true);
 
         return new Response(RegisterResponse.create({
-            payment: payment ? PaymentStruct.create(payment) : null,
+            payment: payment ? await AuthenticatedStructures.paymentGeneral(payment, true) : null,
             members: await AuthenticatedStructures.membersBlob(members),
             registrations: registrations.map(r => Member.getRegistrationWithTinyMemberStructure(r)),
             paymentUrl,

package/src/endpoints/global/registration-invitations/GetRegistrationInvitationsCountEndpoint.ts

@@ -0,0 +1,45 @@
+import type { Decoder } from '@simonbackx/simple-encoding';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
+import { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
+
+import { Context } from '../../../helpers/Context.js';
+import { GetRegistrationInvitationsEndpoint } from './GetRegistrationInvitationsEndpoint.js';
+
+type Params = Record<string, never>;
+type Query = CountFilteredRequest;
+type Body = undefined;
+type ResponseBody = CountResponse;
+
+export class GetRegistrationInvitationsCountEndpoint extends Endpoint<Params, Query, Body, ResponseBody> {
+    queryDecoder = CountFilteredRequest as Decoder<CountFilteredRequest>;
+
+    protected doesMatch(request: Request): [true, Params] | [false] {
+        if (request.method !== 'GET') {
+            return [false];
+        }
+
+        const params = Endpoint.parseParameters(request.url, '/registration-invitations/count', {});
+
+        if (params) {
+            return [true, params as Params];
+        }
+        return [false];
+    }
+
+    async handle(request: DecodedRequest<Params, Query, Body>) {
+        await Context.setOptionalOrganizationScope();
+        await Context.authenticate();
+
+        const query = await GetRegistrationInvitationsEndpoint.buildQuery(request.query);
+
+        const count = await query
+            .count();
+
+        return new Response(
+            CountResponse.create({
+                count,
+            }),
+        );
+    }
+}