@stamhoofd/backend 2.30.2 → 2.30.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stamhoofd/backend",
-    "version": "2.30.2",
+    "version": "2.30.3",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -36,14 +36,14 @@
         "@simonbackx/simple-encoding": "2.15.1",
         "@simonbackx/simple-endpoints": "1.14.0",
         "@simonbackx/simple-logging": "^1.0.1",
-        "@stamhoofd/backend-i18n": "2.30.2",
-        "@stamhoofd/backend-middleware": "2.30.2",
-        "@stamhoofd/email": "2.30.2",
-        "@stamhoofd/models": "2.30.2",
-        "@stamhoofd/queues": "2.30.2",
-        "@stamhoofd/sql": "2.30.2",
-        "@stamhoofd/structures": "2.30.2",
-        "@stamhoofd/utility": "2.30.2",
+        "@stamhoofd/backend-i18n": "2.30.3",
+        "@stamhoofd/backend-middleware": "2.30.3",
+        "@stamhoofd/email": "2.30.3",
+        "@stamhoofd/models": "2.30.3",
+        "@stamhoofd/queues": "2.30.3",
+        "@stamhoofd/sql": "2.30.3",
+        "@stamhoofd/structures": "2.30.3",
+        "@stamhoofd/utility": "2.30.3",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.885.0",
         "axios": "1.6.8",
@@ -60,5 +60,5 @@
         "postmark": "4.0.2",
         "stripe": "^16.6.0"
     },
-    "gitHead": "cc0f6cfcf4febc6976aaad14359283f36df2d46f"
+    "gitHead": "1c2d9449b991aad4d358c913650c83156ebf2b31"
 }

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

@@ -499,21 +499,23 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
                 throw Context.auth.error("Je hebt niet voldoende rechten om dit lid te verwijderen")
             }
 
-            await MemberUserSyncer.onDeleteMember(member)
-            await User.deleteForDeletedMember(member.id)
-            await BalanceItem.deleteForDeletedMember(member.id)
-            await member.delete()
-            shouldUpdateSetupSteps = true
-
-            // Update occupancy of this member because we removed registrations
-            const groupIds = member.registrations.flatMap(r => r.groupId)
-            for (const id of groupIds) {
-                const group = await getGroup(id)
-                if (group) {
-                    // We need to update this group occupancy because we moved one member away from it
-                    updateGroups.set(group.id, group)
-                }
-            }
+            throw Context.auth.error("Verwijderen van leden is tijdelijk uitgeschakeld.")
+
+            //await MemberUserSyncer.onDeleteMember(member)
+            //await User.deleteForDeletedMember(member.id)
+            //await BalanceItem.deleteForDeletedMember(member.id)
+            //await member.delete()
+            //shouldUpdateSetupSteps = true
+//
+            //// Update occupancy of this member because we removed registrations
+            //const groupIds = member.registrations.flatMap(r => r.groupId)
+            //for (const id of groupIds) {
+            //    const group = await getGroup(id)
+            //    if (group) {
+            //        // We need to update this group occupancy because we moved one member away from it
+            //        updateGroups.set(group.id, group)
+            //    }
+            //}
         }
 
         await Member.updateOutstandingBalance(Formatter.uniqueArray(balanceItemMemberIds))
@@ -555,12 +557,16 @@ export class PatchOrganizationMembersEndpoint extends Endpoint<Params, Query, Bo
         if (!member.details.birthDay) {
             return
         }
-        const existingMembers = await Member.where({ organizationId: member.organizationId, firstName: member.details.firstName, lastName: member.details.lastName, birthDay: Formatter.dateIso(member.details.birthDay) });
+        let existingMembers = await Member.where({ organizationId: member.organizationId, firstName: member.details.firstName, lastName: member.details.lastName, birthDay: Formatter.dateIso(member.details.birthDay) });
+
+        if (member.existsInDatabase) {
+            existingMembers = existingMembers.filter(e => e.id !== member.id)
+        }
         
         if (existingMembers.length > 0) {
             const withRegistrations = await Member.getBlobByIds(...existingMembers.map(m => m.id))
-            for (const member of withRegistrations) {
-                if (member.registrations.length > 0) {
+            for (const m of withRegistrations) {
+                if (m.registrations.length > 0) {
                     return member
                 }
             }

package/src/excel-loaders/members.ts

@@ -1,8 +1,9 @@
 import { XlsxBuiltInNumberFormat } from "@stamhoofd/excel-writer";
-import { ExcelExportType, LimitedFilteredRequest, PaginatedResponse, MemberWithRegistrationsBlob, Platform } from "@stamhoofd/structures";
+import { ExcelExportType, Gender, LimitedFilteredRequest, MemberWithRegistrationsBlob, PaginatedResponse, Platform } from "@stamhoofd/structures";
 import { ExportToExcelEndpoint } from "../endpoints/global/files/ExportToExcelEndpoint";
 import { GetMembersEndpoint } from "../endpoints/global/members/GetMembersEndpoint";
 import { Context } from "../helpers/Context";
+import { XlsxTransformerColumnHelper } from "../helpers/xlsxAddressTransformerColumnFactory";
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
     fetch: async (query: LimitedFilteredRequest) => {
@@ -26,6 +27,14 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                         value: object.id
                     })
                 },
+                {
+                    id: 'memberNumber',
+                    name: 'Nummer',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.memberNumber
+                    })
+                },
                 {
                     id: 'firstName',
                     name: 'Voornaam',
@@ -55,6 +64,129 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                         }
                     })
                 },
