@stamhoofd/backend 2.73.1 → 2.73.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.73.1",
+    "version": "2.73.3",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -33,18 +33,18 @@
     "dependencies": {
         "@bwip-js/node": "^4.5.1",
         "@mollie/api-client": "3.7.0",
-        "@simonbackx/simple-database": "1.27.0",
+        "@simonbackx/simple-database": "1.28.0",
         "@simonbackx/simple-encoding": "2.19.0",
         "@simonbackx/simple-endpoints": "1.15.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.73.1",
-        "@stamhoofd/backend-middleware": "2.73.1",
-        "@stamhoofd/email": "2.73.1",
-        "@stamhoofd/models": "2.73.1",
-        "@stamhoofd/queues": "2.73.1",
-        "@stamhoofd/sql": "2.73.1",
-        "@stamhoofd/structures": "2.73.1",
-        "@stamhoofd/utility": "2.73.1",
+        "@stamhoofd/backend-i18n": "2.73.3",
+        "@stamhoofd/backend-middleware": "2.73.3",
+        "@stamhoofd/email": "2.73.3",
+        "@stamhoofd/models": "2.73.3",
+        "@stamhoofd/queues": "2.73.3",
+        "@stamhoofd/sql": "2.73.3",
+        "@stamhoofd/structures": "2.73.3",
+        "@stamhoofd/utility": "2.73.3",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -64,5 +64,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "af8fb928f0d8fdfe07dcf1433d99a79a0cc44ea7"
+    "gitHead": "00bbe8abcaac99c614bb352efa0fca54241f77d7"
 }

package/src/crons/balance-emails.ts

@@ -14,17 +14,14 @@ const bootAt = new Date();
 async function balanceEmails() {
     // Do not run within 30 minutes after boot to avoid creating multiple email models for emails that failed to send
     if (bootAt.getTime() > new Date().getTime() - 1000 * 60 * 30 && STAMHOOFD.environment !== 'development') {
-        console.log('Boot time is too recent, skipping.');
         return;
     }
 
-    if (lastFullRun.getTime() > new Date().getTime() - 1000 * 60 * 60 * 12 && STAMHOOFD.environment !== 'development') {
-        console.log('Already ran today, skipping.');
+    if (lastFullRun.getTime() > new Date().getTime() - 1000 * 60 * 60 * 12) {
         return;
     }
 
     if ((new Date().getHours() > 10 || new Date().getHours() < 6) && STAMHOOFD.environment !== 'development') {
-        console.log('Not between 6 and 10 AM, skipping.');
         return;
     }
 
@@ -46,12 +43,13 @@ async function balanceEmails() {
             continue;
         }
 
+        const enabledForOrganizations = organization.privateMeta.featureFlags.includes('organization-receivable-balances') && Object.keys(organization.privateMeta.balanceNotificationSettings.organizationContactsFilter).includes('meta');
+
         const selectedEmailAddress = organization.privateMeta.balanceNotificationSettings.emailId ? organization.privateMeta.emails.find(e => e.id === organization.privateMeta.balanceNotificationSettings.emailId) : null;
         const emailAddress = selectedEmailAddress ?? organization.privateMeta.emails.find(e => e.default) ?? null;
 
         if (!emailAddress) {
             // No emailadres set
-            console.warn('Skipped organization', organization.id, 'because no email address is set');
             continue;
         }
 
@@ -67,43 +65,31 @@ async function balanceEmails() {
                 reminderEmailCount: 0,
             },
         });
-        await sendTemplate({
-            objectType: ReceivableBalanceType.organization,
-            organization,
-            emailAddress,
-            systemUser,
-            templateType: EmailTemplateType.OrganizationBalanceIncreaseNotification,
-            filter: {
-                reminderAmountIncreased: true,
-                reminderEmailCount: 0,
-            },
-        });
-        const maximumEmailCount = organization.privateMeta.balanceNotificationSettings.maximumReminderEmails;
 
