@stamhoofd/backend 2.121.0 → 2.122.0

package/src/endpoints/global/payments/StripeWebhookEndpoint.ts

@@ -1,6 +1,6 @@
-import type { Decoder} from '@simonbackx/simple-encoding';
+import type { Decoder } from '@simonbackx/simple-encoding';
 import { AnyDecoder, AutoEncoder, field, StringDecoder } 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 { Organization, StripeAccount, StripeCheckoutSession, StripePaymentIntent } from '@stamhoofd/models';
@@ -74,8 +74,7 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
                 });
             }
             event = await stripe.webhooks.constructEventAsync(await request.request.bodyPromise!, sig, secret);
-        }
-        catch (err) {
+        } catch (err) {
             throw new SimpleError({
                 code: 'invalid_signature',
                 message: 'Invalid signature',
@@ -96,8 +95,7 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
                             model.setMetaFromStripeAccount(account);
                             await model.save();
                         });
-                    }
-                    else {
+                    } else {
                         console.warn('Could not find stripe account with id', id);
                     }
                 }
@@ -126,8 +124,7 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
                 const [model] = await StripeCheckoutSession.where({ stripeSessionId: checkoutId }, { limit: 1 });
                 if (model && model.organizationId) {
                     await this.checkDebounced(model.paymentId, model.organizationId);
-                }
-                else {
+                } else {
                     console.warn('Could not find stripe checkout session with id', checkoutId);
                 }
                 break;
@@ -148,8 +145,7 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
                 const intentId = request.body.data.object.payment_intent;
                 if (intentId && typeof intentId === 'string') {
                     await this.updateIntent(intentId);
-                }
-                else {
+                } else {
                     console.log('Received charge event without payment intent', request.body);
                 }
                 break;
@@ -170,13 +166,11 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
                 const organization = await Organization.getByID(organizationId);
                 if (organization) {
                     await PaymentService.pollStatus(paymentId, organization);
-                }
-                else {
+                } else {
                     console.warn('Could not find organization with id', organizationId);
                 }
             }, 1000);
-        }
-        catch (e) {
+        } catch (e) {
             if (isDebouncedError(e)) {
                 // Okay, we are debounced (new request came in)
                 console.log('Debounced', paymentId);
@@ -191,8 +185,7 @@ export class StripeWebookEndpoint extends Endpoint<Params, Query, Body, Response
         const [model] = await StripePaymentIntent.where({ stripeIntentId: intentId }, { limit: 1 });
         if (model && model.organizationId) {
             await this.checkDebounced(model.paymentId, model.organizationId);
-        }
-        else {
+        } else {
             console.warn('Could not find stripe payment intent with id', intentId);
         }
     }

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

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { User } from '@stamhoofd/models';
 import { OrganizationAdmins } from '@stamhoofd/structures';

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

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Platform } from '@stamhoofd/models';
 import type { Platform as PlatformStruct } from '@stamhoofd/structures';

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

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { Organization} from '@stamhoofd/models';
+import type { Organization } from '@stamhoofd/models';
 import { OrganizationFactory, Platform, RegistrationPeriod, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { PermissionLevel, Permissions, PlatformConfig, Platform as PlatformStruct, Version } from '@stamhoofd/structures';
 

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

@@ -7,7 +7,7 @@ import type { EventNotificationType, MemberResponsibility, PlatformConfig, Platf
 import { Platform as PlatformStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
-import { QueueHandler } from '@stamhoofd/queues';
+import { isAbortedError, isCanceledError, QueueHandler } from '@stamhoofd/queues';
 import { Context } from '../../../helpers/Context.js';
 import { MembershipCharger } from '../../../helpers/MembershipCharger.js';
 import { MemberUserSyncer } from '../../../helpers/MemberUserSyncer.js';
@@ -113,7 +113,7 @@ export class PatchPlatformEndpoint extends Endpoint<
                     platform.config.eventNotificationTypes,
                     request.body.config.eventNotificationTypes,
                     'recordCategories',
-                )
+                );
             }
 
             const newConfig = request.body.config;
@@ -131,8 +131,7 @@ export class PatchPlatformEndpoint extends Endpoint<
                         newConfig,
                         oldConfig,
                     );
-                }
-                else {
+                } else {
                     platform.config = patchObject(platform.config, newConfig);
                 }
             }
@@ -209,8 +208,7 @@ export class PatchPlatformEndpoint extends Endpoint<
                     });
                 }
                 platform.membershipOrganizationId = organization.id;
-            }
-            else {
+            } else {
                 platform.membershipOrganizationId = null;
             }
         }
@@ -229,8 +227,7 @@ export class PatchPlatformEndpoint extends Endpoint<
                     });
                 }
                 platform.membershipOrganizationId = organization.id;
