@stamhoofd/backend 2.63.0 → 2.65.0

package/src/endpoints/global/members/PatchOrganizationMembersEndpoint.ts

@@ -2,7 +2,7 @@ import { OneToManyRelation } from '@simonbackx/simple-database';
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
-import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, User } from '@stamhoofd/models';
+import { BalanceItem, Document, Group, Member, MemberFactory, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, mergeTwoMembers, Organization, Platform, RateLimiter, Registration, RegistrationPeriod, User } from '@stamhoofd/models';
 import { GroupType, MembersBlob, MemberWithRegistrationsBlob, PermissionLevel } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
 
@@ -218,7 +218,6 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     });
                 }
 
-                const platform = await Platform.getShared();
                 const responsibility = platform.config.responsibilities.find(r => r.id === patchResponsibility.responsibilityId);
 
                 if (responsibility && !responsibility.organizationBased && !Context.auth.hasPlatformFullAccess()) {
@@ -261,7 +260,6 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     throw Context.auth.error('Je hebt niet voldoende rechten om functies van leden aan te passen');
                 }
 
-                const platform = await Platform.getShared();
                 const platformResponsibility = platform.config.responsibilities.find(r => r.id === put.responsibilityId);
                 const org = organization ?? (put.organizationId ? await Organization.getByID(put.organizationId) : null);
 
@@ -414,12 +412,25 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
             // Add platform memberships
             for (const { put } of patch.platformMemberships.getPuts()) {
                 if (put.periodId !== platform.periodId) {
-                    throw new SimpleError({
-                        code: 'invalid_field',
-                        message: 'Invalid period',
-                        human: 'Je kan geen aansluitingen maken voor een andere werkjaar dan het actieve werkjaar',
-                        field: 'periodId',
-                    });
+                    const period = await RegistrationPeriod.getByID(put.periodId);
+
+                    if (!period) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in dit werkjaar`),
+                            field: 'periodId',
+                        });
+                    }
+
+                    if (period?.locked) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer toevoegen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            field: 'periodId',
+                        });
+                    }
                 }
 
                 if (organization && put.organizationId !== organization.id) {
@@ -449,6 +460,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     .where('memberId', member.id)
                     .where('membershipTypeId', put.membershipTypeId)
                     .where('periodId', put.periodId)
+                    .where('deletedAt', null)
                     .where(
                         SQL.where(
                             SQL.where('startDate', SQLWhereSign.LessEqual, put.startDate)
@@ -481,7 +493,7 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 membership.organizationId = put.organizationId;
                 membership.periodId = put.periodId;
 
-                membership.startDate = put.startDate;
+                membership.startDate = new Date(Math.max(Date.now(), put.startDate.getTime()));
                 membership.endDate = put.endDate;
                 membership.expireDate = put.expireDate;
 
@@ -509,12 +521,25 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 }
 
                 if (membership.periodId !== platform.periodId) {
-                    throw new SimpleError({
-                        code: 'invalid_field',
-                        message: 'Invalid period',
-                        human: 'Je kan geen aansluitingen meer verwijderen voor een ander werkjaar dan het actieve werkjaar',
-                        field: 'periodId',
-                    });
+                    const period = await RegistrationPeriod.getByID(membership.periodId);
+
+                    if (!period) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in dit werkjaar`),
+                            field: 'periodId',
+                        });
+                    }
+
+                    if (period?.locked) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            message: 'Invalid period',
+                            human: Context.i18n.$t(`Je kan geen aansluitingen meer verwijderen in {period} (vergrendeld)`, { period: period?.getBaseStructure().name }),
+                            field: 'periodId',
+                        });
+                    }
                 }
 
                 if (!membership.canDelete() && !Context.auth.hasPlatformFullAccess()) {

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

@@ -157,6 +157,8 @@ export class PatchPlatformEndpoint extends Endpoint<
             platform.periodId = period.id;
             shouldUpdateSetupSteps = true;
             shouldMoveToPeriod = period;
+
+            await platform.setPreviousPeriodId();
         }
 
         if (request.body.membershipOrganizationId !== undefined) {

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

@@ -62,18 +62,21 @@ export class GetUserPayableBalanceEndpoint extends Endpoint<Params, Query, Body,
         for (const organization of authenticatedOrganizations) {
             const items = receivableBalances.filter(b => b.organizationId === organization.id);
 
-            let amount = 0;
+            let amountOpen = 0;
             let amountPending = 0;
+            let amountPaid = 0;
 
             for (const item of items) {
-                amount += item.amount;
+                amountOpen += item.amountOpen;
                 amountPending += item.amountPending;
+                amountPaid += item.amountPaid;
             }
 
             billingStatus.organizations.push(PayableBalance.create({
                 organization,
-                amount,
+                amountOpen,
                 amountPending,
+                amountPaid,
             }));
         }
 

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

@@ -242,7 +242,7 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             }
 
             // Check if this member is already registered in this group?
