@stamhoofd/backend 2.62.0 → 2.64.0

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';
@@ -40,8 +40,6 @@ export class AuthenticatedStructures {
 
         const includeSettlements = checkPermissions && !!Context.user && !!Context.user.permissions;
 
-        console.log('includeSettlements', includeSettlements);
-
         const { payingOrganizations } = await Payment.loadPayingOrganizations(payments);
 
         return Payment.getGeneralStructureFromRelations({
@@ -325,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) {
@@ -367,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),
             );
@@ -570,12 +589,23 @@ 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) : [];
 
+        const userIds = Formatter.uniqueArray([
+            ...balances.filter(b => b.objectType === ReceivableBalanceType.user).map(b => b.objectId),
+        ]);
+        const users = userIds.length > 0 ? await User.getByIDs(...userIds) : [];
+
         const result: ReceivableBalanceStruct[] = [];
         for (const balance of balances) {
             let object = ReceivableBalanceObject.create({
@@ -584,7 +614,7 @@ export class AuthenticatedStructures {
             });
 
             if (balance.objectType === ReceivableBalanceType.organization) {
-                const organization = organizationStructs.find(o => o.id == balance.objectId) ?? null;
+                const organization = organizationStructs.find(o => o.id === balance.objectId) ?? null;
                 if (organization) {
                     const theseResponsibilities = responsibilities.filter(r => r.organizationId === organization.id);
                     const thisMembers = members.flatMap((m) => {
@@ -605,6 +635,7 @@ export class AuthenticatedStructures {
                             lastName: member.lastName ?? '',
                             emails: member.details.getMemberEmails(),
                             meta: {
+                                type: 'organization',
                                 responsibilityIds: responsibilities.map(r => r.responsibilityId),
                                 url: organization.dashboardUrl + '/boekhouding/openstaand/' + (Context.organization?.uri ?? ''),
                             },
@@ -615,14 +646,101 @@ export class AuthenticatedStructures {
             else if (balance.objectType === ReceivableBalanceType.member) {
                 const member = members.find(m => m.id === balance.objectId) ?? 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.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) {
+                    const url = Context.organization && Context.organization.id === balance.organizationId ? 'https://' + Context.organization.getHost() : '';
+                    object = ReceivableBalanceObject.create({
+                        id: balance.objectId,
+                        name: user.name || user.email,
                         contacts: [
                             ReceivableBalanceObjectContact.create({
-                                firstName: member.details.firstName ?? '',
-                                lastName: member.details.lastName ?? '',
-                                emails: member.details.getMemberEmails(),
+                                firstName: user.firstName ?? '',
+                                lastName: user.lastName ?? '',
+                                emails: [user.email],
+                                meta: {
+                                    responsibilityIds: [],
+                                    url,
+                                },
                             }),
                         ],
                     });

package/src/helpers/MembershipCharger.ts

@@ -3,6 +3,7 @@ import { BalanceItem, Member, MemberPlatformMembership, Platform } from '@stamho
 import { SQL, SQLOrderBy, SQLWhereSign } from '@stamhoofd/sql';
 import { BalanceItemRelation, BalanceItemRelationType, BalanceItemType } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
+import { BalanceItemService } from '../services/BalanceItemService';
 
 export const MembershipCharger = {
     async charge() {
@@ -122,6 +123,9 @@ export const MembershipCharger = {
 
             await BalanceItem.updateOutstanding(createdBalanceItems);
 
+            // Reallocate
+            await BalanceItemService.reallocate(createdBalanceItems, chargeVia);
+
             if (memberships.length < chunkSize) {
                 break;
             }

package/src/helpers/OrganizationCharger.ts

@@ -1,6 +1,7 @@
 import { SimpleError } from '@simonbackx/simple-errors';
 import { BalanceItem, Platform } from '@stamhoofd/models';
 import { BalanceItemType, Organization as OrganizationStruct } from '@stamhoofd/structures';
+import { BalanceItemService } from '../services/BalanceItemService';
 
 export class OrganizationCharger {
     static async chargeFromPlatform(args: { organizationsToCharge: OrganizationStruct[]; price: number; amount?: number; description: string }) {
@@ -30,6 +31,9 @@ export class OrganizationCharger {
 
         await Promise.all(balanceItems.map(balanceItem => balanceItem.save()));
         await BalanceItem.updateOutstanding(balanceItems);
+
+        // Reallocate
+        await BalanceItemService.reallocate(balanceItems, chargingOrganizationId);
     }
 
     private static createBalanceItem({ price, amount, description, chargingOrganizationId, organizationBeingCharged }: { price: number; amount?: number; description: string; chargingOrganizationId: string; organizationBeingCharged: OrganizationStruct }): BalanceItem {

package/src/seeds/1733994455-balance-item-status-open.ts

@@ -0,0 +1,30 @@
+import { Database, Migration } from '@simonbackx/simple-database';
+import { BalanceItemStatus } from '@stamhoofd/structures';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment === 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    const query = `
+        UPDATE
+            balance_items
+        SET status = ?
+        WHERE status IN (?)`;
+    await Database.update(query, [
+        BalanceItemStatus.Due,
+        ['Paid', 'Pending'],
+    ]);
+
+    const q2 = `
+        UPDATE
+            balance_items
+        SET status = ?,
+            amount = coalesce(nullif(ROUND(coalesce(pricePaid / nullif(unitPrice, 0), 0)), 0), 1)
+        WHERE amount = 0 AND status = ?`;
+    await Database.update(q2, [
+        BalanceItemStatus.Canceled,
+        BalanceItemStatus.Due,
+    ]);
+});

package/src/seeds/1734596144-fill-previous-period-id.ts

@@ -0,0 +1,55 @@
+import { Migration } from '@simonbackx/simple-database';
+import { logger } from '@simonbackx/simple-logging';
+import { Platform, RegistrationPeriod } from '@stamhoofd/models';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let id: string = '';
+
+    await logger.setContext({ tags: ['seed'] }, async () => {
+        while (true) {
+            const items = await RegistrationPeriod.where({
+                id: {
+                    value: id,
+                    sign: '>',
+                },
+            }, { limit: 1000, sort: ['id'] });
+
+            if (items.length === 0) {
+                break;
+            }
+
+            process.stdout.write('.');
+
+            for (const item of items) {
+                await item.setPreviousPeriodId();
+                if (await item.save()) {
+                    c += 1;
+                }
+            }
+
+            if (items.length < 1000) {
+                break;
+            }
+            id = items[items.length - 1].id;
+        }
+    });
+
+    console.log('Updated ' + c + ' registration periods');
+
+    // Now update platform
+    const platform = await Platform.getShared();
+    await platform.setPreviousPeriodId();
+    await platform.save();
+
+    console.log('Updated platform');
+
+    // Do something here
+    return Promise.resolve();
+});

package/src/seeds/1734700082-update-cached-outstanding-balance-from-items.ts

@@ -0,0 +1,40 @@
+import { Migration } from '@simonbackx/simple-database';
+import { logger } from '@simonbackx/simple-logging';
+import { BalanceItem } from '@stamhoofd/models';
+
+export default new Migration(async () => {
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let id: string = '';
+
+    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+        while (true) {
+            const items = await BalanceItem.where({
+                id: {
+                    value: id,
+                    sign: '>',
+                },
+            }, { limit: 1000, sort: ['id'] });
+
+            await BalanceItem.updateOutstanding(items);
+
+            c += items.length;
+            process.stdout.write('.');
+
+            if (items.length < 1000) {
+                break;
+            }
+            id = items[items.length - 1].id;
+        }
+    });
+
+    console.log('Updated outstanding balance for ' + c + ' items');
+
+    // Do something here
+    return Promise.resolve();
+});

package/src/services/BalanceItemPaymentService.ts

@@ -7,16 +7,20 @@ type Loaded<T> = (T) extends ManyToOneRelation<infer Key, infer Model> ? Record<
 
 export const BalanceItemPaymentService = {
     async markPaid(balanceItemPayment: BalanceItemPayment & Loaded<typeof BalanceItemPayment.balanceItem> & Loaded<typeof BalanceItemPayment.payment>, organization: Organization) {
+        const wasPaid = balanceItemPayment.balanceItem.priceOpen === 0;
+
         // Update cached amountPaid of the balance item (balanceItemPayment will get overwritten later, but we need it to calculate the status)
         balanceItemPayment.balanceItem.pricePaid += balanceItemPayment.price;
 
-        // Update status
-        const old = balanceItemPayment.balanceItem.status;
-        balanceItemPayment.balanceItem.updateStatus();
+        if (balanceItemPayment.balanceItem.status === BalanceItemStatus.Hidden && balanceItemPayment.balanceItem.pricePaid !== 0) {
+            balanceItemPayment.balanceItem.status = BalanceItemStatus.Due;
+        }
+
         await balanceItemPayment.balanceItem.save();
+        const isPaid = balanceItemPayment.balanceItem.priceOpen === 0;
 
         // Do logic of balance item
-        if (balanceItemPayment.balanceItem.status === BalanceItemStatus.Paid && old !== BalanceItemStatus.Paid && balanceItemPayment.price >= 0) {
+        if (isPaid && !wasPaid && balanceItemPayment.price >= 0 && balanceItemPayment.balanceItem.status === BalanceItemStatus.Due) {
             // Only call markPaid once (if it wasn't (partially) paid before)
             await BalanceItemService.markPaid(balanceItemPayment.balanceItem, balanceItemPayment.payment, organization);
         }

package/src/services/BalanceItemService.ts

@@ -1,7 +1,9 @@
 import { BalanceItem, Order, Organization, Payment, Webshop } from '@stamhoofd/models';
-import { AuditLogSource, BalanceItemStatus, OrderStatus } from '@stamhoofd/structures';
-import { RegistrationService } from './RegistrationService';
+import { AuditLogSource, BalanceItemStatus, OrderStatus, ReceivableBalanceType } from '@stamhoofd/structures';
 import { AuditLogService } from './AuditLogService';
+import { RegistrationService } from './RegistrationService';
+import { PaymentReallocationService } from './PaymentReallocationService';
+import { Formatter } from '@stamhoofd/utility';
 
 export const BalanceItemService = {
     async markPaid(balanceItem: BalanceItem, payment: Payment | null, organization: Organization) {
@@ -45,6 +47,24 @@ export const BalanceItemService = {
         }
     },
 
+    async reallocate(balanceItems: BalanceItem[], organizationId: string) {
+        const memberIds = Formatter.uniqueArray(balanceItems.map(b => b.memberId).filter(b => b !== null));
+        const payingOrganizationIds = Formatter.uniqueArray(balanceItems.map(b => b.payingOrganizationId).filter(b => b !== null));
+        const userIds = Formatter.uniqueArray(balanceItems.map(b => b.userId).filter(b => b !== null));
+
+        for (const memberId of memberIds) {
+            await PaymentReallocationService.reallocate(organizationId, memberId, ReceivableBalanceType.member);
+        }
+
+        for (const payingOrganizationId of payingOrganizationIds) {
+            await PaymentReallocationService.reallocate(organizationId, payingOrganizationId, ReceivableBalanceType.organization);
+        }
+
+        for (const userId of userIds) {
+            await PaymentReallocationService.reallocate(organizationId, userId, ReceivableBalanceType.user);
+        }
+    },
+
     async markUpdated(balanceItem: BalanceItem, payment: Payment, organization: Organization) {
         // For orders: mark order as changed (so they are refetched in front ends)
         if (balanceItem.orderId) {
@@ -93,5 +113,4 @@ export const BalanceItemService = {
             }
         }
     },
-
 };