@stamhoofd/backend 2.120.6 → 2.122.0

package/src/sql-sorters/registration-invitations.ts

@@ -0,0 +1,36 @@
+import type { RegistrationInvitation } from '@stamhoofd/models';
+import type { SQLOrderByDirection, SQLSortDefinitions } from '@stamhoofd/sql';
+import { SQL, SQLOrderBy } from '@stamhoofd/sql';
+
+export const registrationInvitationSorters: SQLSortDefinitions<RegistrationInvitation> = {
+    // WARNING! TEST NEW SORTERS THOROUGHLY!
+    // Try to avoid creating sorters on fields that er not 1:1 with the database, that often causes pagination issues if not thought through
+    // An example: sorting on 'name' is not a good idea, because it is a concatenation of two fields.
+    // You might be tempted to use ORDER BY firstName, lastName, but that will not work as expected and it needs to be ORDER BY CONCAT(firstName, ' ', lastName)
+    // Why? Because ORDER BY firstName, lastName produces a different order dan ORDER BY CONCAT(firstName, ' ', lastName) if there are multiple people with spaces in the first name
+    // And that again causes issues with pagination because the next query will append a filter of name > 'John Doe' - causing duplicate and/or skipped results
+    // What if you need mapping? simply map the sorters in the frontend: name -> firstname, lastname, age -> birthDay, etc.
+
+    id: {
+        getValue(invitation) {
+            return invitation.id;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('id'),
+                direction,
+            });
+        },
+    },
+    createdAt: {
+        getValue(invitation) {
+            return invitation.createdAt;
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.column('createdAt'),
+                direction,
+            });
+        },
+    },
+};

package/tests/actions/patchOrganizationMember.ts

@@ -1,4 +1,4 @@
-import type { AutoEncoderPatchType} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
 import type { Organization } from '@stamhoofd/models';

package/tests/actions/patchUserMember.ts

@@ -1,4 +1,4 @@
-import type { AutoEncoderPatchType} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
 import type { Organization, User } from '@stamhoofd/models';

package/tests/assertions/assertBalances.ts