-        // Reminder emails
-        if (maximumEmailCount > 1) {
+        if (enabledForOrganizations) {
             await sendTemplate({
-                objectType: ReceivableBalanceType.user,
+                objectType: ReceivableBalanceType.organization,
                 organization,
                 emailAddress,
                 systemUser,
-                templateType: EmailTemplateType.UserBalanceReminder,
+                templateType: EmailTemplateType.OrganizationBalanceIncreaseNotification,
                 filter: {
-                    $and: [
-                        {
-                            reminderEmailCount: { $gt: 0 },
-                        }, {
-                            reminderEmailCount: { $lt: maximumEmailCount },
-                        },
-                    ],
+                    reminderAmountIncreased: true,
+                    reminderEmailCount: 0,
                 },
+                subfilter: organization.privateMeta.balanceNotificationSettings.organizationContactsFilter,
             });
+        }
+        const maximumEmailCount = organization.privateMeta.balanceNotificationSettings.maximumReminderEmails;
+
+        // Reminder emails
+        if (maximumEmailCount > 1) {
             await sendTemplate({
-                objectType: ReceivableBalanceType.organization,
+                objectType: ReceivableBalanceType.user,
                 organization,
                 emailAddress,
                 systemUser,
-                templateType: EmailTemplateType.OrganizationBalanceReminder,
+                templateType: EmailTemplateType.UserBalanceReminder,
                 filter: {
                     $and: [
                         {
@@ -114,14 +100,32 @@ async function balanceEmails() {
                     ],
                 },
             });
+
+            if (enabledForOrganizations) {
+                await sendTemplate({
+                    objectType: ReceivableBalanceType.organization,
+                    organization,
+                    emailAddress,
+                    systemUser,
+                    templateType: EmailTemplateType.OrganizationBalanceReminder,
+                    filter: {
+                        $and: [
+                            {
+                                reminderEmailCount: { $gt: 0 },
+                            }, {
+                                reminderEmailCount: { $lt: maximumEmailCount },
+                            },
+                        ],
+                    },
+                    subfilter: organization.privateMeta.balanceNotificationSettings.organizationContactsFilter,
+                });
+            }
         }
     }
 
     if (savedIterator.isDone) {
         savedIterator = null;
         lastFullRun = new Date();
-
-        console.log('All done!');
     }
 }
 
@@ -132,6 +136,7 @@ async function sendTemplate({
     templateType,
     filter,
     objectType,
+    subfilter,
 }: {
     objectType: ReceivableBalanceType;
     organization: Organization;
@@ -139,6 +144,7 @@ async function sendTemplate({
     systemUser: User;
     templateType: EmailTemplateType;
     filter: StamhoofdFilter;
+    subfilter?: StamhoofdFilter;
 }) {
     // Do not send to persons that already received a similar email before this date
     const weekAgo = new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * organization.privateMeta.balanceNotificationSettings.minimumDaysBetween); // 5 instead of 7 so the email received is on another working day
@@ -181,6 +187,7 @@ async function sendTemplate({
                     ],
 
                 },
+                subfilter,
             }),
         ],
     });