-            const existingRegistrations = await Registration.where({ memberId: member.id, groupId: item.groupId, cycle: group.cycle });
+            const existingRegistrations = await Registration.where({ memberId: member.id, groupId: item.groupId, cycle: group.cycle, periodId: group.periodId, registeredAt: { sign: '!=', value: null } });
 
             for (const existingRegistration of existingRegistrations) {
                 if (item.replaceRegistrations.some(r => r.id === existingRegistration.id)) {
@@ -263,7 +263,25 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 }
             }
 
-            const registration = new Registration()
+            let reuseRegistration: Registration | null = null;
+
+            if (item.replaceRegistrations.length === 1) {
+                // Try to reuse this specific one
+                reuseRegistration = (await Registration.getByID(item.replaceRegistrations[0].id)) ?? null;
+            }
+
+            let startDate = item.calculatedStartDate;
+
+            if (!reuseRegistration) {
+                // Otherwise try to reuse a registration in the same period, for the same group that has been deactived for less than 7 days since the start of the new registration
+                reuseRegistration = existingRegistrations.find(r => r.deactivatedAt !== null && r.deactivatedAt.getTime() > startDate.getTime() - 7 * 24 * 60 * 60 * 1000) ?? null;
+
+                if (reuseRegistration && reuseRegistration.startDate && reuseRegistration.startDate < startDate && reuseRegistration.startDate >= group.settings.startDate && !item.trial) {
+                    startDate = reuseRegistration.startDate;
+                }
+            }
+
+            const registration = (reuseRegistration ?? new Registration())
                 .setRelation(registrationMemberRelation, member as Member)
                 .setRelation(Registration.group, group);
             registration.organizationId = organization.id;
@@ -275,6 +293,20 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             registration.groupPrice = item.groupPrice;
             registration.options = item.options;
             registration.recordAnswers = item.recordAnswers;
+            registration.startDate = startDate;
+
+            // Clear if we are reusing an existing registration
+            registration.trialUntil = null;
+            registration.pricePaid = 0;
+            registration.payingOrganizationId = null;
+
+            // NOTE: we don't reset deactivatedAt - registeredAt, because those will get reset when markValid is called later on (while keeping the original registeredAt date)
+            // registration.deactivatedAt = null;
+            // registration.registeredAt = null; // this is required to trigger platform membership updates
+
+            if (item.trial) {
+                registration.trialUntil = item.calculatedTrialUntil;
+            }
 
             if (whoWillPayNow === 'organization' && request.body.asOrganizationId) {
                 registration.payingOrganizationId = request.body.asOrganizationId;
@@ -428,6 +460,10 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
                 // Who is responsible for payment?
                 balanceItem2.memberId = registration.memberId;
 
+                if (registration.trialUntil) {
+                    balanceItem2.dueAt = registration.trialUntil;
+                }
+
                 // If the paying organization hasn't paid yet, this should be hidden and move to pending as soon as the paying organization has paid
                 balanceItem2.status = BalanceItemStatus.Hidden;
                 await balanceItem2.save();
@@ -446,6 +482,10 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             // Connect the 'pay back' balance item to this balance item. As soon as this balance item is paid, we'll mark the other one as pending so the outstanding balance for the member increases
             balanceItem.dependingBalanceItemId = balanceItem2?.id ?? null;
 
+            if (registration.trialUntil) {
+                balanceItem.dueAt = registration.trialUntil;
+            }
+
             await balanceItem.save();
             createdBalanceItems.push(balanceItem);
         }