@@ -14,17 +14,13 @@ export async function assertBalances(
     const q = BalanceItem.select();
     if ('user' in selector && selector.user.id) {
         q.where('userId', selector.user.id);
-    }
-    else if ('member' in selector && selector.member.id) {
+    } else if ('member' in selector && selector.member.id) {
         q.where('memberId', selector.member.id);
-    }
-    else if ('organization' in selector && selector.organization.id) {
+    } else if ('organization' in selector && selector.organization.id) {
         q.where('organizationId', selector.organization.id);
-    }
-    else if ('payingOrganization' in selector && selector.payingOrganization.id) {
+    } else if ('payingOrganization' in selector && selector.payingOrganization.id) {
         q.where('payingOrganizationId', selector.payingOrganization.id);
-    }
-    else {
+    } else {
         throw new Error('Selector must contain either user or member with an id');
     }
 
@@ -32,8 +28,7 @@ export async function assertBalances(
 
     try {
         expect(userBalances).toIncludeAllMembers(balances.map(b => expect.objectContaining(b)));
-    }
-    catch (e) {
+    } catch (e) {
         // List all the balances that were found and the ones that were missing
         if (userBalances.length !== balances.length) {
             console.error('Difference in number of balances found:', userBalances.length, 'expected:', balances.length);
@@ -45,8 +40,7 @@ export async function assertBalances(
                 try {
                     expect(userBalance).toEqual(expect.objectContaining(expectedBalance));
                     found = true;
-                }
-                catch (e) {
+                } catch (e) {
                     // ignore
                 }
             }

package/tests/e2e/api-rate-limits.test.ts

@@ -61,19 +61,16 @@ describe('E2E.APIRateLimits', () => {
             if (i < 25) {
                 try {
                     await expect(promise).toResolve();
-                }
-                catch (e) {
+                } catch (e) {
                     let error: any = null;
                     try {
                         await promise;
-                    }
-                    catch (e) {
+                    } catch (e) {
                         error = e;
                     }
                     throw new Error('The endpoint rejected at call ' + i + ' with error message ' + error?.message);
                 }
-            }
-            else {
+            } else {
                 await expect(promise).rejects.toThrow(
                     STExpect.simpleError({
                         code: 'rate_limit',
@@ -95,19 +92,16 @@ describe('E2E.APIRateLimits', () => {
             if (i < 25) {
                 try {
                     await expect(promise).toResolve();
-                }
-                catch (e) {
+                } catch (e) {
                     let error: any = null;
                     try {
                         await promise;
-                    }
-                    catch (e) {
+                    } catch (e) {
                         error = e;
                     }
                     throw new Error('The endpoint rejected at call ' + i + ' with error message ' + error?.message);
                 }
-            }
-            else {
+            } else {
                 await expect(promise).rejects.toThrow(
                     STExpect.simpleError({
                         code: 'rate_limit',
@@ -129,19 +123,16 @@ describe('E2E.APIRateLimits', () => {
             if (i < 50) {
                 try {
                     await expect(promise).toResolve();
-                }
-                catch (e) {
+                } catch (e) {
                     let error: any = null;
                     try {
                         await promise;
-                    }
-                    catch (e) {
+                    } catch (e) {
                         error = e;
                     }
                     throw new Error('The endpoint rejected at call ' + i + ' with error message ' + error?.message);
                 }
-            }
-            else {
+            } else {
                 await expect(promise).rejects.toThrow(
                     STExpect.simpleError({
                         code: 'rate_limit',
@@ -163,19 +154,16 @@ describe('E2E.APIRateLimits', () => {
             if (i < 125) {
                 try {
                     await expect(promise).toResolve();
-                }
-                catch (e) {
+                } catch (e) {
                     let error: any = null;
                     try {
                         await promise;
-                    }
-                    catch (e) {
+                    } catch (e) {
                         error = e;
                     }
                     throw new Error('The endpoint rejected at call ' + i + ' with error message ' + error?.message);
                 }
-            }
-            else {
+            } else {
                 await expect(promise).rejects.toThrow(
                     STExpect.simpleError({
                         code: 'rate_limit',

package/tests/e2e/bundle-discounts.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { BalanceItem, Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { BalanceItem, Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, AppliedRegistrationDiscount, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BooleanStatus, GroupPriceDiscount, GroupPriceDiscountType, IDRegisterCart, IDRegisterCheckout, IDRegisterItem, PaymentMethod, PermissionLevel, Permissions, PermissionsResourceType, ReduceablePrice, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
@@ -11,6 +11,7 @@ import { initAdmin } from '../init/initAdmin.js';
 import { initBundleDiscount } from '../init/initBundleDiscount.js';
 import { initPermissionRole } from '../init/initPermissionRole.js';
 import { initStripe } from '../init/initStripe.js';
+import { initMembershipOrganization } from '../init/initMembershipOrganization.js';
 
 const baseUrl = `/members/register`;
 
@@ -40,6 +41,8 @@ describe('E2E.Bundle Discounts', () => {
             endDate: new Date(2030, 11, 31),
             previousPeriodId: previousPeriod.id,
         }).create();
+
+        await initMembershipOrganization();
     });
 
     beforeEach(async () => {

package/tests/e2e/charge-members.test.ts

@@ -1,7 +1,7 @@
 import { Request, Response } from '@simonbackx/simple-endpoints';
-import type { Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
-import type { BalanceItemWithPayments, StamhoofdFilter} from '@stamhoofd/structures';
+import type { BalanceItemWithPayments, StamhoofdFilter } from '@stamhoofd/structures';
 import { AccessRight, ChargeRequest, LimitedFilteredRequest, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { ChargeMembersEndpoint } from '../../src/endpoints/admin/members/ChargeMembersEndpoint.js';
@@ -109,7 +109,7 @@ describe('E2E.ChargeMembers', () => {
 
         const body = ChargeRequest.create({
             description: 'test description',
-            price: 3,
+            price: 3_00,
             amount: 4,
             dueAt: new Date(2023, 0, 10),
             createdAt: new Date(2023, 0, 4),
@@ -173,7 +173,7 @@ describe('E2E.ChargeMembers', () => {
 
         const body = ChargeRequest.create({
             description: 'test description',
-            price: 3,
+            price: 3_00,
             amount: 4,
             dueAt: new Date(2023, 0, 10),
             createdAt: new Date(2023, 0, 4),
@@ -188,7 +188,8 @@ describe('E2E.ChargeMembers', () => {
             expect(response).toBeDefined();
             expect(response.length).toBe(1);
             const balanceItem1 = response[0];
-            expect(balanceItem1.price).toEqual(12);
+            expect(balanceItem1.unitPrice).toEqual(3_00);
+            expect(balanceItem1.priceWithVAT).toEqual(12_00);
             expect(balanceItem1.amount).toEqual(body.amount);
             expect(balanceItem1.description).toEqual(body.description);
             expect(balanceItem1.organizationId).toEqual(organization.id);
@@ -237,7 +238,7 @@ describe('E2E.ChargeMembers', () => {
 
         const body = ChargeRequest.create({
             description: 'test description',
-            price: 3,
+            price: 3_00,
             amount: 4,
             dueAt: new Date(2023, 0, 10),
             createdAt: new Date(2023, 0, 4),
@@ -276,7 +277,7 @@ describe('E2E.ChargeMembers', () => {
             // empty description
             [ChargeRequest.create({
                 description: ' ',
-                price: 3,
+                price: 3_00,
                 amount: 4,
                 dueAt: new Date(2023, 0, 10),
                 createdAt: new Date(2023, 0, 4),
@@ -294,7 +295,7 @@ describe('E2E.ChargeMembers', () => {
             // amount 0
             [ChargeRequest.create({
                 description: 'test description',
-                price: 3,
+                price: 3_00,
                 amount: 0,
                 dueAt: new Date(2023, 0, 10),
                 createdAt: new Date(2023, 0, 4),
@@ -352,7 +353,7 @@ describe('E2E.ChargeMembers', () => {
 
             const body = ChargeRequest.create({
                 description: 'test description',
-                price: 3,
+                price: 3_00,
                 amount: 4,
                 dueAt: new Date(2023, 0, 10),
                 createdAt: new Date(2023, 0, 4),
@@ -367,7 +368,8 @@ describe('E2E.ChargeMembers', () => {
                 expect(response).toBeDefined();
                 expect(response.length).toBe(1);
                 const balanceItem1 = response[0];
-                expect(balanceItem1.price).toEqual(12);
+                expect(balanceItem1.unitPrice).toEqual(3_00);
+                expect(balanceItem1.priceWithVAT).toEqual(12_00);
                 expect(balanceItem1.amount).toEqual(4);
                 expect(balanceItem1.description).toEqual('test description');
                 expect(balanceItem1.organizationId).toEqual(organization.id);
@@ -421,7 +423,7 @@ describe('E2E.ChargeMembers', () => {
 
             const body = ChargeRequest.create({
                 description: 'test description',
-                price: 3,
+                price: 3_00,
                 amount: 4,
                 dueAt: new Date(2023, 0, 10),
                 createdAt: new Date(2023, 0, 4),

package/tests/e2e/documents.test.ts

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Group, Member, Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { Group, Member, Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { Document, DocumentTemplateFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriodFactory, Registration, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { IDRegisterCart, IDRegisterCheckout, IDRegisterItem, MemberDetails, MemberWithRegistrationsBlob, PaymentMethod } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
@@ -12,6 +12,7 @@ import { testServer } from '../helpers/TestServer.js';
 import { initAdmin } from '../init/initAdmin.js';
 import { initStripe } from '../init/initStripe.js';
 import { registrationUpdateQueue } from '../../src/services/BalanceItemService.js';
+import { initMembershipOrganization } from '../init/initMembershipOrganization.js';
 
 const baseUrl = `/members/register`;
 
@@ -42,6 +43,8 @@ describe('E2E.Documents', () => {
             endDate: new Date(2030, 11, 31),
             previousPeriodId: previousPeriod.id,
         }).create();
+
+        await initMembershipOrganization();
     });
 
     beforeEach(async () => {

package/tests/e2e/register.test.ts

@@ -1,17 +1,16 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod} from '@stamhoofd/models';
+import type { MemberWithUsersRegistrationsAndGroups, Organization, RegistrationPeriod } from '@stamhoofd/models';
 import { BalanceItemFactory, GroupFactory, MemberFactory, OrganizationFactory, OrganizationRegistrationPeriod, Platform, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AdministrationFeeSettings, BalanceItemCartItem, BalanceItemRelation, BalanceItemRelationType, BalanceItemStatus, BalanceItemType, BooleanStatus, DefaultAgeGroup, FreeContributionSettings, GroupOption, GroupOptionMenu, IDRegisterCart, IDRegisterCheckout, IDRegisterItem, PaymentMethod, PermissionLevel, Permissions, PlatformMembershipType, PlatformMembershipTypeConfig, ReceivableBalanceType, ReduceablePrice, RegisterItemOption, TranslatedString, Version } from '@stamhoofd/structures';
+import { TestUtils } from '@stamhoofd/test-utils';
 import { v4 as uuidv4 } from 'uuid';
 import { GetMemberFamilyEndpoint } from '../../src/endpoints/global/members/GetMemberFamilyEndpoint.js';
 import { RegisterMembersEndpoint } from '../../src/endpoints/global/registration/RegisterMembersEndpoint.js';
-import { GetMemberBalanceEndpoint } from '../../src/endpoints/organization/dashboard/payments/GetMemberBalanceEndpoint.js';
 import { GetReceivableBalanceEndpoint } from '../../src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint.js';
-import { PlatformMembershipService } from '../../src/services/PlatformMembershipService.js';
-import { testServer } from '../helpers/TestServer.js';
-import { TestUtils } from '@stamhoofd/test-utils';
 import { BalanceItemService } from '../../src/services/BalanceItemService.js';
+import { PlatformMembershipService } from '../../src/services/PlatformMembershipService.js';
 import { assertBalances } from '../assertions/assertBalances.js';
+import { testServer } from '../helpers/TestServer.js';
 
 describe('E2E.Register', () => {
     const registerEndpoint = new RegisterMembersEndpoint();
@@ -442,8 +441,8 @@ describe('E2E.Register', () => {
                 totalPrice: 5800,
             });
 
-            const receivableBalanceBefore = await getReceivableBalance(ReceivableBalanceType.user, user.id, organization
-                , token);
+            const receivableBalanceBefore = await getReceivableBalance(ReceivableBalanceType.user, user.id, organization,
+                token);
             expect(receivableBalanceBefore).toBeDefined();
             expect(receivableBalanceBefore.body.balanceItems.length).toBe(0);
             expect(receivableBalanceBefore.body.amountOpen).toBe(0);
@@ -1197,8 +1196,7 @@ describe('E2E.Register', () => {
                 expect(trialUntil!.getFullYear()).toBe(2023);
                 expect(trialUntil!.getMonth()).toBe(4);
                 expect(trialUntil!.getDate()).toBe(19);
-            }
-            finally {
+            } finally {
                 vitest.useRealTimers().resetAllMocks();
             }
         });

package/tests/e2e/stock.test.ts

@@ -1,4 +1,3 @@
-
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
@@ -12,6 +11,7 @@ import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/das
 import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint.js';
 import { StripeMocker } from '../helpers/StripeMocker.js';
 import { testServer } from '../helpers/TestServer.js';
+import { initMembershipOrganization } from '../init/initMembershipOrganization.js';
 
 const address = Address.create({
     street: 'Demostraat',
@@ -157,8 +157,7 @@ describe('E2E.Stock', () => {
             for (const price of productPrices) {
                 if (item.productPrice.id == price.id) {
                     expect(item.reservedPrices.get(price.id)).toBe(item.amount);
-                }
-                else {
+                } else {
                     expect(item.reservedPrices.get(price.id) ?? 0).toBe(0);
                 }
             }
@@ -255,6 +254,8 @@ describe('E2E.Stock', () => {
             }),
         }).create();
         token = await Token.createToken(user);
+
+        await initMembershipOrganization();
     });
 
     afterAll(() => {

package/tests/e2e/tickets.test.ts

@@ -1,7 +1,7 @@
 import type { PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization, StripeAccount, Webshop} from '@stamhoofd/models';
+import type { Organization, StripeAccount, Webshop } from '@stamhoofd/models';
 import { OrganizationFactory, Ticket, Token, UserFactory, WebshopFactory } from '@stamhoofd/models';
 import { Cart, CartItem, CartReservedSeat, Customer, OrderData, OrderStatus, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivateOrder, PrivatePaymentConfiguration, Product, ProductType, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, WebshopMetaData, WebshopPrivateMetaData, WebshopTicketType } from '@stamhoofd/structures';