@stamhoofd/backend 2.72.0 → 2.73.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, 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 { AuditLogReplacement, AuditLogReplacementType, AuditLog as AuditLogStruct, DetailedReceivableBalance, 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';
@@ -399,7 +399,7 @@ export class AuthenticatedStructures {
         const platformMemberships = members.length > 0 ? await MemberPlatformMembership.where({ deletedAt: null, memberId: { sign: 'IN', value: members.map(m => m.id) } }) : [];
 
         // Load missing organizations
-        const organizationIds = Formatter.uniqueArray(responsibilities.map(r => r.organizationId).filter(id => id !== null));
+        const organizationIds = Formatter.uniqueArray(responsibilities.map(r => r.organizationId).concat(platformMemberships.map(r => r.organizationId)).filter(id => id !== null));
         for (const id of organizationIds) {
             if (includeContextOrganization || id !== Context.auth.organization?.id) {
                 const found = organizations.get(id);
@@ -575,6 +575,10 @@ export class AuthenticatedStructures {
     }
 
     static async receivableBalances(balances: CachedBalance[]): Promise<ReceivableBalanceStruct[]> {
+        return (await this.receivableBalancesHelper(balances)).map(({ balance, object }) => ReceivableBalanceStruct.create({ ...balance, object }));
+    }
+
+    private static async receivableBalancesHelper(balances: CachedBalance[]): Promise< { balance: CachedBalance; object: ReceivableBalanceObject }[]> {
         if (balances.length === 0) {
             return [];
         }
@@ -608,7 +612,8 @@ export class AuthenticatedStructures {
         ]);
         const users = userIds.length > 0 ? await User.getByIDs(...userIds) : [];
 
-        const result: ReceivableBalanceStruct[] = [];
+        const result: { balance: CachedBalance; object: ReceivableBalanceObject }[] = [];
+
         for (const balance of balances) {
             let object = ReceivableBalanceObject.create({
                 id: balance.objectId,
@@ -632,6 +637,7 @@ export class AuthenticatedStructures {
                     object = ReceivableBalanceObject.create({
                         id: balance.objectId,
                         name: organization.name,
+                        uri: organization.uri,
                         contacts: thisMembers.map(({ member, responsibilities }) => ReceivableBalanceObjectContact.create({
                             firstName: member.firstName ?? '',
                             lastName: member.lastName ?? '',
@@ -749,15 +755,35 @@ export class AuthenticatedStructures {
                 }
             }
 
-            const struct = ReceivableBalanceStruct.create({
+            result.push({
+                balance,
+                object,
+            });
+        }
+
+        return result;
+    }
+
+    static async detailedReceivableBalances(organizationId: string, balances: CachedBalance[]): Promise<DetailedReceivableBalance[]> {
+        const items = await this.receivableBalancesHelper(balances);
+        const results: DetailedReceivableBalance[] = [];
+
+        for (const { balance, object } of items) {
+            const balanceItems = await CachedBalance.balanceForObjects(organizationId, [balance.objectId], balance.objectType, true);
+            const balanceItemsWithPayments = await BalanceItem.getStructureWithPayments(balanceItems);
+
+            const result = DetailedReceivableBalance.create({
                 ...balance,
                 object,
+                balanceItems: balanceItemsWithPayments,
+                // todo!!!
+                payments: [],
             });
 
-            result.push(struct);
+            results.push(result);
         }
 
-        return result;
+        return results;
     }
 
     static async auditLogs(logs: AuditLog[]): Promise<AuditLogStruct[]> {

package/src/helpers/SetupStepUpdater.ts

@@ -283,10 +283,16 @@ export class SetupStepUpdater {
             finishedSteps++;
         }
 
-        setupSteps.update(SetupStepType.Premises, {
-            totalSteps,
-            finishedSteps,
-        });
+        if (premiseTypes.length > 0) {
+            setupSteps.update(SetupStepType.Premises, {
+                totalSteps,
+                finishedSteps,
+            });
+        }
+        else {
+            // if no premise types, remove step
+            setupSteps.remove(SetupStepType.Premises);
+        }
     }
 
     private static updateStepGroups(

package/src/helpers/xlsxAddressTransformerColumnFactory.ts

@@ -90,6 +90,14 @@ export class XlsxTransformerColumnHelper {
                     value: getParent(member)?.email ?? '',
                 }),
             },
+            {
+                id: getId('nationalRegisterNumber'),
+                name: getName('Rijksregisternummer'),
+                width: 20,
+                getValue: (member: PlatformMember) => ({
+                    value: getParent(member)?.nationalRegisterNumber?.toString() ?? '',
+                }),
+            },
             XlsxTransformerColumnHelper.createAddressColumns<PlatformMember>({
                 matchId: getId('address'),
                 getAddress: member => getParent(member)?.address,

package/src/services/PaymentReallocationService.ts

@@ -40,13 +40,13 @@ export const PaymentReallocationService = {
                 continue;
             }
 
-            const similarDueItems = balanceItems.filter(b => b.id !== balanceItem.id && b.status === BalanceItemStatus.Due && doBalanceItemRelationsMatch(b.relations, balanceItem.relations, 0));
+            const similarDueItems = balanceItems.filter(b => b.id !== balanceItem.id && b.type === balanceItem.type && b.status === BalanceItemStatus.Due && doBalanceItemRelationsMatch(b.relations, balanceItem.relations, 0));
 
             if (similarDueItems.length) {
                 // Not possible to merge into one: there are 2 due items
                 continue;
             }
-            const similarCanceledItems = balanceItems.filter(b => b.id !== balanceItem.id && b.status !== BalanceItemStatus.Due && doBalanceItemRelationsMatch(b.relations, balanceItem.relations, 0));
+            const similarCanceledItems = balanceItems.filter(b => b.id !== balanceItem.id && b.type === balanceItem.type && b.status !== BalanceItemStatus.Due && doBalanceItemRelationsMatch(b.relations, balanceItem.relations, 0));
 
             if (similarCanceledItems.length) {
                 await this.mergeBalanceItems(balanceItem, similarCanceledItems);
@@ -190,6 +190,7 @@ export const PaymentReallocationService = {
             payment.type = PaymentType.Reallocation;
             payment.method = PaymentMethod.Unknown;
             payment.status = PaymentStatus.Succeeded;
+            payment.paidAt = new Date();
             await payment.save();
 
             // Create balance item payments

package/src/services/PaymentService.ts

@@ -161,7 +161,7 @@ export const PaymentService = {
                             if (token) {
                                 try {
                                     const mollieClient = createMollieClient({ accessToken: await token.getAccessToken() });
-                                    const mollieData = await mollieClient.payments.get(molliePayment.mollieId, {
+                                    let mollieData = await mollieClient.payments.get(molliePayment.mollieId, {
                                         testmode: organization.privateMeta.useTestPayments ?? STAMHOOFD.environment !== 'production',
                                     });
 
@@ -187,6 +187,22 @@ export const PaymentService = {
                                     else if (mollieData.status === MolliePaymentStatus.failed || mollieData.status === MolliePaymentStatus.expired || mollieData.status === MolliePaymentStatus.canceled) {
                                         await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
                                     }
+                                    else if ((cancel || this.shouldTryToCancel(payment.status, payment)) && mollieData.isCancelable) {
+                                        console.log('Cancelling Mollie payment on request', payment.id);
+                                        mollieData = await mollieClient.payments.cancel(molliePayment.mollieId);
+
+                                        if (mollieData.status === MolliePaymentStatus.paid) {
+                                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Succeeded);
+                                        }
+                                        else if (mollieData.status === MolliePaymentStatus.failed || mollieData.status === MolliePaymentStatus.expired || mollieData.status === MolliePaymentStatus.canceled) {
+                                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
+                                        }
+                                        else if (this.isManualExpired(payment.status, payment)) {
+                                            // Mollie still returning pending after 1 day: mark as failed
+                                            console.error('Manually marking Mollie payment as expired', payment.id);
+                                            await this.handlePaymentStatusUpdate(payment, organization, PaymentStatus.Failed);
+                                        }
+                                    }
                                     else if (this.isManualExpired(payment.status, payment)) {
                                         // Mollie still returning pending after 1 day: mark as failed
                                         console.error('Manually marking Mollie payment as expired', payment.id);

package/src/sql-filters/members.ts

@@ -1,5 +1,8 @@
+import { SimpleError } from '@simonbackx/simple-errors';
 import { SQL, SQLAge, SQLConcat, SQLFilterDefinitions, SQLScalar, SQLValueType, baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, createSQLFilterNamespace, createSQLRelationFilterCompiler } from '@stamhoofd/sql';
+import { AccessRight } from '@stamhoofd/structures';
 import { Formatter } from '@stamhoofd/utility';
+import { Context } from '../helpers/Context';
 import { organizationFilterCompilers } from './organizations';
 import { registrationFilterCompilers } from './registrations';
 
@@ -44,7 +47,23 @@ export const memberFilterCompilers: SQLFilterDefinitions = {
 
     'details.requiresFinancialSupport': createSQLExpressionFilterCompiler(
         SQL.jsonValue(SQL.column('details'), '$.value.requiresFinancialSupport.value'),
-        { isJSONValue: true, type: SQLValueType.JSONBoolean },
+        { isJSONValue: true, type: SQLValueType.JSONBoolean, checkPermission: async () => {
+            const organization = Context.organization;
+            if (!organization) {
+                return;
+            }
+
+            const permissions = await Context.auth.getOrganizationPermissions(organization);
+
+            if (!permissions || !permissions.hasAccessRight(AccessRight.MemberReadFinancialData)) {
+                throw new SimpleError({
+                    code: 'permission_denied',
+                    message: 'No permissions for financial support filter (organization scope).',
+                    human: 'Je hebt geen toegangsrechten om deze filter te gebruiken.',
+                    statusCode: 400,
+                });
+            }
+        } },
     ),
 
     'email': createSQLExpressionFilterCompiler(

package/src/sql-filters/organizations.ts

@@ -22,6 +22,7 @@ import { SetupStepType } from '@stamhoofd/structures';
 export const organizationFilterCompilers: SQLFilterDefinitions = {
     ...baseSQLFilterCompilers,
     id: createSQLExpressionFilterCompiler(SQL.column('organizations', 'id')),
+    uriPadded: createSQLExpressionFilterCompiler(SQL.lpad(SQL.column('organizations', 'uri'), 100, '0')),
     uri: createSQLExpressionFilterCompiler(SQL.column('organizations', 'uri')),
     name: createSQLExpressionFilterCompiler(
         SQL.column('organizations', 'name'),

package/src/sql-filters/receivable-balances.ts

@@ -1,4 +1,6 @@
-import { SQL, SQLFilterDefinitions, baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler } from '@stamhoofd/sql';
+import { SQL, SQLConcat, SQLFilterDefinitions, SQLScalar, baseSQLFilterCompilers, createSQLColumnFilterCompiler, createSQLExpressionFilterCompiler, createSQLRelationFilterCompiler } from '@stamhoofd/sql';
+import { memberFilterCompilers } from './members';
+import { organizationFilterCompilers } from './organizations';
 import { EmailRelationFilterCompilers } from './shared/EmailRelationFilterCompilers';
 
 /**
@@ -22,6 +24,56 @@ export const receivableBalanceFilterCompilers: SQLFilterDefinitions = {
         ).then(1).else(0),
         { isJSONValue: false, isJSONObject: false },
     ),
+    organizations: createSQLRelationFilterCompiler(
+        SQL.select()
+            .from(SQL.table('organizations'))
+            .where(
+                SQL.column(
+                    'organizations',
+                    'id',
+                ),
+                SQL.column('cached_outstanding_balances', 'objectId'),
+            ).where(
+                SQL.column('cached_outstanding_balances', 'objectType'),
+                'organization'),
+        organizationFilterCompilers,
+    ),
+    members: createSQLRelationFilterCompiler(
+        SQL.select()
+            .from(SQL.table('members'))
+            .where(
+                SQL.column(
+                    'members',
+                    'id',
+                ),
+                SQL.column('cached_outstanding_balances', 'objectId'),
+            ).where(
+                SQL.column('cached_outstanding_balances', 'objectType'),
+                'member'),
+        memberFilterCompilers,
+    ),
+    users: createSQLRelationFilterCompiler(
+        SQL.select()
+            .from(SQL.table('users'))
+            .where(
+                SQL.column(
+                    'users',
+                    'id',
+                ),
+                SQL.column('cached_outstanding_balances', 'objectId'),
+            ).where(
+                SQL.column('cached_outstanding_balances', 'objectType'),
+                'user'),
+        {
+            name: createSQLExpressionFilterCompiler(
+                new SQLConcat(
+                    SQL.column('firstName'),
+                    new SQLScalar(' '),
+                    SQL.column('lastName'),
+                ),
+            ),
+        },
+    ),
 
     // Allowed to filter by recent emails
     ...EmailRelationFilterCompilers,

package/src/sql-sorters/organizations.ts

@@ -43,6 +43,17 @@ export const organizationSorters: SQLSortDefinitions<Organization> = {
             });
         },
     },
+    uriPadded: {
+        getValue(a) {
+            return a.uri.padStart(100, '0');
+        },
+        toSQL: (direction: SQLOrderByDirection): SQLOrderBy => {
+            return new SQLOrderBy({
+                column: SQL.lpad(SQL.column('uri'), 100, '0'),
+                direction,
+            });
+        },
+    },
     type: {
         getValue(a) {
             return a.meta.type;