@@ -613,7 +653,9 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             const mappedBalanceItems = new Map<BalanceItem, number>();
 
             for (const item of createdBalanceItems) {
-                mappedBalanceItems.set(item, item.price);
+                if (item.dueAt === null) {
+                    mappedBalanceItems.set(item, item.price);
+                }
             }
 
             for (const item of checkout.cart.balanceItems) {
@@ -652,6 +694,9 @@ export class RegisterMembersEndpoint extends Endpoint<Params, Query, Body, Respo
             await BalanceItem.updateOutstanding([...createdBalanceItems, ...unrelatedCreatedBalanceItems]);
         }
 
+        // Reallocate
+        await BalanceItemService.reallocate([...createdBalanceItems, ...unrelatedCreatedBalanceItems], organization.id);
+
         // Update occupancy
         for (const group of groups) {
             if (registrations.some(r => r.groupId === group.id) || deactivatedRegistrationGroupIds.some(id => id === group.id)) {

package/src/endpoints/global/registration-periods/PatchRegistrationPeriodsEndpoint.ts

@@ -1,6 +1,6 @@
 import { ConvertArrayToPatchableArray, Decoder, PatchableArrayAutoEncoder, PatchableArrayDecoder, StringDecoder, patchObject } from '@simonbackx/simple-encoding';
 import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
-import { AuditLogType, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
+import { AuditLogSource, AuditLogType, RegistrationPeriod as RegistrationPeriodStruct } from '@stamhoofd/structures';
 
 import { SimpleError } from '@simonbackx/simple-errors';
 import { Platform, RegistrationPeriod } from '@stamhoofd/models';
@@ -60,6 +60,7 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
             period.locked = put.locked;
             period.settings = put.settings;
             period.organizationId = organization?.id ?? null;
+            await period.setPreviousPeriodId();
 
             await period.save();
             periods.push(period);
@@ -91,6 +92,7 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 model.settings = patchObject(model.settings, patch.settings);
             }
 
+            await model.setPreviousPeriodId();
             await model.save();
 
             // Schedule patch of all groups in this period
@@ -108,7 +110,19 @@ export class PatchRegistrationPeriodsEndpoint extends Endpoint<Params, Query, Bo
                 });
             }
 
+            // Get before deleting the model
+            const updateWhere = await RegistrationPeriod.where({ previousPeriodId: model.id });
+
+            // Now delete the model
             await model.delete();
+
+            // Update all previous period ids
+            await AuditLogService.setContext({ source: AuditLogSource.System }, async () => {
+                for (const period of updateWhere) {
+                    await period.setPreviousPeriodId();
+                    await period.save();
+                }
+            });
         }
 
         // Clear platform cache

package/src/endpoints/organization/dashboard/email-templates/GetEmailTemplatesEndpoint.ts

@@ -95,7 +95,7 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                         : []
                 );
 
-        const defaultTemplateTypes = organization ? types.filter(type => EmailTemplateStruct.isSavedEmail(type)) : types;
+        const defaultTemplateTypes = organization ? types.filter(type => !EmailTemplateStruct.isSavedEmail(type)) : types;
         const defaultTemplates = defaultTemplateTypes.length === 0
             ? []
             : (await EmailTemplate.where({
@@ -106,6 +106,20 @@ export class GetEmailTemplatesEndpoint extends Endpoint<Params, Query, Body, Res
                     },
                 }));
 
+        if (organization && (request.query.webshopId || request.query.groupIds)) {
+            const orgDefaults = (await EmailTemplate.where({
+                organizationId: organization.id,
+                webshopId: null,
+                groupId: null,
+                type: {
+                    sign: 'IN',
+                    value: defaultTemplateTypes,
+                },
+            }));
+
+            defaultTemplates.unshift(...orgDefaults);
+        }
+
         return new Response(templates.concat(defaultTemplates).map(template => EmailTemplateStruct.create(template)));
     }
 }

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

