@stamhoofd/backend 2.39.1 → 2.40.1

package/src/helpers/xlsxAddressTransformerColumnFactory.ts

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

package/src/middleware/ContextMiddleware.ts

@@ -1,16 +1,16 @@
-import { Request, RequestMiddleware } from "@simonbackx/simple-endpoints"
+import { Request, RequestMiddleware } from '@simonbackx/simple-endpoints';
 
-import { ContextInstance } from "../helpers/Context"
+import { ContextInstance } from '../helpers/Context';
 
 /**
  * This attaches a context to each request for authentication and authorization
  */
 export const ContextMiddleware: RequestMiddleware = {
     wrapRun<T>(run: () => Promise<T>, request: Request) {
-        return ContextInstance.start(request, run)
+        return ContextInstance.start(request, run);
     },
 
     handleRequest: function (request: Request) {
         // Noop
-    }
-}
+    },
+};

package/src/migrations/1646578856-validate-addresses.ts

@@ -1,15 +1,14 @@
 import { Migration } from '@simonbackx/simple-database';
 
-
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    return Promise.resolve()
+    return Promise.resolve();
 
-    /*let lastId = ""
+    /* let lastId = ""
 
     while(true) {
         const members = await Member.where({
@@ -37,7 +36,7 @@ export default new Migration(async () => {
                         const validatedAddress = await AddressValidator.validate(address)
                         const s = address.toString()
                         const e = validatedAddress.toString()
-                        if (s != e) {
+                        if (s !== e) {
                             if (StringCompare.typoCount(address.street, validatedAddress.street) > 4) {
                                 console.log("Updated street: " + s + " => " + e)
                             }
@@ -54,7 +53,5 @@ export default new Migration(async () => {
         }
     }
 
-    throw new Error("WIP")*/
+    throw new Error("WIP") */
 });
-
-

package/src/seeds/0000000000-example.ts

@@ -1,13 +1,11 @@
 import { Migration } from '@simonbackx/simple-database';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
     // Do something here
-    return Promise.resolve()
+    return Promise.resolve();
 });
-
-

package/src/seeds/1715028563-user-permissions.ts

@@ -3,39 +3,39 @@ import { User } from '@stamhoofd/models';
 import { UserPermissions } from '@stamhoofd/structures';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
     process.stdout.write('\n');
     let c = 0;