-            }
-            else {
+            } else {
                 platform.membershipOrganizationId = null;
             }
         }
@@ -250,13 +247,16 @@ export class PatchPlatformEndpoint extends Endpoint<
         }
 
         if (shouldUpdateTags) {
-            await TagHelper.updateOrganizations();
+            try {
+                await TagHelper.updateOrganizations();
+            } catch (e) {
+                if (!isAbortedError(e) && !isCanceledError(e)) throw e;
+            }
         }
 
         if (shouldMoveToPeriod) {
             PeriodHelper.moveAllOrganizationsToPeriod(shouldMoveToPeriod).catch(console.error);
-        }
-        else if (shouldUpdateSetupSteps) {
+        } else if (shouldUpdateSetupSteps) {
             // Do not call this right away when moving to a period, because this needs to happen AFTER moving to the period
             SetupStepUpdater.updateSetupStepsForAllOrganizationsInCurrentPeriod().catch(console.error);
         }

package/src/endpoints/global/platform-memberships/GetPlatformMembershipsCountEndpoint.ts

@@ -8,40 +8,40 @@ import { GetPlatformMembershipsEndpoint } from './GetPlatformMembershipsEndpoint
 type Params = Record<string, never>;
 type Query = CountFilteredRequest;
 type Body = undefined;
-type ResponseBody = CountResponse
+type ResponseBody = CountResponse;
 
 export class GetPlatformMembershipsCountEndpoint 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, '/platform-memberships/count', {});
-   
-           if (params) {
-               return [true, params as Params];
-           }
-           return [false];
-       }
-   
-       async handle(request: DecodedRequest<Params, Query, Body>) {
-           await Context.authenticate();
-
-            if (!Context.auth.hasPlatformFullAccess()) {
-                throw Context.auth.error();
-            }
-                  
-           const query = await GetPlatformMembershipsEndpoint.buildQuery(request.query);
-   
-           const count = await query
-               .count();
-   
-           return new Response(
-               CountResponse.create({
-                   count,
-               }),
-           );
-       }
+        if (request.method !== 'GET') {
+            return [false];
+        }
+
+        const params = Endpoint.parseParameters(request.url, '/platform-memberships/count', {});
+
+        if (params) {
+            return [true, params as Params];
+        }
+        return [false];
+    }
+
+    async handle(request: DecodedRequest<Params, Query, Body>) {
+        await Context.authenticate();
+
+        if (!Context.auth.hasPlatformFullAccess()) {
+            throw Context.auth.error();
+        }
+
+        const query = await GetPlatformMembershipsEndpoint.buildQuery(request.query);
+
+        const count = await query
+            .count();
+
+        return new Response(
+            CountResponse.create({
+                count,
+            }),
+        );
+    }
 }

package/src/endpoints/global/platform-memberships/GetPlatformMembershipsEndpoint.ts

@@ -16,7 +16,6 @@ type Query = LimitedFilteredRequest;
 type Body = undefined;
 type ResponseBody = PaginatedResponse<PlatformMembership[], LimitedFilteredRequest>;
 
-
 const sorters = platformMembershipSorters;
 const filterCompilers = platformMembershipFilterCompilers;
 
@@ -37,9 +36,9 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
     }
 
     static async buildQuery(q: CountFilteredRequest | LimitedFilteredRequest) {
-       if (!Context.auth.hasPlatformFullAccess()) {
-           throw Context.auth.error();
-       }
+        if (!Context.auth.hasPlatformFullAccess()) {
+            throw Context.auth.error();
+        }
 
         const query = MemberPlatformMembership.select()
             .setMaxExecutionTime(15 * 1000)
@@ -77,21 +76,21 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
         if (search.match(/^\d{4}-\d{6}-\d{1,2}$/) || search.match(/^\d{9,10}$/)) {
             return {
                 member: {
-                        memberNumber: {
+                    memberNumber: {
                         $eq: search,
                     },
-                    
-                }
+
+                },
             };
         }
 
         return {
-                member: {
-                    name: {
-                        $contains: search,
-                    }
-                }
-            };
+            member: {
+                name: {
+                    $contains: search,
+                },
+            },
+        };
     }
 
     static async buildData(requestQuery: LimitedFilteredRequest) {
@@ -101,8 +100,7 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',
@@ -118,7 +116,7 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
         const balanceItemIds = Formatter.uniqueArray(data.map(d => d.balanceItemId));
         const members = await Member.getByIDs(...memberIds);
         const organizations = await Organization.getByIDs(...organizationIds);
-        const balanceItems = await BalanceItem.getByIDs(...balanceItemIds)
+        const balanceItems = await BalanceItem.getByIDs(...balanceItemIds);
         const balanceItemStructures = await BalanceItem.getStructureWithPayments(balanceItems);
 
         const results: PlatformMembership[] = [];
@@ -149,7 +147,7 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
                 ...model,
                 balanceItem: balanceItem,
                 member: PlatformMembershipMemberDetails.create(member),
-                organization: PlatformMembershipOrganizationDetails.create(organization)
+                organization: PlatformMembershipOrganizationDetails.create(organization),
             }));
         }
 