@@ -125,6 +125,7 @@ export class PatchOrganizationEndpoint extends Endpoint<Params, Query, Body, Res
                 organization.privateMeta.inheritedResponsibilityRoles = request.body.privateMeta.inheritedResponsibilityRoles.applyTo(organization.privateMeta.inheritedResponsibilityRoles);
                 organization.privateMeta.privateKey = request.body.privateMeta.privateKey ?? organization.privateMeta.privateKey;
                 organization.privateMeta.featureFlags = patchObject(organization.privateMeta.featureFlags, request.body.privateMeta.featureFlags);
+                organization.privateMeta.balanceNotificationSettings = patchObject(organization.privateMeta.balanceNotificationSettings, request.body.privateMeta.balanceNotificationSettings);
 
                 if (request.body.privateMeta.mollieProfile !== undefined) {
                     organization.privateMeta.mollieProfile = patchObject(organization.privateMeta.mollieProfile, request.body.privateMeta.mollieProfile);

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

@@ -6,6 +6,7 @@ import { QueueHandler } from '@stamhoofd/queues';
 import { BalanceItemStatus, BalanceItemType, BalanceItemWithPayments, PermissionLevel } from '@stamhoofd/structures';
 
 import { Context } from '../../../../helpers/Context';
+import { BalanceItemService } from '../../../../services/BalanceItemService';
 
 type Params = Record<string, never>;
 type Query = undefined;
@@ -36,7 +37,7 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
             throw Context.auth.error();
         }
 
-        if (request.body.changes.length == 0) {
+        if (request.body.changes.length === 0) {
             return new Response([]);
         }
 
@@ -208,8 +209,14 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
 
         await BalanceItem.updateOutstanding(updateOutstandingBalance);
 
+        // Reallocate
+        await BalanceItemService.reallocate(updateOutstandingBalance, organization.id);
+
+        // Reload returnedModels
+        const returnedModelsReloaded = await BalanceItem.getByIDs(...returnedModels.map(m => m.id));
+
         return new Response(
-            await BalanceItem.getStructureWithPayments(returnedModels),
+            await BalanceItem.getStructureWithPayments(returnedModelsReloaded),
         );
     }
 

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

@@ -200,6 +200,9 @@ export class PatchPaymentsEndpoint extends Endpoint<Params, Query, Body, Respons
                 }
 
                 await BalanceItem.updateOutstanding(balanceItems);
+
+                // Reallocate
+                await BalanceItemService.reallocate(balanceItems, organization.id);
             }
 
             changedPayments.push(payment);

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

@@ -37,7 +37,7 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
             throw Context.auth.error();
         }
 
-        const balanceItemModels = await CachedBalance.balanceForObjects(organization.id, [request.params.id], request.params.type);
+        const balanceItemModels = await CachedBalance.balanceForObjects(organization.id, [request.params.id], request.params.type, true);
         let paymentModels: Payment[] = [];
 
         switch (request.params.type) {
@@ -100,6 +100,26 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
                     .fetch();
                 break;
             }
+
+            case ReceivableBalanceType.registration: {
+                paymentModels = await Payment.select()
+                    .where('organizationId', organization.id)
+                    .join(
+                        SQL.join(BalanceItemPayment.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'paymentId'), SQL.column(Payment.table, 'id')),
+                    )
+                    .join(
+                        SQL.join(BalanceItem.table)
+                            .where(SQL.column(BalanceItemPayment.table, 'balanceItemId'), SQL.column(BalanceItem.table, 'id')),
+                    )
+                    .where(SQL.column(BalanceItem.table, 'registrationId'), request.params.id)
+                    .andWhere(
+                        SQL.whereNot('status', PaymentStatus.Failed),
+                    )
+                    .groupBy(SQL.column(Payment.table, 'id'))
+                    .fetch();
+                break;
+            }
         }
 
         const balanceItems = await BalanceItem.getStructureWithPayments(balanceItemModels);
@@ -108,8 +128,9 @@ export class GetReceivableBalanceEndpoint extends Endpoint<Params, Query, Body,
         const balances = await CachedBalance.getForObjects([request.params.id], organization.id);
 
         const created = new CachedBalance();
-        created.amount = 0;
+        created.amountOpen = 0;
         created.amountPending = 0;
+        created.amountPaid = 0;
         created.organizationId = organization.id;
         created.objectId = request.params.id;
         created.objectType = request.params.type;

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