-    while(true) {
+    while (true) {
         const admins = await User.where({
             organizationPermissions: {
                 value: null,
-                sign: '!='
+                sign: '!=',
             },
             organizationId: {
                 value: null,
-                sign: '!='
-            }
-        }, {limit: 100})
+                sign: '!=',
+            },
+        }, { limit: 100 });
 
         for (const admin of admins) {
             if (!admin.organizationPermissions || !admin.organizationId) {
-                continue
+                continue;
             }
-            const p = UserPermissions.create({})
-            p.organizationPermissions.set(admin.organizationId, admin.organizationPermissions)
-            admin.permissions = UserPermissions.limitedAdd(admin.permissions, p, admin.organizationId)
-            admin.organizationPermissions = null
-            await admin.save()
+            const p = UserPermissions.create({});
+            p.organizationPermissions.set(admin.organizationId, admin.organizationPermissions);
+            admin.permissions = UserPermissions.limitedAdd(admin.permissions, p, admin.organizationId);
+            admin.organizationPermissions = null;
+            await admin.save();
             c++;
 
-            if (c%1000 === 0) {
+            if (c % 1000 === 0) {
                 process.stdout.write('.');
             }
-            if (c%10000 === 0) {
+            if (c % 10000 === 0) {
                 process.stdout.write('\n');
             }
         }
@@ -46,7 +46,5 @@ export default new Migration(async () => {
     }
 
     // Do something here
-    return Promise.resolve()
+    return Promise.resolve();
 });
-
-

package/src/seeds/1722256498-group-update-occupancy.ts

@@ -2,13 +2,13 @@ import { Migration } from '@simonbackx/simple-database';
 import { Group } from '@stamhoofd/models';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    if(STAMHOOFD.userMode !== "platform") {
-        console.log("skipped seed group-update-occupancy because usermode not platform")
+    if (STAMHOOFD.userMode !== 'platform') {
+        console.log('skipped seed group-update-occupancy because usermode not platform');
         return;
     }
 
@@ -16,13 +16,13 @@ export default new Migration(async () => {
     let c = 0;
     let id: string = '';
 
-    while(true) {
+    while (true) {
         const rawGroups = await Group.where({
             id: {
                 value: id,
-                sign: '>'
-            }
-        }, {limit: 100, sort: ['id']});
+                sign: '>',
+            },
+        }, { limit: 100, sort: ['id'] });
 
         const groups = await Group.getByIDs(...rawGroups.map(g => g.id));
 
@@ -32,10 +32,10 @@ export default new Migration(async () => {
 
             c++;
 
-            if (c%1000 === 0) {
+            if (c % 1000 === 0) {
                 process.stdout.write('.');
             }
-            if (c%10000 === 0) {
+            if (c % 10000 === 0) {
                 process.stdout.write('\n');
             }
         }
@@ -48,5 +48,5 @@ export default new Migration(async () => {
     }
 
     // Do something here
-    return Promise.resolve()
-})
+    return Promise.resolve();
+});

package/src/seeds/1722344162-sync-member-users.ts

@@ -4,13 +4,13 @@ import { MemberUserSyncer } from '../helpers/MemberUserSyncer';
 import { logger } from '@simonbackx/simple-logging';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    if(STAMHOOFD.userMode !== "platform") {
-        console.log("skipped seed update-membership because usermode not platform")
+    if (STAMHOOFD.userMode !== 'platform') {
+        console.log('skipped seed update-membership because usermode not platform');
         return;
     }
 
@@ -18,14 +18,14 @@ export default new Migration(async () => {
     let c = 0;
     let id: string = '';
 
-    await logger.setContext({tags: ['silent-seed', 'seed']}, async () => {
-        while(true) {
+    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+        while (true) {
             const rawMembers = await Member.where({
                 id: {
                     value: id,
-                    sign: '>'
-                }
-            }, {limit: 500, sort: ['id']});
+                    sign: '>',
+                },
+            }, { limit: 500, sort: ['id'] });
 
             if (rawMembers.length === 0) {
                 break;
@@ -40,10 +40,10 @@ export default new Migration(async () => {
                     await MemberUserSyncer.onChangeMember(memberWithRegistrations);
                     c++;
 
-                    if (c%1000 === 0) {
+                    if (c % 1000 === 0) {
                         process.stdout.write('.');
                     }
-                    if (c%10000 === 0) {
+                    if (c % 10000 === 0) {
                         process.stdout.write('\n');
                     }
                 })());
@@ -52,9 +52,8 @@ export default new Migration(async () => {
             await Promise.all(promises);
             id = rawMembers[rawMembers.length - 1].id;
         }
-    })
-
+    });
 
     // Do something here
-    return Promise.resolve()
-})
+    return Promise.resolve();
+});

package/src/seeds/1722344162-update-membership.ts

@@ -2,16 +2,16 @@ import { Migration } from '@simonbackx/simple-database';
 import { MembershipHelper } from '../helpers/MembershipHelper';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    if(STAMHOOFD.userMode !== "platform") {
-        console.log("skipped seed update-membership because usermode not platform")
+    if (STAMHOOFD.userMode !== 'platform') {
+        console.log('skipped seed update-membership because usermode not platform');
         return;
     }
 
     process.stdout.write('\n');
-    await MembershipHelper.updateAll()
-})
+    await MembershipHelper.updateAll();
+});

package/src/seeds/1726055544-balance-item-paid.ts