+                {
+                    id: 'age',
+                    name: 'Leeftijd',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.age,
+                    })
+                },
+                {
+                    id: 'gender',
+                    name: 'Geslacht',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => {
+                        const gender = object.details.gender;
+
+                        return ({
+                            value: formatGender(gender)
+                        })
+                    }
+                },
+                {
+                    id: 'phone',
+                    name: 'Telefoonnummer',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.phone,
+                    })
+                },
+                {
+                    id: 'email',
+                    name: 'E-mailadres',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.email,
+                    })
+                },
+                XlsxTransformerColumnHelper.createAddressColumns<MemberWithRegistrationsBlob>({
+                    matchId: 'address',
+                    identifier: 'Adres',
+                    getAddress: (object) => {
+                        // get member address if exists
+                        const memberAddress = object.details.address;
+                        if(memberAddress) {
+                            return memberAddress;
+                        }
+
+                        // else get address of first parent with address
+                        for(const parent of object.details.parents) {
+                            if(parent.address) {
+                                return parent.address;
+                            }
+                        }
+
+                        return null;
+                    }
+                }),
+                {
+                    id: 'securityCode',
+                    name: 'Beveiligingscode',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.securityCode,
+                    })
+                },
+                {
+                    id: 'uitpasNumber',
+                    name: 'UiTPAS-nummer',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.uitpasNumber,
+                    })
+                },
+                {
+                    id: 'requiresFinancialSupport',
+                    // todo: use correct term
+                    name: 'Financiële ondersteuning',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: XlsxTransformerColumnHelper.formatBoolean(object.details.requiresFinancialSupport?.value),
+                    })
+                },
+                {
+                    id: 'notes',
+                    name: 'Notities',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.notes,
+                    })
+                },
+
+                ...XlsxTransformerColumnHelper.creatColumnsForParents(),
+
+                // unverified data
+                {
+                    id: 'unverifiedPhones',
+                    name: 'Niet-geverifieerde telefoonnummers',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.unverifiedPhones.join(', '),
+                    })
+                },
+                {
+                    id: 'unverifiedEmails',
+                    name: 'Niet-geverifieerde e-mailadressen',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.unverifiedEmails.join(', '),
+                    })
+                },
+                ...XlsxTransformerColumnHelper.createColumnsForAddresses<MemberWithRegistrationsBlob>({
+                    matchIdStart: 'unverifiedAddresses',
+                    identifier: 'Niet-geverifieerd adres',
+                    getAddresses: (object) => object.details.unverifiedAddresses,
+                    limit: 2
+                }),
+                {
+                    id: 'unverifiedAddresses',
+                    name: 'Niet-geverifieerde adressen',
+                    width: 20,
+                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                        value: object.details.unverifiedAddresses.map(a => a.toString()).join('; '),
+                    })
+                },
 
                 // Dynamic records
                 {
@@ -99,3 +231,11 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
         }
     ]
 })
+
+function formatGender(gender: Gender) {
+    switch(gender) {
+        case Gender.Male: return 'Man';
+        case Gender.Female: return 'Vrouw';
+        default: return 'Andere';
+    }
+}

package/src/excel-loaders/payments.ts

@@ -1,10 +1,11 @@
+import { field } from "@simonbackx/simple-encoding";
 import { XlsxBuiltInNumberFormat, XlsxTransformerColumn, XlsxTransformerConcreteColumn } from "@stamhoofd/excel-writer";