@@ -202,13 +209,16 @@ async function sendTemplate({
             console.log('No recipients found for organization', organization.name, organization.id);
         }
         else {
+            const now = new Date();
+            now.setMilliseconds(0);
+
             // Set last balance amount for all these recipients
             for await (const batch of EmailRecipient.select().where('emailId', upToDate.id).limit(100).allBatched()) {
                 const balanceItemIds = batch.flatMap(b => b.objectId ? [b.objectId] : []);
 
                 console.log('Marking balances as reminded...');
                 await CachedBalance.update()
-                    .set('lastReminderEmail', new Date())
+                    .set('lastReminderEmail', now)
                     .set('lastReminderAmountOpen', SQL.column('amountOpen'))
                     .set(
                         'reminderEmailCount',
@@ -221,6 +231,7 @@ async function sendTemplate({
                     .where('id', balanceItemIds)
                     .where('organizationId', organization.id)
                     .where('objectType', objectType)
+                    .where(SQL.where('lastReminderEmail', '<', now).or('lastReminderEmail', null)) // prevent increasing the count multiple times if multiple recipients received the email
                     .update();
             }
         }

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

@@ -44,6 +44,9 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
         const returnedModels: BalanceItem[] = [];
         const updateOutstandingBalance: BalanceItem[] = [];
 
+        // Tracking changes
+        const additionalItems: { memberId: string; organizationId: string }[] = [];
+
         await QueueHandler.schedule('balance-item-update/' + organization.id, async () => {
             for (const { put } of request.body.getPuts()) {
                 // Create a new balance item
@@ -141,8 +144,29 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                     model.payingOrganizationId = patch.payingOrganizationId;
                 }
 
-                if (patch.memberId) {
-                    model.memberId = (await this.validateMemberId(patch.memberId)).id;
+                if (patch.userId) {
+                    model.userId = (await this.validateUserId(model, patch.userId)).id;
+                }
+
+                if (patch.memberId !== undefined) {
+                    if (model.memberId) {
+                        // Also update old member id outstanding balances
+                        additionalItems.push({ memberId: model.memberId, organizationId: model.organizationId });
+                    }
+                    if (patch.memberId === null) {
+                        if (model.userId === null) {
+                            throw new SimpleError({
+                                code: 'invalid_field',
+                                message: 'No user or member provided',
+                                human: 'Een verschuild moet altijd aan een lid of gebruiker gelinkt zijn',
+                                field: 'memberId',
+                            });
+                        }
+                        model.memberId = null;
+                    }
+                    else {
+                        model.memberId = (await this.validateMemberId(patch.memberId)).id;
+                    }
                 }
 
                 if (patch.createdAt) {
@@ -201,13 +225,13 @@ export class PatchBalanceItemsEndpoint extends Endpoint<Params, Query, Body, Res
                 await model.save();
                 returnedModels.push(model);
 
-                if (patch.unitPrice || patch.amount || patch.status || patch.dueAt !== undefined) {
+                if (patch.unitPrice || patch.amount || patch.status || patch.dueAt !== undefined || patch.memberId || patch.userId) {
                     updateOutstandingBalance.push(model);
                 }
             }
         });
 
-        await BalanceItem.updateOutstanding(updateOutstandingBalance);
+        await BalanceItem.updateOutstanding(updateOutstandingBalance, additionalItems);
 
         // Reallocate
         await BalanceItemService.reallocate(updateOutstandingBalance, organization.id);

package/src/helpers/AuthenticatedStructures.ts

@@ -283,6 +283,12 @@ export class AuthenticatedStructures {
 
     static async userWithMembers(user: User): Promise<UserWithMembers> {
         const members = await Member.getMembersWithRegistrationForUser(user);
+        const filtered: MemberWithRegistrations[] = [];
+        for (const member of members) {
+            if (await Context.auth.canAccessMember(member, PermissionLevel.Read)) {
+                filtered.push(member);
+            }
+        }
 
         return UserWithMembers.create({
             ...user,
@@ -290,7 +296,7 @@ export class AuthenticatedStructures {
             hasPassword: user.hasPasswordBasedAccount(),
 
             // Always include the current context organization - because it is possible we switch organization and we don't want to refetch every time
-            members: await this.membersBlob(members, true, user),
+            members: await this.membersBlob(filtered, true, user),
         });
     }
 

package/src/helpers/Context.ts

@@ -136,6 +136,15 @@ export class ContextInstance {
         }
     }
 
+    async checkFeatureFlag(flag: string): Promise<boolean> {
+        const platform = await Platform.getSharedStruct();
+        if (platform.config.featureFlags.includes(flag)) {
+            return true;
+        }
+        const organization = this.organization;
+        return organization?.privateMeta?.featureFlags.includes(flag) ?? false;
+    }
+
     /**
      * Require organization scope if userMode is not platform
      */