@@ -2,10 +2,10 @@ import { Migration } from '@simonbackx/simple-database';
 import { BalanceItem } from '@stamhoofd/models';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    await BalanceItem.updatePricePaid('all')
-})
+    await BalanceItem.updatePricePaid('all');
+});

package/src/seeds/1726055545-balance-item-pending.ts

@@ -2,10 +2,10 @@ import { Migration } from '@simonbackx/simple-database';
 import { BalanceItem } from '@stamhoofd/models';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
-    await BalanceItem.updatePricePending('all')
-})
+    await BalanceItem.updatePricePending('all');
+});

package/src/seeds/1726494419-update-cached-outstanding-balance.ts

@@ -3,8 +3,8 @@ import { logger } from '@simonbackx/simple-logging';
 import { BalanceItem, BalanceItemPayment, Payment } from '@stamhoofd/models';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
@@ -12,29 +12,29 @@ export default new Migration(async () => {
     let c = 0;
     let id: string = '';
 
-    await logger.setContext({tags: ['silent-seed', 'seed']}, async () => {
-        while(true) {
+    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+        while (true) {
             const payments = await Payment.where({
                 id: {
                     value: id,
-                    sign: '>'
-                }
-            }, {limit: 100, sort: ['id']});
+                    sign: '>',
+                },
+            }, { limit: 100, sort: ['id'] });
 
             for (const payment of payments) {
-                const unloaded = (await BalanceItemPayment.where({paymentId: payment.id})).map(r => r.setRelation(BalanceItemPayment.payment, payment))
+                const unloaded = (await BalanceItemPayment.where({ paymentId: payment.id })).map(r => r.setRelation(BalanceItemPayment.payment, payment));
                 const balanceItemPayments = await BalanceItemPayment.balanceItem.load(
-                    unloaded
+                    unloaded,
                 );
 
-                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem))
+                await BalanceItem.updateOutstanding(balanceItemPayments.map(p => p.balanceItem));
 
                 c++;
 
-                if (c%100 === 0) {
+                if (c % 100 === 0) {
                     process.stdout.write('.');
                 }
-                if (c%10000 === 0) {
+                if (c % 10000 === 0) {
                     process.stdout.write('\n');
                 }
             }
@@ -44,10 +44,10 @@ export default new Migration(async () => {
             }
             id = payments[payments.length - 1].id;
         }
-    })
+    });
 
-    console.log("Updated outstanding balance for " + c + " payments")
+    console.log('Updated outstanding balance for ' + c + ' payments');
 
     // Do something here
-    return Promise.resolve()
-})
+    return Promise.resolve();
+});

package/src/seeds/1726494420-update-cached-outstanding-balance-from-items.ts

@@ -3,8 +3,8 @@ import { logger } from '@simonbackx/simple-logging';
 import { BalanceItem } from '@stamhoofd/models';
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
@@ -12,16 +12,16 @@ export default new Migration(async () => {
     let c = 0;
     let id: string = '';
 
-    await logger.setContext({tags: ['silent-seed', 'seed']}, async () => {
-        while(true) {
+    await logger.setContext({ tags: ['silent-seed', 'seed'] }, async () => {
+        while (true) {
             const items = await BalanceItem.where({
                 id: {
                     value: id,
-                    sign: '>'
-                }
-            }, {limit: 1000, sort: ['id']});
+                    sign: '>',
+                },
+            }, { limit: 1000, sort: ['id'] });
 
-            await BalanceItem.updateOutstanding(items)
+            await BalanceItem.updateOutstanding(items);
 
             c += items.length;
             process.stdout.write('.');
@@ -31,10 +31,10 @@ export default new Migration(async () => {
             }
             id = items[items.length - 1].id;
         }
-    })
+    });
 
-    console.log("Updated outstanding balance for " + c + " items")
+    console.log('Updated outstanding balance for ' + c + ' items');
 
     // Do something here
-    return Promise.resolve()
-})
+    return Promise.resolve();
+});