@@ -182,9 +180,9 @@ export class GetPlatformMembershipsEndpoint extends Endpoint<Params, Query, Body
     async handle(request: DecodedRequest<Params, Query, Body>) {
         await Context.authenticate();
 
-       if (!Context.auth.hasPlatformFullAccess()) {
-           throw Context.auth.error();
-       }
+        if (!Context.auth.hasPlatformFullAccess()) {
+            throw Context.auth.error();
+        }
 
         const maxLimit = 1000;
 

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

@@ -1,5 +1,5 @@
 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 { CountFilteredRequest, CountResponse } from '@stamhoofd/structures';
 

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

@@ -1,5 +1,5 @@
 import { Request } from '@simonbackx/simple-endpoints';
-import type { RegistrationPeriod} from '@stamhoofd/models';
+import type { RegistrationPeriod } from '@stamhoofd/models';
 import { EventFactory, GroupFactory, MemberFactory, OrganizationFactory, RegistrationFactory, RegistrationPeriodFactory, Token, UserFactory } from '@stamhoofd/models';
 import { AccessRight, EventMeta, GroupType, LimitedFilteredRequest, NamedObject, PermissionLevel, PermissionRoleDetailed, Permissions, PermissionsResourceType, ResourcePermissions } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';

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

@@ -1,9 +1,9 @@
 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 { Group, Member, Platform, Registration } from '@stamhoofd/models';
-import type { SQLExpression, SQLSortDefinitions} from '@stamhoofd/sql';
+import type { SQLExpression, SQLSortDefinitions } from '@stamhoofd/sql';
 import { SQL, SQLSelect, applySQLSorter, compileToSQLFilter } from '@stamhoofd/sql';
 import type { CountFilteredRequest, RegistrationWithMemberBlob, StamhoofdFilter, RegistrationsBlob } from '@stamhoofd/structures';
 import { GroupType, LimitedFilteredRequest, PaginatedResponse, PermissionLevel, assertSort } from '@stamhoofd/structures';
@@ -108,8 +108,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
                                 },
                             },
                         };
-                    }
-                    else {
+                    } else {
                         // Can only access current period
                         scopeFilter = {
                             member: {
@@ -122,8 +121,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
                             },
                         };
                     }