@@ -48,20 +48,8 @@ export class GetReceivableBalancesEndpoint extends Endpoint<Params, Query, Body,
 
         scopeFilter = {
             organizationId: organization.id,
-            $or: {
-                amount: { $neq: 0 },
-                amountPending: { $neq: 0 },
-                nextDueAt: { $neq: null },
-            },
         };
 
-        if (!Context.auth.hasSomePlatformAccess()) {
-            // Cannot see debt between organizations
-            scopeFilter.objectType = {
-                $neq: ReceivableBalanceType.organization,
-            };
-        }
-
         const query = CachedBalance
             .select();
 

package/src/endpoints/organization/dashboard/registration-periods/PatchOrganizationRegistrationPeriodsEndpoint.ts

@@ -346,7 +346,11 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
             model.settings.period = period.getBaseStructure();
 
             if (model.type !== GroupType.EventRegistration) {
-                model.settings.startDate = period.startDate;
+                // Note: start date is curomizable, as long as it stays between period start and end
+                if (model.settings.startDate < period.startDate || model.settings.startDate > period.endDate) {
+                    model.settings.startDate = period.startDate;
+                }
+
                 model.settings.endDate = period.endDate;
             }
         }
@@ -446,9 +450,13 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
         model.status = struct.status;
         model.type = struct.type;
         model.settings.period = period.getBaseStructure();
-        model.settings.startDate = period.startDate;
         model.settings.endDate = period.endDate;
 
