@stamhoofd/backend 2.80.1 → 2.81.0

package/index.ts

@@ -111,10 +111,7 @@ const start = async () => {
     console.log('Loading loaders...');
 
     // Register Excel loaders
-    await import('./src/excel-loaders/members');
-    await import('./src/excel-loaders/payments');
-    await import('./src/excel-loaders/organizations');
-    await import('./src/excel-loaders/receivable-balances');
+    await import('./src/excel-loaders');
 
     // Register Email Recipient loaders
     await import('./src/email-recipient-loaders/members');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.80.1",
+    "version": "2.81.0",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -38,14 +38,14 @@
         "@simonbackx/simple-encoding": "2.22.0",
         "@simonbackx/simple-endpoints": "1.19.1",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.80.1",
-        "@stamhoofd/backend-middleware": "2.80.1",
-        "@stamhoofd/email": "2.80.1",
-        "@stamhoofd/models": "2.80.1",
-        "@stamhoofd/queues": "2.80.1",
-        "@stamhoofd/sql": "2.80.1",
-        "@stamhoofd/structures": "2.80.1",
-        "@stamhoofd/utility": "2.80.1",
+        "@stamhoofd/backend-i18n": "2.81.0",
+        "@stamhoofd/backend-middleware": "2.81.0",
+        "@stamhoofd/email": "2.81.0",
+        "@stamhoofd/models": "2.81.0",
+        "@stamhoofd/queues": "2.81.0",
+        "@stamhoofd/sql": "2.81.0",
+        "@stamhoofd/structures": "2.81.0",
+        "@stamhoofd/utility": "2.81.0",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -65,5 +65,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "37793d55487f7e8792d7b97df20750f8bd5be9a3"
+    "gitHead": "5a0faf4813aeb5c3d7216536278acb65ba2361e0"
 }

package/src/excel-loaders/event-notifications.ts

