@stamhoofd/backend 2.54.1 → 2.55.0

package/index.ts

@@ -91,6 +91,7 @@ const start = async () => {
     // Register Email Recipient loaders
     await import('./src/email-recipient-loaders/members');
     await import('./src/email-recipient-loaders/orders');
+    await import('./src/email-recipient-loaders/receivable-balances');
 
     routerServer.listen(STAMHOOFD.PORT ?? 9090);
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.54.1",
+    "version": "2.55.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.16.6",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.54.1",
-        "@stamhoofd/backend-middleware": "2.54.1",
-        "@stamhoofd/email": "2.54.1",
-        "@stamhoofd/models": "2.54.1",
-        "@stamhoofd/queues": "2.54.1",
-        "@stamhoofd/sql": "2.54.1",
-        "@stamhoofd/structures": "2.54.1",
-        "@stamhoofd/utility": "2.54.1",
+        "@stamhoofd/backend-i18n": "2.55.0",
+        "@stamhoofd/backend-middleware": "2.55.0",
+        "@stamhoofd/email": "2.55.0",
+        "@stamhoofd/models": "2.55.0",
+        "@stamhoofd/queues": "2.55.0",
+        "@stamhoofd/sql": "2.55.0",
+        "@stamhoofd/structures": "2.55.0",
+        "@stamhoofd/utility": "2.55.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -63,5 +63,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1a09149ce441ef0c7b7d056067a80a3a6ce1c627"
+    "gitHead": "0f1de4c457eb1d067a6df5621d8bb06e821f09e3"
 }

package/src/email-recipient-loaders/receivable-balances.ts

@@ -0,0 +1,59 @@
+import { Email } from '@stamhoofd/models';
+import { receivableBalanceObjectContactInMemoryFilterCompilers, compileToInMemoryFilter, EmailRecipient, EmailRecipientFilterType, LimitedFilteredRequest, PaginatedResponse, Replacement, StamhoofdFilter } from '@stamhoofd/structures';
+import { GetReceivableBalancesEndpoint } from '../endpoints/organization/dashboard/receivable-balances/GetReceivableBalancesEndpoint';
+import { Formatter } from '@stamhoofd/utility';
+
+async function fetch(query: LimitedFilteredRequest, subfilter: StamhoofdFilter | null) {
+    const result = await GetReceivableBalancesEndpoint.buildData(query);
+
+    // Map all contacts to recipients
+    const compiledFilter = compileToInMemoryFilter(subfilter, receivableBalanceObjectContactInMemoryFilterCompilers);
+
+    return new PaginatedResponse({
+        results: result.results.flatMap((balance) => {
+            return balance.object.contacts.filter(c => compiledFilter(c)).flatMap((contact) => {
+                return contact.emails.map(email => EmailRecipient.create({
+                    firstName: contact.firstName,
+                    lastName: contact.lastName,
+                    email,
+                    replacements: [
+                        Replacement.create({
+                            token: 'organizationName',
+                            value: balance.object.name,
+                        }),
+                        Replacement.create({
+                            token: 'outstandingBalance',
+                            value: Formatter.price(balance.amountOpen),
+                        }),
+                        ...(contact.meta && contact.meta.url && typeof contact.meta.url === 'string'
+                            ? [Replacement.create({
+                                    token: 'paymentUrl',
+                                    value: contact.meta.url,
+                                })]
+                            : []),
+                    ],
+                }));
+            });
+        }),
+        next: result.next,
+    });
+}
+
+Email.recipientLoaders.set(EmailRecipientFilterType.ReceivableBalances, {
+    fetch,
+
+    // For now: only count the number of organizations - not the amount of emails
+    count: async (query: LimitedFilteredRequest, subfilter: StamhoofdFilter | null) => {
+        const q = await GetReceivableBalancesEndpoint.buildQuery(query);
+        const base = await q.count();
+
+        if (base < 1000) {
+            // Do full scan
+            query.limit = 1000;
+            const result = await fetch(query, subfilter);
+            return result.results.length;
+        }
+
+        return base;
+    },
+});

package/src/endpoints/admin/organizations/PatchOrganizationsEndpoint.ts

@@ -51,6 +51,14 @@ export class PatchOrganizationsEndpoint extends Endpoint<Params, Query, Body, Re
                 throw new SimpleError({ code: 'not_found', message: 'Organization not found', statusCode: 404 });
             }
 
+            if (organization.id === (await Platform.getShared()).membershipOrganizationId) {
+                throw new SimpleError({
+                    code: 'cannot_delete_membership_organization',
+                    message: 'Cannot delete membership organization',
+                    human: 'Je kan de hoofdgroep niet verwijderen. Als je dit toch wil doen, kan je eerst een andere vereniging instellen als hoofdgroep via \'Boekhouding en aansluitingen\'.',
+                });
+            }
+
             await organization.delete();
         }
 

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

