@stamhoofd/backend 2.115.1 → 2.117.0

package/src/sql-sorters/tickets.ts

@@ -12,7 +12,7 @@ export const ticketSorters: SQLSortDefinitions<Ticket> = {
     // What if you need mapping? simply map the sorters in the frontend: name -> firstname, lastname, age -> birthDay, etc.
     createdAt: {
         getValue(a) {
-            return Formatter.dateTimeIso(a.createdAt);
+            return Formatter.dateTimeIso(a.createdAt, 'UTC');
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({
@@ -23,7 +23,7 @@ export const ticketSorters: SQLSortDefinitions<Ticket> = {
     },
     updatedAt: {
         getValue(a) {
-            return Formatter.dateTimeIso(a.updatedAt);
+            return Formatter.dateTimeIso(a.updatedAt, 'UTC');
         },
         toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
             return new SQLOrderBy({

package/tests/actions/patchOrganizationMember.ts

@@ -2,9 +2,9 @@ import { AutoEncoderPatchType, PatchableArray } from '@simonbackx/simple-encodin
 import { Request } from '@simonbackx/simple-endpoints';
 import { Organization } from '@stamhoofd/models';
 import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
-import { PatchOrganizationMembersEndpoint } from '../../src/endpoints/global/members/PatchOrganizationMembersEndpoint';
-import { testServer } from '../helpers/TestServer';
-import { initAdmin } from '../init/initAdmin';
+import { PatchOrganizationMembersEndpoint } from '../../src/endpoints/global/members/PatchOrganizationMembersEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
+import { initAdmin } from '../init/initAdmin.js';
 
 export async function patchOrganizationMember({ patch, organization }: { patch: AutoEncoderPatchType<MemberWithRegistrationsBlob>; organization: Organization }) {
     expect(patch.id).toBeString();

package/tests/actions/patchPaymentStatus.ts

@@ -1,10 +1,10 @@
 import { PatchableArray } from '@simonbackx/simple-encoding';
 import { PaymentStatus, PaymentGeneral } from '@stamhoofd/structures';
-import { PatchPaymentsEndpoint } from '../../src/endpoints/organization/dashboard/payments/PatchPaymentsEndpoint';
-import { testServer } from '../helpers/TestServer';
+import { PatchPaymentsEndpoint } from '../../src/endpoints/organization/dashboard/payments/PatchPaymentsEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
 import { Request } from '@simonbackx/simple-endpoints';
 import { Organization } from '@stamhoofd/models';
-import { initAdmin } from '../init/initAdmin';
+import { initAdmin } from '../init/initAdmin.js';
 
 export async function changePaymentStatus({ payment, organization, status }: { payment: { id: string }; organization: Organization; status: PaymentStatus }) {
     expect(payment.id).toBeString();

package/tests/actions/patchUserMember.ts

@@ -2,8 +2,8 @@ import { AutoEncoderPatchType, PatchableArray } from '@simonbackx/simple-encodin
 import { Request } from '@simonbackx/simple-endpoints';
 import { Organization, Token, User } from '@stamhoofd/models';
 import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
-import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint';
-import { testServer } from '../helpers/TestServer';
+import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
 
 export async function patchUserMember({ patch, organization, user }: { patch: AutoEncoderPatchType<MemberWithRegistrationsBlob>; organization: Organization; user: User }) {
     expect(patch.id).toBeString();

package/tests/assertions/assertBalances.ts

@@ -1,5 +1,5 @@
 import { BalanceItem } from '@stamhoofd/models';
-import { BalanceItemService } from '../../src/services/BalanceItemService';
+import { BalanceItemService } from '../../src/services/BalanceItemService.js';
 
 export async function assertBalances(
     selector:

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

@@ -5,9 +5,9 @@ import { Organization, OrganizationFactory, Token, UserFactory } from '@stamhoof
 import { PatchMap } from '@simonbackx/simple-encoding';
 import { ApiUser, ApiUserRateLimits, PermissionLevel, Permissions, PermissionsResourceType, ResourcePermissions, UserMeta, UserPermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { CreateApiUserEndpoint } from '../../src/endpoints/organization/dashboard/users/CreateApiUserEndpoint';
-import { testServer } from '../helpers/TestServer';
-import { GetUserEndpoint } from '../../src/endpoints/auth/GetUserEndpoint';
+import { CreateApiUserEndpoint } from '../../src/endpoints/organization/dashboard/users/CreateApiUserEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
+import { GetUserEndpoint } from '../../src/endpoints/auth/GetUserEndpoint.js';
 
 describe('E2E.APIRateLimits', () => {
     // Test endpoint

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

@@ -1,10 +1,10 @@
 import { Request, Response } from '@simonbackx/simple-endpoints';
 import { GroupFactory, MemberFactory, Organization, OrganizationFactory, RegistrationFactory, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
-import { AccessRight, BalanceItemWithPayments, ChargeMembersRequest, LimitedFilteredRequest, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, StamhoofdFilter, Version } from '@stamhoofd/structures';
+import { AccessRight, BalanceItemWithPayments, ChargeRequest, LimitedFilteredRequest, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions, StamhoofdFilter, Version } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
-import { ChargeMembersEndpoint } from '../../src/endpoints/admin/members/ChargeMembersEndpoint';
-import { testServer } from '../helpers/TestServer';
-import { GetReceivableBalanceEndpoint } from '../../src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint';
+import { ChargeMembersEndpoint } from '../../src/endpoints/admin/members/ChargeMembersEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
+import { GetReceivableBalanceEndpoint } from '../../src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint.js';
 
 describe('E2E.ChargeMembers', () => {
     const chargeMembersEndpoint = new ChargeMembersEndpoint();
@@ -16,7 +16,7 @@ describe('E2E.ChargeMembers', () => {
     let financialDirectorRole: PermissionRoleDetailed;
     let financialDirectorRoleOfOtherOrganization: PermissionRoleDetailed;
 
-    const postCharge = async (filter: StamhoofdFilter, organization: Organization, body: ChargeMembersRequest, token: Token) => {
+    const postCharge = async (filter: StamhoofdFilter, organization: Organization, body: ChargeRequest, token: Token) => {
         const request = Request.buildJson('POST', `/v${Version}/admin/charge-members`, organization.getApiHost(), body);
         const filterRequest = new LimitedFilteredRequest({
             filter,
@@ -105,7 +105,7 @@ describe('E2E.ChargeMembers', () => {
             },
         };
 
-        const body = ChargeMembersRequest.create({
+        const body = ChargeRequest.create({
             description: 'test description',
             price: 3,
             amount: 4,
@@ -169,7 +169,7 @@ describe('E2E.ChargeMembers', () => {
             },
         };
 
-        const body = ChargeMembersRequest.create({
+        const body = ChargeRequest.create({
             description: 'test description',
             price: 3,
             amount: 4,
@@ -233,7 +233,7 @@ describe('E2E.ChargeMembers', () => {
 
         const otherFinancialDirectorToken = await Token.createToken(otherFinancialDirector);
 
-        const body = ChargeMembersRequest.create({
+        const body = ChargeRequest.create({
             description: 'test description',
             price: 3,
             amount: 4,
@@ -270,9 +270,9 @@ describe('E2E.ChargeMembers', () => {
             },
         };
 
-        const testCases: [body: ChargeMembersRequest, expectedErrorMessage: string][] = [
+        const testCases: [body: ChargeRequest, expectedErrorMessage: string][] = [
             // empty description
-            [ChargeMembersRequest.create({
+            [ChargeRequest.create({
                 description: ' ',
                 price: 3,
                 amount: 4,
@@ -281,7 +281,7 @@ describe('E2E.ChargeMembers', () => {
             }), 'Invalid description'],
 
             // price 0
-            [ChargeMembersRequest.create({
+            [ChargeRequest.create({
                 description: 'test description',
                 price: 0,
                 amount: 4,
@@ -290,7 +290,7 @@ describe('E2E.ChargeMembers', () => {
             }), 'Invalid price'],
 
             // amount 0
-            [ChargeMembersRequest.create({
+            [ChargeRequest.create({
                 description: 'test description',
                 price: 3,
                 amount: 0,
@@ -348,7 +348,7 @@ describe('E2E.ChargeMembers', () => {
                 },
             };
 
-            const body = ChargeMembersRequest.create({
+            const body = ChargeRequest.create({
                 description: 'test description',
                 price: 3,
                 amount: 4,
@@ -417,7 +417,7 @@ describe('E2E.ChargeMembers', () => {
                 },
             };
 
-            const body = ChargeMembersRequest.create({
+            const body = ChargeRequest.create({
                 description: 'test description',
                 price: 3,
                 amount: 4,

package/tests/e2e/documents.test.ts

@@ -3,14 +3,14 @@ import { Document, DocumentTemplateFactory, Group, GroupFactory, Member, MemberF
 import { IDRegisterCart, IDRegisterCheckout, IDRegisterItem, MemberDetails, MemberWithRegistrationsBlob, PaymentMethod } from '@stamhoofd/structures';
 import { TestUtils } from '@stamhoofd/test-utils';
 import { Formatter } from '@stamhoofd/utility';
-import { RegisterMembersEndpoint } from '../../src/endpoints/global/registration/RegisterMembersEndpoint';
-import { patchOrganizationMember } from '../actions/patchOrganizationMember';
-import { markNotPaid, markPaid } from '../actions/patchPaymentStatus';
-import { patchUserMember } from '../actions/patchUserMember';
-import { testServer } from '../helpers/TestServer';
-import { initAdmin } from '../init/initAdmin';
-import { initStripe } from '../init/initStripe';
-import { registrationUpdateQueue } from '../../src/services/BalanceItemService';
+import { RegisterMembersEndpoint } from '../../src/endpoints/global/registration/RegisterMembersEndpoint.js';
+import { patchOrganizationMember } from '../actions/patchOrganizationMember.js';
+import { markNotPaid, markPaid } from '../actions/patchPaymentStatus.js';
+import { patchUserMember } from '../actions/patchUserMember.js';
+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';
 
 const baseUrl = `/members/register`;
 

package/tests/e2e/private-files.test.ts

@@ -4,10 +4,10 @@ import { PatchableArray, PatchableArrayAutoEncoder } from '@simonbackx/simple-en
 import { Request } from '@simonbackx/simple-endpoints';
 import { Member, OrganizationFactory, Token, UserFactory } from '@stamhoofd/models';
 import { PermissionLevel, Permissions } from '@stamhoofd/structures';
-import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint';
-import { testServer } from '../helpers/TestServer';
-import { GetUserMembersEndpoint } from '../../src/endpoints/global/registration/GetUserMembersEndpoint';
-import { FileSignService } from '../../src/services/FileSignService';
+import { PatchUserMembersEndpoint } from '../../src/endpoints/global/registration/PatchUserMembersEndpoint.js';
+import { testServer } from '../helpers/TestServer.js';
+import { GetUserMembersEndpoint } from '../../src/endpoints/global/registration/GetUserMembersEndpoint.js';
+import { FileSignService } from '../../src/services/FileSignService.js';
 
 const baseUrl = `/v${Version}/members`;
 const endpoint = new PatchUserMembersEndpoint();

package/tests/e2e/register.test.ts

@@ -1,16 +1,16 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import { BalanceItemFactory, GroupFactory, MemberFactory, MemberWithRegistrations, Organization, OrganizationFactory, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
+import { BalanceItemFactory, GroupFactory, MemberFactory, MemberWithUsersRegistrationsAndGroups, Organization, OrganizationFactory, OrganizationRegistrationPeriod, Platform, RegistrationPeriod, 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 { v4 as uuidv4 } from 'uuid';
-import { GetMemberFamilyEndpoint } from '../../src/endpoints/global/members/GetMemberFamilyEndpoint';
-import { RegisterMembersEndpoint } from '../../src/endpoints/global/registration/RegisterMembersEndpoint';
-import { GetMemberBalanceEndpoint } from '../../src/endpoints/organization/dashboard/payments/GetMemberBalanceEndpoint';
-import { GetReceivableBalanceEndpoint } from '../../src/endpoints/organization/dashboard/receivable-balances/GetReceivableBalanceEndpoint';
-import { PlatformMembershipService } from '../../src/services/PlatformMembershipService';
-import { testServer } from '../helpers/TestServer';
+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';
-import { assertBalances } from '../assertions/assertBalances';
+import { BalanceItemService } from '../../src/services/BalanceItemService.js';
+import { assertBalances } from '../assertions/assertBalances.js';
 
 describe('E2E.Register', () => {
     const registerEndpoint = new RegisterMembersEndpoint();
@@ -78,7 +78,7 @@ describe('E2E.Register', () => {
 
         const member = await new MemberFactory({ organization, user }).create();
 
-        const otherMembers: MemberWithRegistrations[] = [];
+        const otherMembers: MemberWithUsersRegistrationsAndGroups[] = [];
 
         for (let i = 0; i < otherMemberAmount; i++) {
             otherMembers.push(await new MemberFactory({ organization, user }).create());

package/tests/e2e/stock.test.ts

@@ -7,10 +7,10 @@ import { Order, Organization, OrganizationFactory, StripeAccount, Token, UserFac
 import { Address, Cart, CartItem, CartItemOption, CartReservedSeat, Country, Customer, Option, OptionMenu, OrderData, OrderStatus, PaymentConfiguration, PaymentMethod, PermissionLevel, Permissions, PrivateOrder, PrivatePaymentConfiguration, Product, ProductPrice, ProductType, ReservedSeat, SeatingPlan, SeatingPlanRow, SeatingPlanSeat, SeatingPlanSection, TransferSettings, ValidatedAddress, WebshopDeliveryMethod, WebshopMetaData, WebshopOnSiteMethod, WebshopPrivateMetaData, WebshopTakeoutMethod, WebshopTimeSlot } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
-import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint';
-import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint';
-import { StripeMocker } from '../helpers/StripeMocker';
-import { testServer } from '../helpers/TestServer';
+import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.js';
+import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint.js';
+import { StripeMocker } from '../helpers/StripeMocker.js';
+import { testServer } from '../helpers/TestServer.js';
 
 const address = Address.create({
     street: 'Demostraat',

package/tests/e2e/tickets.test.ts

@@ -3,10 +3,10 @@ import { Request } from '@simonbackx/simple-endpoints';
 import { Organization, OrganizationFactory, StripeAccount, Ticket, Token, UserFactory, Webshop, 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';
 
-import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint';
-import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint';
-import { StripeMocker } from '../helpers/StripeMocker';
-import { testServer } from '../helpers/TestServer';
+import { PatchWebshopOrdersEndpoint } from '../../src/endpoints/organization/dashboard/webshops/PatchWebshopOrdersEndpoint.js';
+import { PlaceOrderEndpoint } from '../../src/endpoints/organization/webshops/PlaceOrderEndpoint.js';
+import { StripeMocker } from '../helpers/StripeMocker.js';
+import { testServer } from '../helpers/TestServer.js';
 
 const customer = Customer.create({
     firstName: 'John',

package/tests/helpers/TestServer.ts

@@ -2,8 +2,8 @@ import { TestServer } from '@simonbackx/simple-endpoints';
 import { VersionMiddleware } from '@stamhoofd/backend-middleware';
 import { Version } from '@stamhoofd/structures';
 
-import { ContextMiddleware } from '../../src/middleware/ContextMiddleware';
-import { FileSignService } from '../../src/services/FileSignService';
+import { ContextMiddleware } from '../../src/middleware/ContextMiddleware.js';
+import { FileSignService } from '../../src/services/FileSignService.js';
 
 export const testServer = new TestServer();
 

package/tests/init/index.ts

@@ -1,7 +1,7 @@
-export * from './initAdmin';
-export * from './initPlatformAdmin';
-export * from './initPayconiq';
-export * from './initBundleDiscount';
-export * from './initStripe';
-export * from './initPermissionRole';
-export * from './initUitpasApi';
+export * from './initAdmin.js';
+export * from './initPlatformAdmin.js';
+export * from './initPayconiq.js';
+export * from './initBundleDiscount.js';
+export * from './initStripe.js';
+export * from './initPermissionRole.js';
+export * from './initUitpasApi.js';

package/tests/init/initAdmin.ts

@@ -1,6 +1,6 @@
 import { Organization, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, PermissionLevel, PermissionRole, Permissions } from '@stamhoofd/structures';
-import { initPermissionRole } from './initPermissionRole';
+import { initPermissionRole } from './initPermissionRole.js';
 
 /**
  * You cannot assign access rights directy to a user, but it can be done using roles. So when setting accessRights, a role wil be created and assigned to the user.

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

@@ -1,67 +0,0 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { SimpleError } from '@simonbackx/simple-errors';
-import { Group, Member, Payment, Registration } from '@stamhoofd/models';
-import { PaymentWithRegistrations } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
-
-import { Context } from '../../../helpers/Context';
-type Params = { id: string };
-type Query = undefined;
-type Body = undefined;
-type ResponseBody = PaymentWithRegistrations | undefined;
-
-export class GetPaymentRegistrations extends Endpoint<Params, Query, Body, ResponseBody> {
-    protected doesMatch(request: Request): [true, Params] | [false] {
-        if (request.method !== 'GET') {
-            return [false];
-        }
-
-        const params = Endpoint.parseParameters(request.url, '/payments/@id/registrations', { id: String });
-
-        if (params) {
-            return [true, params as Params];
-        }
-        return [false];
-    }
-
-    async handle(request: DecodedRequest<Params, Query, Body>) {
-        await Context.setUserOrganizationScope();
-        const { user } = await Context.authenticate();
-
-        const payment = await Payment.getByID(request.params.id);
-        if (!payment) {
-            throw new SimpleError({
-                code: '',
-                message: $t(`35b369bd-5766-41d1-8da3-3d362e316c1a`),
-            });
-        }
-        const registrations = await Member.getRegistrationWithMembersForPayment(payment.id);
-        const authorizedMembers = (await Member.getMembersWithRegistrationForUser(user)).map(m => m.id);
-        const groups = await Group.getByIDs(...Formatter.uniqueArray(registrations.map(r => r.groupId)));
-
-        // Check permissions
-        for (const registration of registrations) {
-            if (!authorizedMembers.includes(registration.member.id)) {
-                throw new SimpleError({
-                    code: '',
-                    message: $t(`35b369bd-5766-41d1-8da3-3d362e316c1a`),
-                });
-            }
-        }
-
-        return new Response(
-            PaymentWithRegistrations.create({
-                id: payment.id,
-                method: payment.method,
-                status: payment.status,
-                price: payment.price,
-                freeContribution: payment.freeContribution,
-                transferDescription: payment.transferDescription,
-                paidAt: payment.paidAt,
-                createdAt: payment.createdAt,
-                updatedAt: payment.updatedAt,
-                registrations: registrations.map(r => Member.getRegistrationWithTinyMemberStructure(r.setRelation(Registration.group, groups.find(g => g.id === r.groupId)!))),
-            }),
-        );
-    }
-}