+        // Note: start date is curomizable, as long as it stays between period start and end
+        if (model.settings.startDate < period.startDate || model.settings.startDate > period.endDate) {
+            model.settings.startDate = period.startDate;
+        }
+
         if (!await Context.auth.canAccessGroup(model, PermissionLevel.Full)) {
             // Create a temporary permission role for this user
             const organizationPermissions = user.permissions?.organizationPermissions?.get(organizationId);

package/src/helpers/AdminPermissionChecker.ts

@@ -263,7 +263,7 @@ export class AdminPermissionChecker {
             }
 
             const cachedBalance = await CachedBalance.getForObjects([member.id]);
-            if (cachedBalance.length === 0 || (cachedBalance[0].amount === 0 && cachedBalance[0].amountPending === 0)) {
+            if (cachedBalance.length === 0 || (cachedBalance[0].amountOpen === 0 && cachedBalance[0].amountPending === 0)) {
                 return true;
             }
         }
@@ -1063,6 +1063,7 @@ export class AdminPermissionChecker {
             for (const registration of cloned.registrations) {
                 registration.price = 0;
                 registration.pricePaid = 0;
+                registration.balances = [];
             }
         }
 

package/src/helpers/AuthenticatedStructures.ts

@@ -1,6 +1,6 @@
 import { SimpleError } from '@simonbackx/simple-errors';
-import { AuditLog, BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
-import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, Document as DocumentStruct, Event as EventStruct, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
+import { AuditLog, BalanceItem, CachedBalance, Document, Event, Group, Member, MemberPlatformMembership, MemberResponsibilityRecord, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, RegistrationPeriod, Ticket, User, Webshop } from '@stamhoofd/models';
+import { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, Document as DocumentStruct, Event as EventStruct, GenericBalance, Group as GroupStruct, MemberPlatformMembership as MemberPlatformMembershipStruct, MemberWithRegistrationsBlob, MembersBlob, NamedObject, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentGeneral, PermissionLevel, Platform, PrivateOrder, PrivateWebshop, ReceivableBalanceObject, ReceivableBalanceObjectContact, ReceivableBalance as ReceivableBalanceStruct, ReceivableBalanceType, TicketPrivate, UserWithMembers, WebshopPreview, Webshop as WebshopStruct } from '@stamhoofd/structures';
 
 import { Formatter } from '@stamhoofd/utility';
 import { Context } from './Context';
@@ -323,6 +323,9 @@ export class AuthenticatedStructures {
         }
         const organizations = new Map<string, Organization>();
 
+        const registrationIds = Formatter.uniqueArray(members.flatMap(m => m.registrations.map(r => r.id)));
+        const balances = await CachedBalance.getForObjects(registrationIds, Context.organization?.id ?? null);
+
         if (includeUser) {
             for (const organizationId of includeUser.permissions?.organizationPermissions.keys() ?? []) {
                 if (includeContextOrganization || organizationId !== Context.auth.organization?.id) {
@@ -365,7 +368,25 @@ export class AuthenticatedStructures {
                 }
             }
             member.registrations = member.registrations.filter(r => (Context.auth.organization && Context.auth.organization.active && r.organizationId === Context.auth.organization.id) || (organizations.get(r.organizationId)?.active ?? false));
-            const blob = member.getStructureWithRegistrations();
+            const balancesPermission = await Context.auth.hasFinancialMemberAccess(member, PermissionLevel.Read);
+
+            const blob = MemberWithRegistrationsBlob.create({
+                ...member,
+                registrations: member.registrations.map((r) => {
+                    const base = r.getStructure();
+
+                    base.balances = balancesPermission
+                        ? (balances.filter(b => r.id === b.objectId).map((b) => {
+                                return GenericBalance.create(b);
+                            }))
+                        : [];
+
+                    return base;
+                }),
+                details: member.details,
+                users: member.users.map(u => u.getStructure()),
+            });
+
             memberBlobs.push(
                 await Context.auth.filterMemberData(member, blob),
             );
@@ -568,9 +589,15 @@ export class AuthenticatedStructures {
 
         const organizationStructs = await this.organizations(organizations);
 
+        const registrationIds = Formatter.uniqueArray([
+            ...balances.filter(b => b.objectType === ReceivableBalanceType.registration).map(b => b.objectId),
+        ]);
+        const registrations = await Registration.getByIDs(...registrationIds);
+
         const memberIds = Formatter.uniqueArray([
             ...balances.filter(b => b.objectType === ReceivableBalanceType.member).map(b => b.objectId),
             ...responsibilities.map(r => r.memberId),
+            ...registrations.map(r => r.memberId),
         ]);
         const members = memberIds.length > 0 ? await Member.getByIDs(...memberIds) : [];
 
@@ -655,6 +682,49 @@ export class AuthenticatedStructures {
                     });
                 }
             }
+            else if (balance.objectType === ReceivableBalanceType.registration) {
+                const registration = registrations.find(r => r.id === balance.objectId) ?? null;
+                if (!registration) {
+                    continue;
+                }
+                const member = members.find(m => m.id === registration.memberId) ?? null;
+                if (member) {
+                    const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
+                    object = ReceivableBalanceObject.create({
+                        id: balance.objectId,
+                        name: member.details.name,
+                        contacts: [
+                            ...(member.details.getMemberEmails().length
+                                ? [
+                                        ReceivableBalanceObjectContact.create({
+                                            firstName: member.details.firstName ?? '',
+                                            lastName: member.details.lastName ?? '',
+                                            emails: member.details.getMemberEmails(),
+                                            meta: {
+                                                type: 'member',
+                                                responsibilityIds: [],
+                                                url,
+                                            },
+                                        }),
+                                    ]
+                                : []),
+
+                            ...(member.details.parentsHaveAccess
+                                ? member.details.parents.filter(p => !!p.email).map(p => ReceivableBalanceObjectContact.create({
+                                    firstName: p.firstName ?? '',
+                                    lastName: p.lastName ?? '',
+                                    emails: [p.email!],
+                                    meta: {
+                                        type: 'parent',
+                                        responsibilityIds: [],
+                                        url,
+                                    },
+                                }))
+                                : []),
+                        ],
+                    });
+                }
+            }
             else if (balance.objectType === ReceivableBalanceType.user) {
                 const user = users.find(m => m.id === balance.objectId) ?? null;
                 if (user) {

package/src/helpers/EmailResumer.ts

@@ -12,13 +12,9 @@ export async function resumeEmails() {
     const emails = Email.fromRows(result, Email.table);
 
     for (const email of emails) {
-        if (!email.userId) {
-            console.warn('Cannot retry sending email because userId is not set - which is required for setting the scope', email.id);
-            continue;
-        }
         console.log('Resuming email that has sending status on boot', email.id);
 
-        const user = await User.getByID(email.userId);
+        const user = email.userId ? (await User.getByID(email.userId)) : await User.getSystem();
         if (!user) {
             console.warn('Cannot retry sending email because user not found', email.id);
             continue;