@@ -446,16 +446,18 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                     .where('membershipTypeId', put.membershipTypeId)
                     .where('periodId', put.periodId)
                     .where(
-                        SQL.where('startDate', SQLWhereSign.LessEqual, put.startDate)
-                            .and('endDate', SQLWhereSign.GreaterEqual, put.startDate),
-                    )
-                    .orWhere(
-                        SQL.where('startDate', SQLWhereSign.LessEqual, put.endDate)
-                            .and('endDate', SQLWhereSign.GreaterEqual, put.endDate),
-                    )
-                    .orWhere(
-                        SQL.where('startDate', SQLWhereSign.GreaterEqual, put.startDate)
-                            .and('endDate', SQLWhereSign.LessEqual, put.endDate),
+                        SQL.where(
+                            SQL.where('startDate', SQLWhereSign.LessEqual, put.startDate)
+                                .and('endDate', SQLWhereSign.GreaterEqual, put.startDate),
+                        )
+                        .or(
+                            SQL.where('startDate', SQLWhereSign.LessEqual, put.endDate)
+                                .and('endDate', SQLWhereSign.GreaterEqual, put.endDate),
+                        )
+                        .or(
+                            SQL.where('startDate', SQLWhereSign.GreaterEqual, put.startDate)
+                                .and('endDate', SQLWhereSign.LessEqual, put.endDate),
+                        )
                     )
                     .first(false);
 

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 => type !== EmailTemplateType.SavedMembersEmail) : types;
+        const defaultTemplateTypes = organization ? types.filter(type => EmailTemplateStruct.isSavedEmail(type)) : types;
         const defaultTemplates = defaultTemplateTypes.length === 0
             ? []
             : (await EmailTemplate.where({

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

@@ -121,6 +121,20 @@ export class PatchOrganizationRegistrationPeriodsEndpoint extends Endpoint<Param
                 }
             }
 
+            // Check if we have a category with groups and categories combined
+            if (patch.settings) {
+                for (const category of organizationPeriod.settings.categories) {
+                    if (category.groupIds.length && category.categoryIds.length) {
+                        throw new SimpleError({
+                            code: 'invalid_field',
+                            field: 'categories',
+                            message: 'Cannot have groups and categories combined',
+                            human: 'Een categorie kan niet zowel groepen als subcategorieën bevatten. Mogelijks zijn meerdere mensen tegelijk aanpassingen aan het maken aan de categorieën. Herlaadt de pagina en probeer opnieuw.',
+                        })
+                    }
+                }
+            }
+
             // #region handle locked categories
             if (!Context.auth.hasPlatformFullAccess()) {
                 const categoriesAfterPatch = organizationPeriod.settings.categories;

package/src/helpers/AuthenticatedStructures.ts

@@ -560,10 +560,20 @@ export class AuthenticatedStructures {
 
         const organizationIds = Formatter.uniqueArray(balances.filter(b => b.objectType === ReceivableBalanceType.organization).map(b => b.objectId));
         const organizations = organizationIds.length > 0 ? await Organization.getByIDs(...organizationIds) : [];
-        const admins = await User.getAdmins(organizationIds, { verified: true });
+
+        const responsibilities = organizationIds.length > 0
+            ? (await MemberResponsibilityRecord.select()
+                    .where('organizationId', organizationIds)
+                    .where('endDate', null)
+                    .fetch())
+            : [];
+
         const organizationStructs = await this.organizations(organizations);
 
-        const memberIds = Formatter.uniqueArray(balances.filter(b => b.objectType === ReceivableBalanceType.member).map(b => b.objectId));
+        const memberIds = Formatter.uniqueArray([
+            ...balances.filter(b => b.objectType === ReceivableBalanceType.member).map(b => b.objectId),
+            ...responsibilities.map(r => r.memberId),
+        ]);
         const members = memberIds.length > 0 ? await Member.getBlobByIds(...memberIds) : [];
 
         const result: ReceivableBalanceStruct[] = [];
@@ -576,14 +586,28 @@ export class AuthenticatedStructures {
             if (balance.objectType === ReceivableBalanceType.organization) {
                 const organization = organizationStructs.find(o => o.id == balance.objectId) ?? null;
                 if (organization) {
-                    const thisAdmins = admins.filter(a => a.permissions && a.permissions.forOrganization(organization)?.hasAccessRight(AccessRight.OrganizationFinanceDirector));
+                    const theseResponsibilities = responsibilities.filter(r => r.organizationId === organization.id);
+                    const thisMembers = members.flatMap((m) => {
+                        const resp = theseResponsibilities.filter(r => r.memberId === m.id);
+                        return resp.length > 0
+                            ? [{
+                                    member: m,
+                                    responsibilities: resp,
+                                }]
+                            : [];
+                    });
+
                     object = ReceivableBalanceObject.create({
                         id: balance.objectId,
                         name: organization.name,
-                        contacts: thisAdmins.map(a => ReceivableBalanceObjectContact.create({
-                            firstName: a.firstName ?? '',
-                            lastName: a.lastName ?? '',
-                            emails: [a.email],
+                        contacts: thisMembers.map(({ member, responsibilities }) => ReceivableBalanceObjectContact.create({
+                            firstName: member.firstName ?? '',
+                            lastName: member.lastName ?? '',
+                            emails: member.details.getMemberEmails(),
+                            meta: {
+                                responsibilityIds: responsibilities.map(r => r.responsibilityId),
+                                url: organization.dashboardUrl + '/boekhouding/openstaand/' + (Context.organization?.uri ?? ''),
+                            },
                         })),
                     });
                 }