-import { StripeAccount as StripeAccountStruct, BalanceItemPaymentDetailed, BalanceItemRelationType, CountryHelper, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaymentGeneral, PaymentMethodHelper, PaymentStatusHelper, PaginatedResponse, PaymentProvider } from "@stamhoofd/structures";
+import { StripeAccount } from "@stamhoofd/models";
+import { BalanceItemPaymentDetailed, BalanceItemRelationType, ExcelExportType, getBalanceItemRelationTypeName, getBalanceItemTypeName, PaginatedResponse, PaymentGeneral, PaymentMethodHelper, PaymentStatusHelper, StripeAccount as StripeAccountStruct } from "@stamhoofd/structures";
+import { Formatter } from "@stamhoofd/utility";
 import { ExportToExcelEndpoint } from "../endpoints/global/files/ExportToExcelEndpoint";
 import { GetPaymentsEndpoint } from "../endpoints/organization/dashboard/payments/GetPaymentsEndpoint";
-import { Formatter } from "@stamhoofd/utility";
-import { StripeAccount } from "@stamhoofd/models";
-import { field } from "@simonbackx/simple-encoding";
+import { XlsxTransformerColumnHelper } from "../helpers/xlsxAddressTransformerColumnFactory";
 
 type PaymentWithItem = {
     payment: PaymentGeneral,
@@ -499,64 +500,11 @@ function getInvoiceColumns(): XlsxTransformerColumn<PaymentGeneral>[] {
                 }
             }
         },