-                }
-                else {
+                } else {
                     // Check which normal membership groups we have access to and filter on those
                     const groups = await Group.getAll(organization.id, organization.periodId, true, [GroupType.Membership, GroupType.WaitingList]);
                     Context.auth.cacheGroups(groups);
@@ -202,8 +200,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
 
         try {
             data = await query.fetch();
-        }
-        catch (error) {
+        } catch (error) {
             if (error.message.includes('ER_QUERY_TIMEOUT')) {
                 throw new SimpleError({
                     code: 'timeout',
@@ -217,8 +214,7 @@ export class GetRegistrationsEndpoint extends Endpoint<Params, Query, Body, Resp
         for (const registration of data) {
             if (registration.group.settings.implicitlyAllowViewRegistrations) {
                 // okay, only need to check if we can access the members (next step)
-            }
-            else {
+            } else {
                 if (!await Context.auth.canAccessRegistration(registration, permissionLevel)) {
                     throw Context.auth.error();
                 }

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

@@ -1,12 +1,13 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
-import type { Payment } from '@stamhoofd/models';
+import { BalanceItemPayment, Payment } from '@stamhoofd/models';
 import { BalanceItem, Member, Organization } from '@stamhoofd/models';
-import { DetailedPayableBalanceCollection, DetailedPayableBalance } from '@stamhoofd/structures';
+import { DetailedPayableBalanceCollection, DetailedPayableBalance, PaymentStatus } from '@stamhoofd/structures';
 
 import { Formatter } from '@stamhoofd/utility';
 import { AuthenticatedStructures } from '../../../helpers/AuthenticatedStructures.js';
 import { Context } from '../../../helpers/Context.js';
+import { SQL, SQLWhereExists } from '@stamhoofd/sql';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -38,7 +39,35 @@ export class GetUserDetailedPayableBalanceEndpoint extends Endpoint<Params, Quer
         const balanceItemModels = await BalanceItem.balanceItemsForUsersAndMembers(organization?.id ?? null, [user.id], memberIds);
 
         // todo: this is a duplicate query
-        const { payments, balanceItemPayments } = await BalanceItem.loadPayments(balanceItemModels);
+        const q = Payment.select()
+            .where(
+                SQL.where('payingUserId', user.id)
+                    .or(
+                        new SQLWhereExists(SQL.subQuery(
+                            SQL.select().from('balance_items')
+                                .join(SQL.innerJoin(
+                                    SQL.table(BalanceItemPayment.table))
+                                    .where(
+                                        SQL.column(BalanceItemPayment.table, 'balanceItemId'),
+                                        SQL.column(BalanceItem.table, 'id'),
+                                    ),
+                                )
+                                .where(SQL.where('memberId', memberIds).or('userId', user.id))
+                                .where(SQL.column(BalanceItemPayment.table, 'paymentId'), SQL.column(Payment.table, 'id')),
+                        ),
+                        ),
+                    ),
+            )
+            .whereNot('status', PaymentStatus.Failed);
+
+        if (organization) {
+            q.where('organizationId', organization.id);
+        }
+
+        q.orderBy('createdAt', 'DESC');
+        q.limit(100);
+
+        const payments = await q.fetch();
 
         return new Response(await GetUserDetailedPayableBalanceEndpoint.getDetailedBillingStatus(balanceItemModels, payments));
     }
@@ -71,8 +100,8 @@ export class GetUserDetailedPayableBalanceEndpoint extends Endpoint<Params, Quer
         }
 
         const balanceItems = await BalanceItem.getStructureWithPayments(balanceItemModels);
-        const organizations = await AuthenticatedStructures.organizations(organizationModels);
-        const payments = await AuthenticatedStructures.paymentsGeneral(paymentModels, false);
+        const organizations = await AuthenticatedStructures.baseOrganizations(organizationModels);
+        const payments = await AuthenticatedStructures.payments(paymentModels);
 
         return DetailedPayableBalanceCollection.create({
             organizations: organizations.map((o) => {

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

@@ -1,7 +1,7 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Document, DocumentTemplate, Member } from '@stamhoofd/models';
-import type { Document as DocumentStruct} from '@stamhoofd/structures';
+import type { Document as DocumentStruct } from '@stamhoofd/structures';
 import { DocumentStatus } from '@stamhoofd/structures';
 import { Sorter } from '@stamhoofd/utility';
 

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

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { Member } from '@stamhoofd/models';
 import type { MembersBlob } from '@stamhoofd/structures';

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

@@ -1,4 +1,4 @@
-import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request } from '@simonbackx/simple-endpoints';
 import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { CachedBalance, Organization } from '@stamhoofd/models';
 import { PayableBalance, PayableBalanceCollection, ReceivableBalanceType } from '@stamhoofd/structures';

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

@@ -1,9 +1,9 @@
 import { Database } from '@simonbackx/simple-database';
 import { PatchableArray, PatchMap } from '@simonbackx/simple-encoding';
-import type { Endpoint} from '@simonbackx/simple-endpoints';
+import type { Endpoint } from '@simonbackx/simple-endpoints';
 import { Request } from '@simonbackx/simple-endpoints';
 import { GroupFactory, Member, MemberFactory, OrganizationFactory, Platform, RegistrationFactory, Token, UserFactory } from '@stamhoofd/models';
-import type { PatchAnswers} from '@stamhoofd/structures';
+import type { PatchAnswers } from '@stamhoofd/structures';
 import { MemberDetails, MemberWithRegistrationsBlob, OrganizationMetaData, OrganizationRecordsConfiguration, Parent, PermissionLevel, RecordCategory, RecordSettings, RecordTextAnswer, TranslatedString, UitpasNumberDetails, UitpasSocialTariff, UitpasSocialTariffStatus } from '@stamhoofd/structures';
 import { STExpect, TestUtils } from '@stamhoofd/test-utils';
 import { testServer } from '../../../../tests/helpers/TestServer.js';

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

@@ -1,11 +1,11 @@
-import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder} from '@simonbackx/simple-encoding';
+import type { AutoEncoderPatchType, Decoder, PatchableArrayAutoEncoder } from '@simonbackx/simple-encoding';
 import { isEmptyPatch, PatchableArrayDecoder, StringDecoder } 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 type { Group, Registration } from '@stamhoofd/models';
 import { Document, Member, RateLimiter } from '@stamhoofd/models';
-import type { MemberDetails, MembersBlob} from '@stamhoofd/structures';
+import type { MemberDetails, MembersBlob } from '@stamhoofd/structures';
 import { MemberWithRegistrationsBlob } from '@stamhoofd/structures';
 
 import type { OneToManyRelation } from '@simonbackx/simple-database';

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/);
         });
     });