@@ -0,0 +1,133 @@
+import { XlsxBuiltInNumberFormat, XlsxTransformerSheet } from '@stamhoofd/excel-writer';
+import { EventNotification, EventNotificationStatus, EventNotificationStatusHelper, ExcelExportType, LimitedFilteredRequest, Platform as PlatformStruct } from '@stamhoofd/structures';
+import { Formatter } from '@stamhoofd/utility';
+import { GetEventNotificationsEndpoint } from '../endpoints/global/events/GetEventNotificationsEndpoint';
+import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
+
+// Assign to a typed variable to assure we have correct type checking in place
+const sheet: XlsxTransformerSheet<EventNotification, EventNotification> = {
+    id: 'event-notifications',
+    name: 'Meldingen',
+    columns: [
+        {
+            id: 'id',
+            name: 'ID',
+            width: 40,
+            getValue: (notification: EventNotification) => ({
+                value: notification.id,
+            }),
+        },
+        {
+            id: 'name',
+            name: 'Naam activiteit',
+            width: 40,
+            getValue: (notification: EventNotification) => ({
+                value: notification.events.map(e => e.name).join(', '),
+            }),
+        },
+        {
+            id: 'organization.name',
+            name: 'Groep',
+            width: 40,
+            getValue: (notification: EventNotification) => ({
+                value: notification.organization.name,
+            }),
+        },
+        {
+            id: 'organization.uri',
+            name: 'Groepsnummer',
+            width: 30,
+            getValue: (notification: EventNotification) => ({
+                value: notification.organization.uri,
+            }),
+        },
+        {
+            id: 'status',
+            name: 'Status',
+            width: 30,
+            getValue: (notification: EventNotification) => ({
+                value: Formatter.capitalizeFirstLetter(EventNotificationStatusHelper.getName(notification.status)),
+            }),
+        },
+        {
+            id: 'feedbackText',
+            name: 'Opmerkingen',
+            width: 80,
+            getValue: (notification: EventNotification) => ({
+                value: notification.status !== EventNotificationStatus.Accepted ? notification.feedbackText : null,
+                style: {
+                    alignment: {
+                        wrapText: true,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'startDate',
+            name: 'Startdatum',
+            width: 20,
+            getValue: (notification: EventNotification) => ({
+                value: notification.startDate,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'endDate',
+            name: 'Einddatum',
+            width: 20,
+            getValue: (notification: EventNotification) => ({
+                value: notification.endDate,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'submittedAt',
+            name: 'Ingediend op',
+            width: 20,
+            getValue: (notification: EventNotification) => ({
+                value: notification.submittedAt,
+                style: {
+                    numberFormat: {
+                        id: XlsxBuiltInNumberFormat.DateSlash,
+                    },
+                },
+            }),
+        },
+        {
+            id: 'submittedBy',
+            name: 'Ingediend door',
+            width: 40,
+            getValue: (notification: EventNotification) => ({
+                value: notification.submittedBy?.name ?? '',
+            }),
+        },
+
+        // Dynamic records
+        XlsxTransformerColumnHelper.createRecordAnswersColumns({
+            matchId: 'recordAnswers',
+            getRecordAnswers: (notification: EventNotification) => notification.recordAnswers,
+            getRecordCategories: () => {
+                const platform = PlatformStruct.shared;
+                return platform.config.eventNotificationTypes.flatMap(r => r.recordCategories);
+            },
+        }),
+    ],
+};
+
+ExportToExcelEndpoint.loaders.set(ExcelExportType.EventNotifications, {
+    fetch: async (query: LimitedFilteredRequest) => {
+        return await GetEventNotificationsEndpoint.buildData(query);
+    },
+    sheets: [
+        sheet,
+    ],
+});

package/src/excel-loaders/index.ts

@@ -0,0 +1,5 @@
+import './members';
+import './payments';
+import './organizations';
+import './receivable-balances';
+import './event-notifications';

package/src/excel-loaders/members.ts

@@ -6,7 +6,7 @@ import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEn
 import { GetMembersEndpoint } from '../endpoints/global/members/GetMembersEndpoint';
 import { AuthenticatedStructures } from '../helpers/AuthenticatedStructures';
 import { Context } from '../helpers/Context';
-import { XlsxTransformerColumnHelper } from '../helpers/xlsxAddressTransformerColumnFactory';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 
 // Assign to a typed variable to assure we have correct type checking in place
 const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
@@ -16,7 +16,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
         {
             id: 'id',
             name: 'ID',
-            width: 20,
+            width: 40,
             getValue: ({ patchedMember: object }: PlatformMember) => ({
                 value: object.id,
             }),
@@ -89,7 +89,7 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
         {
             id: 'email',
             name: 'E-mailadres',
-            width: 20,
+            width: 40,
             getValue: ({ patchedMember: object }: PlatformMember) => ({
                 value: object.details.email,
             }),
@@ -247,42 +247,19 @@ const sheet: XlsxTransformerSheet<PlatformMember, PlatformMember> = {
         },
 
         // Dynamic records
-        {
-            match(id) {
-                if (id.startsWith('recordAnswers.')) {
-                    const platform = PlatformStruct.shared;
-                    const organization = Context.organization;
-
-                    const recordSettings = [
-                        ...(organization?.meta.recordsConfiguration.recordCategories.flatMap(category => category.getAllRecords()) ?? []),
-                        ...platform.config.recordsConfiguration.recordCategories.flatMap(category => category.getAllRecords()),
-                    ];
-
-                    const recordSettingId = id.split('.')[1];
-                    console.log('recordSettingId', recordSettingId);
-                    const recordSetting = recordSettings.find(r => r.id === recordSettingId);
-
-                    if (!recordSetting) {
-                        // Will throw a proper error itself
-                        console.log('recordSetting not found', recordSettings);
-                        return;
-                    }
-
-                    const columns = recordSetting.excelColumns;
-
-                    return columns.map((columnName, index) => {
-                        return {
-                            id: `recordAnswers.${recordSettingId}.${index}`,
-                            name: columnName,
-                            width: 20,
-                            getValue: ({ patchedMember: object }: PlatformMember) => ({
-                                value: object.details.recordAnswers.get(recordSettingId)?.excelValues[index]?.value ?? '',
-                            }),
-                        };
-                    });
-                }
+        XlsxTransformerColumnHelper.createRecordAnswersColumns({
+            matchId: 'recordAnswers',
+            getRecordAnswers: ({ patchedMember: object }: PlatformMember) => object.details.recordAnswers,
+            getRecordCategories: () => {
+                const platform = PlatformStruct.shared;
+                const organization = Context.organization;
+
+                return [
+                    ...(organization?.meta.recordsConfiguration.recordCategories ?? []),
+                    ...platform.config.recordsConfiguration.recordCategories,
+                ];
             },
-        },
+        }),
 
         // Registration records
         {

package/src/excel-loaders/organizations.ts

@@ -2,7 +2,7 @@ import { XlsxTransformerSheet } from '@stamhoofd/excel-writer';
 import { Platform as PlatformStruct, ExcelExportType, LimitedFilteredRequest, Organization as OrganizationStruct, MemberResponsibilityRecord as MemberResponsibilityRecordStruct, PaginatedResponse, MemberWithRegistrationsBlob, Premise } from '@stamhoofd/structures';
 import { GetOrganizationsEndpoint } from '../endpoints/admin/organizations/GetOrganizationsEndpoint';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
-import { XlsxTransformerColumnHelper } from '../helpers/xlsxAddressTransformerColumnFactory';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 import { Group, Member, MemberResponsibilityRecord } from '@stamhoofd/models';
 import { Formatter, Sorter } from '@stamhoofd/utility';
 import { ArrayDecoder, field } from '@simonbackx/simple-encoding';
@@ -33,7 +33,7 @@ const sheet: XlsxTransformerSheet<Object, Object> = {
         {
             id: 'id',
             name: 'ID',
-            width: 35,
+            width: 40,
             getValue: (object: Object) => ({
                 value: object.id,
             }),

package/src/excel-loaders/payments.ts

@@ -5,7 +5,7 @@ import { BalanceItemPaymentDetailed, BalanceItemRelationType, ExcelExportType, g
 import { Formatter } from '@stamhoofd/utility';
 import { ExportToExcelEndpoint } from '../endpoints/global/files/ExportToExcelEndpoint';
 import { GetPaymentsEndpoint } from '../endpoints/organization/dashboard/payments/GetPaymentsEndpoint';
-import { XlsxTransformerColumnHelper } from '../helpers/xlsxAddressTransformerColumnFactory';
+import { XlsxTransformerColumnHelper } from '../helpers/XlsxTransformerColumnHelper';
 
 type PaymentWithItem = {
     payment: PaymentGeneral;
@@ -475,7 +475,7 @@ function getPayingOrganizationColumns(): XlsxTransformerColumn<PaymentGeneral>[]
         {
             id: 'payingOrganization.id',
             name: 'ID betalende groep',
-            width: 30,
+            width: 40,
             getValue: (object: PaymentGeneralWithStripeAccount) => {
                 return {
                     value: object.payingOrganization?.id || '',

package/src/helpers/{xlsxAddressTransformerColumnFactory.ts → XlsxTransformerColumnHelper.ts}

@@ -1,5 +1,5 @@
 import { XlsxTransformerColumn } from '@stamhoofd/excel-writer';
-import { Address, CountryHelper, Parent, ParentTypeHelper, PlatformMember } from '@stamhoofd/structures';
+import { Address, CountryHelper, Parent, ParentTypeHelper, PlatformMember, RecordAnswer, RecordCategory, RecordSettings, RecordType } from '@stamhoofd/structures';
 
 export class XlsxTransformerColumnHelper {
     static formatBoolean(value: boolean | undefined | null): string {
@@ -115,7 +115,8 @@ export class XlsxTransformerColumnHelper {
                         {
                             id: getId('street'),
                             name: `Straat`,
-                            width: 30,
+                            defaultCategory: 'Adres', // Ignore this name
+                            width: 40,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
                                 return {
@@ -126,6 +127,7 @@ export class XlsxTransformerColumnHelper {
                         {
                             id: getId('number'),
                             name: 'Nummer',
+                            defaultCategory: 'Adres', // Ignore this name
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -137,6 +139,7 @@ export class XlsxTransformerColumnHelper {
                         {
                             id: getId('postalCode'),
                             name: 'Postcode',
+                            defaultCategory: 'Adres', // Ignore this name
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -148,6 +151,7 @@ export class XlsxTransformerColumnHelper {
                         {
                             id: getId('city'),
                             name: 'Stad',
+                            defaultCategory: 'Adres', // Ignore this name
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -159,6 +163,7 @@ export class XlsxTransformerColumnHelper {
                         {
                             id: getId('country'),
                             name: 'Land',
+                            defaultCategory: 'Adres', // Ignore this name
                             width: 20,
                             getValue: (object: T) => {
                                 const address = getAddress(object);
@@ -173,4 +178,65 @@ export class XlsxTransformerColumnHelper {
             },
         };
     }
+
+    static createRecordAnswersColumns<T>({ matchId, getRecordCategories, getRecordAnswers }: { matchId: string; getRecordCategories: () => RecordCategory[]; getRecordAnswers: (object: T) => Map<string, RecordAnswer> }): XlsxTransformerColumn<T> {
+        return {
+            match(id) {
+                if (id.startsWith(matchId + '.')) {
+                    const recordCategories = getRecordCategories();
+                    const flattenedCategories = RecordCategory.flattenCategoriesWith(recordCategories, r => r.excelColumns.length > 0);
+
+                    let recordCategory: RecordCategory | undefined;
+                    let recordSetting: RecordSettings | undefined;
+                    const recordSettingId = id.split('.')[1];
+
+                    for (const category of flattenedCategories) {
+                        const recordSettings = category.getAllRecords();
+                        const rr = recordSettings.find(r => r.id === recordSettingId);
+
+                        if (rr) {
+                            recordSetting = rr;
+                            recordCategory = category;
+                            break;
+                        }
+                    }
+
+                    if (!recordSetting || !recordCategory) {
+                        // Will throw a proper error itself
+                        console.log('recordSetting not found');
+                        return;
+                    }
+
+                    const columns = recordSetting.excelColumns;
+
+                    return columns.map(({ name, width, defaultCategory }, index) => {
+                        return {
+                            id: `${matchId}.${recordSettingId}.${index}`,
+                            name,
+                            width: width ?? 20,
+                            defaultCategory,
+                            category: recordCategory.name,
+                            getValue: (object: T) => {
+                                const answers = getRecordAnswers(object);
+                                const b = (answers.get(recordSettingId)?.excelValues[index] ?? {
+                                    value: '',
+                                });
+
+                                return {
+                                    ...b,
+                                    style: {
+                                        ...b.style,
+                                        alignment: {
+                                            ...b.style?.alignment,
+                                            wrapText: recordSetting.type === RecordType.Textarea,
+                                        },
+                                    },
+                                };
+                            },
+                        };
+                    });
+                }
+            },
+        };
+    }
 }