-        {
-            match: (id) => {
-                if (id === 'customer.company.address') {
-                    return [
-                        {
-                            id: 'customer.company.address.street',
-                            name: 'Adres - Straat',
-                            width: 30,
-                            getValue: (object: PaymentGeneralWithStripeAccount) => {
-                                return {
-                                    value: object.customer?.company?.address?.street || ''
-                                }
-                            }
-                        },
-                        {
-                            id: 'customer.company.address.number',
-                            name: 'Adres - Nummer',
-                            width: 20,
-                            getValue: (object: PaymentGeneralWithStripeAccount) => {
-                                return {
-                                    value: object.customer?.company?.address?.number || ''
-                                }
-                            }
-                        },
-                        {
-                            id: 'customer.company.address.postalCode',
-                            name: 'Adres - Postcode',
-                            width: 20,
-                            getValue: (object: PaymentGeneralWithStripeAccount) => {
-                                return {
-                                    value: object.customer?.company?.address?.postalCode || ''
-                                }
-                            }
-                        },
-                        {
-                            id: 'customer.company.address.city',
-                            name: 'Adres - Stad',
-                            width: 20,
-                            getValue: (object: PaymentGeneralWithStripeAccount) => {
-                                return {
-                                    value: object.customer?.company?.address?.city || ''
-                                }
-                            }
-                        },
-                        {
-                            id: 'customer.company.address.country',
-                            name: 'Adres - Land',
-                            width: 20,
-                            getValue: (object: PaymentGeneralWithStripeAccount) => {
-                                return {
-                                    value: object.customer?.company?.address?.country ? CountryHelper.getName(object.customer?.company?.address?.country) : ''
-                                }
-                            }
-                        }
-                    ]
-                }
-            }
-        },
+        XlsxTransformerColumnHelper.createAddressColumns<PaymentGeneralWithStripeAccount>({
+            matchId: 'customer.company.address',
+            getAddress: (object) => object.customer?.company?.address,
+            identifier: 'Adres'
+        }),
         {
             id: 'customer.company.administrationEmail',
             name: 'E-mailadres administratie',

package/src/helpers/xlsxAddressTransformerColumnFactory.ts

@@ -0,0 +1,177 @@
+import { XlsxTransformerColumn } from "@stamhoofd/excel-writer";
+import { Address, CountryHelper, MemberWithRegistrationsBlob, Parent, ParentTypeHelper } from "@stamhoofd/structures";
+
+export class XlsxTransformerColumnHelper {
+    static formatBoolean(value: boolean | undefined | null): string {
+        if(value === true) {
+            return "Ja";
+        }
+
+        if(value === false) {
+            return 'Nee'
+        }
+
+        return '';
+    }
+
+    static creatColumnsForParents(): XlsxTransformerColumn<unknown>[] {
+        return [
+            ...this.createColumnsForParent(0),
+            ...this.createColumnsForParent(1),
+        ]
+    }
+
+    static createColumnsForAddresses<T>({limit, getAddresses, matchIdStart, identifier}: {limit: number, getAddresses: (object: T) => Address[], matchIdStart: string, identifier: string}): XlsxTransformerColumn<unknown>[] {
+        const result: XlsxTransformerColumn<unknown>[] = [];
+
+        for(let i = 0; i <= limit; i++) {
+            const column = this.createAddressColumns({
+                matchId: `${matchIdStart}.${i}`,
+                getAddress: (object: T) => getAddresses(object)[i],
+                identifier: `${identifier} ${i + 1}`,
+            });
+
+            result.push(column);
+        }
+
+        return result;
+    }
+
+    static createColumnsForParent(parentIndex: number): XlsxTransformerColumn<unknown>[] {
+        const getParent = (member: MemberWithRegistrationsBlob): Parent | null | undefined => member.details.parents[parentIndex]; 
+
+        const parentNumber = parentIndex + 1;
+
+        const identifier = `Ouder ${parentNumber}`
+        const getId = (value: string) => `parent.${parentIndex}.${value}`;
+        const getName = (value: string) => `${identifier} - ${value}`
+
+        return [
+            {
+                id: getId('type'),
+                name: getName('Type'),
+                width: 20,
+                getValue: (member: MemberWithRegistrationsBlob) => {
+                    const parent = getParent(member);
+
+                    return {
+                        value: parent ? ParentTypeHelper.getName(parent.type) : ''
+                    }
+                }
+            },
+            {
+                id: getId('firstName'),
+                name: getName('Voornaam'),
+                width: 20,
+                getValue: (member: MemberWithRegistrationsBlob) => ({
+                    value: getParent(member)?.firstName ?? ''
+                })
+            },
+            {
+                id: getId('lastName'),
+                name: getName('Achternaam'),
+                width: 20,
+                getValue: (member: MemberWithRegistrationsBlob) => ({
+                    value: getParent(member)?.lastName ?? ''
+                })
+            },
+            {
+                id: getId('phone'),
+                name: getName('Telefoonnummer'),
+                width: 20,
+                getValue: (member: MemberWithRegistrationsBlob) => ({
+                    value: getParent(member)?.phone ?? ''
+                })
+            },
+            {
+                id: getId('email'),
+                name: getName('E-mailadres'),
+                width: 20,
+                getValue: (member: MemberWithRegistrationsBlob) => ({
+                    value: getParent(member)?.email ?? ''
+                })
+            },
+            XlsxTransformerColumnHelper.createAddressColumns<MemberWithRegistrationsBlob>({
+                matchId: getId('address'),
+                getAddress: (member) => getParent(member)?.address,
+                identifier: getName('Adres')
+            }),
+        ]
+    }
+
+    static createAddressColumns<T>({matchId, identifier, getAddress} : {matchId: string, identifier?: string, getAddress: (object: T) => Address | null | undefined}): XlsxTransformerColumn<T> {
+        const getId = (value: string) => matchId + '.' + value;
+        const identifierText = identifier ? `${identifier} - ` : '';
+        const getName = (value: string) => {
+            const name =`${identifierText}${value}`;
+            return name[0].toUpperCase() + name.slice(1);
+        };
+    
+        return {
+            match: (id) => {
+                if(id === matchId) {
+                    return [
+                        {
+                            id: getId('street'),
+                            name: getName(`Straat`),
+                            width: 30,
+                            getValue: (object: T) => {
+                                const address = getAddress(object);
+                                return {
+                                    value: address?.street || ''
+                                }
+                            }
+                        },
+                        {
+                            id: getId('number'),
+                            name: getName('Nummer'),
+                            width: 20,
+                            getValue: (object: T) => {
+                                const address = getAddress(object);
+                                return {
+                                    value: address?.number || ''
+                                }
+                            }
+                        },
+                        {
+                            id: getId('postalCode'),
+                            name: getName('Postcode'),
+                            width: 20,
+                            getValue: (object: T) => {
+                                const address = getAddress(object);
+                                return {
+                                    value: address?.postalCode || ''
+                                }
+                            }
+                        },
+                        {
+                            id: getId('city'),
+                            name: getName('Stad'),
+                            width: 20,
+                            getValue: (object: T) => {
+                                const address = getAddress(object);
+                                return {
+                                    value: address?.city || ''
+                                }
+                            }
+                        },
+                        {
+                            id: getId('country'),
+                            name: getName('Land'),
+                            width: 20,
+                            getValue: (object: T) => {
+                                const address = getAddress(object);
+                                const country = address?.country;
+                                return {
+                                    value: country ? CountryHelper.getName(country) : ''
+                                }
+                            }
+                        }
+                    ]
+                }
+    
+            }
+        }
+    
+    }   
+}