@stamhoofd/backend 2.36.2 → 2.38.0

package/src/excel-loaders/members.ts

@@ -1,16 +1,22 @@
 import { XlsxBuiltInNumberFormat } from "@stamhoofd/excel-writer";
-import { ExcelExportType, Gender, LimitedFilteredRequest, MemberWithRegistrationsBlob, PaginatedResponse, Platform } from "@stamhoofd/structures";
+import { Platform } from "@stamhoofd/models";
+import { ExcelExportType, Gender, GroupType, LimitedFilteredRequest, MemberWithRegistrationsBlob, PlatformFamily, PlatformMember, UnencodeablePaginatedResponse, Platform as PlatformStruct } 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";
+import { Formatter } from "@stamhoofd/utility";
+import { AuthenticatedStructures } from "../helpers/AuthenticatedStructures";
 
 ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
     fetch: async (query: LimitedFilteredRequest) => {
         const result = await GetMembersEndpoint.buildData(query)
 
-        return new PaginatedResponse({
-            results: result.results.members,
+        return new UnencodeablePaginatedResponse({
+            results: PlatformFamily.createSingles(result.results, {
+                contextOrganization: Context.organization ? (await AuthenticatedStructures.organization(Context.organization)) : null,
+                platform: await Platform.getSharedStruct()
+            }),
             next: result.next
         });
     },
@@ -23,7 +29,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'id',
                     name: 'ID',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.id
                     })
                 },
@@ -31,7 +37,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'memberNumber',
                     name: 'Nummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.memberNumber
                     })
                 },
@@ -39,7 +45,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'firstName',
                     name: 'Voornaam',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.firstName
                     })
                 },
@@ -47,7 +53,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'lastName',
                     name: 'Achternaam',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.lastName
                     })
                 },
@@ -55,7 +61,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'birthDay',
                     name: 'Geboortedatum',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.birthDay,
                         style: {
                             numberFormat: {
@@ -68,7 +74,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'age',
                     name: 'Leeftijd',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.age,
                     })
                 },
@@ -76,7 +82,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'gender',
                     name: 'Geslacht',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => {
+                    getValue: ({patchedMember: object}: PlatformMember) => {
                         const gender = object.details.gender;
 
                         return ({
@@ -88,7 +94,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'phone',
                     name: 'Telefoonnummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.phone,
                     })
                 },
@@ -96,14 +102,14 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'email',
                     name: 'E-mailadres',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.email,
                     })
                 },
-                XlsxTransformerColumnHelper.createAddressColumns<MemberWithRegistrationsBlob>({
+                XlsxTransformerColumnHelper.createAddressColumns<PlatformMember>({
                     matchId: 'address',
                     identifier: 'Adres',
-                    getAddress: (object) => {
+                    getAddress: ({patchedMember: object}: PlatformMember) => {
                         // get member address if exists
                         const memberAddress = object.details.address;
                         if(memberAddress) {
@@ -124,7 +130,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'securityCode',
                     name: 'Beveiligingscode',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.securityCode,
                     })
                 },
@@ -132,7 +138,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'uitpasNumber',
                     name: 'UiTPAS-nummer',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.uitpasNumber,
                     })
                 },
@@ -141,7 +147,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     // todo: use correct term
                     name: 'Financiële ondersteuning',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: XlsxTransformerColumnHelper.formatBoolean(object.details.requiresFinancialSupport?.value),
                     })
                 },
@@ -149,11 +155,69 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'notes',
                     name: 'Notities',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.notes,
                     })
                 },
 
+                {
+                    id: 'organization',
+                    name: 'Groep',
+                    width: 40,
+                    getValue: (member: PlatformMember) => {
+                        const organizations =  member.filterOrganizations({currentPeriod: true, types: [GroupType.Membership]})
+                        const str = Formatter.joinLast(organizations.map(o => o.name).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'uri',
+                    name: 'Groepsnummer',
+                    width: 30,
+                    getValue: (member: PlatformMember) => {
+                        const organizations =  member.filterOrganizations({currentPeriod: true, types: [GroupType.Membership]})
+                        const str = Formatter.joinLast(organizations.map(o => o.uri).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'group',
+                    name: 'Leeftijdsgroep',
+                    width: 40,
+                    getValue: (member: PlatformMember) => {
+                        const groups =  member.filterRegistrations({currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id})
+                        const str = Formatter.joinLast(Formatter.uniqueArray(groups.map(o => o.group.settings.name)).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
+                {
+                    id: 'defaultAgeGroup',
+                    name: 'Standaard leeftijdsgroep',
+                    width: 40,
+                    getValue: (member: PlatformMember) => {
+                        const groups =  member.filterRegistrations({currentPeriod: true, types: [GroupType.Membership], organizationId: Context.organization?.id})
+                        const defaultAgeGroupIds = Formatter.uniqueArray(groups.filter(o => o.group.defaultAgeGroupId))
+                        const defaultAgeGroups = defaultAgeGroupIds.map(o => PlatformStruct.shared.config.defaultAgeGroups.find(g => g.id === o.group.defaultAgeGroupId)?.name ?? 'verwijderde leeftijdsgroep')
+                        const str = Formatter.joinLast(Formatter.uniqueArray(defaultAgeGroups).sort(), ', ', ' en ') || Context.i18n.$t('1a16a32a-7ee4-455d-af3d-6073821efa8f')
+
+                        return {
+                            value: str
+                        }
+                    }
+                },
+
                 ...XlsxTransformerColumnHelper.creatColumnsForParents(),
 
                 // unverified data
@@ -161,7 +225,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedPhones',
                     name: 'Niet-geverifieerde telefoonnummers',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedPhones.join(', '),
                     })
                 },
@@ -169,7 +233,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedEmails',
                     name: 'Niet-geverifieerde e-mailadressen',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedEmails.join(', '),
                     })
                 },
@@ -183,7 +247,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                     id: 'unverifiedAddresses',
                     name: 'Niet-geverifieerde adressen',
                     width: 20,
-                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                    getValue: ({patchedMember: object}: PlatformMember) => ({
                         value: object.details.unverifiedAddresses.map(a => a.toString()).join('; '),
                     })
                 },
@@ -191,9 +255,8 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                 // Dynamic records
                 {
                     match(id) {
-                        console.log('match', id)
                         if (id.startsWith('recordAnswers.')) {
-                            const platform = Platform.shared
+                            const platform = PlatformStruct.shared
                             const organization = Context.organization
 
                             const recordSettings = [
@@ -219,7 +282,7 @@ ExportToExcelEndpoint.loaders.set(ExcelExportType.Members, {
                                     id: `recordAnswers.${recordSettingId}.${index}`,
                                     name: columnName,
                                     width: 20,
-                                    getValue: (object: MemberWithRegistrationsBlob) => ({
+                                    getValue: ({patchedMember: object}: PlatformMember) => ({
                                         value: object.details.recordAnswers.get(recordSettingId)?.excelValues[index]?.value ?? ''
                                     })
                                 }

package/src/helpers/AddressValidator.ts

@@ -55,6 +55,17 @@ export class AddressValidatorStatic {
                 })
             }
         }
+
+        if (address.country !== Country.Belgium && address.country !== Country.Netherlands) {
+            // No validation for other countries
+            return ValidatedAddress.create(Object.assign({ ... address }, {
+                postalCode: address.postalCode,
+                city: address.city,
+                cityId: 'unknown',
+                parentCityId: null,
+                provinceId: 'unknown',
+            }))
+        }
         
         const city = await PostalCode.getCity(postalCode, address.city, address.country)
 

package/src/helpers/AdminPermissionChecker.ts

@@ -1,6 +1,6 @@
 import { AutoEncoderPatchType, PatchMap } from "@simonbackx/simple-encoding"
 import { SimpleError } from "@simonbackx/simple-errors"
-import { BalanceItem, Document, DocumentTemplate, EmailTemplate, Event, Group, Member, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from "@stamhoofd/models"
+import { BalanceItem, CachedOutstandingBalance, Document, DocumentTemplate, EmailTemplate, Event, Group, Member, MemberPlatformMembership, MemberWithRegistrations, Order, Organization, OrganizationRegistrationPeriod, Payment, Registration, User, Webshop } from "@stamhoofd/models"
 import { AccessRight, FinancialSupportSettings, GroupCategory, GroupStatus, MemberWithRegistrationsBlob, PermissionLevel, PermissionsResourceType, Platform as PlatformStruct, RecordCategory } from "@stamhoofd/structures"
 import { Formatter } from "@stamhoofd/utility"
 
@@ -250,7 +250,20 @@ export class AdminPermissionChecker {
      * Only full admins can delete members permanently
      */
     async canDeleteMember(member: MemberWithRegistrations) {
+        if (member.registrations.length === 0 && this.isUserManager(member)) {
+            const platformMemberships = await MemberPlatformMembership.where({ memberId: member.id })
+            if (platformMemberships.length === 0) {
+                return true;
+            }
+
+            const cachedBalance = await CachedOutstandingBalance.getForObjects([member.id])
+            if (cachedBalance.length === 0 || (cachedBalance[0].amount === 0 && cachedBalance[0].amountPending === 0)) {
+                return true;
+            }
+        }
+
         if (member.organizationId) {
+            // Not a platform
             return await this.hasFullAccess(member.organizationId)
         }
         return this.hasPlatformFullAccess()

package/src/helpers/Context.ts

@@ -133,8 +133,8 @@ export class ContextInstance {
         return await this.setOrganizationScope()
     }
 
-    async setOrganizationScope() {
-        const organization = await Organization.fromApiHost(this.request.host);
+    async setOrganizationScope(options?: {allowInactive?: boolean}) {
+        const organization = await Organization.fromApiHost(this.request.host, options);
 
         this.organization = organization
         this.i18n.switchToLocale({ country: organization.address.country })

package/src/helpers/MembershipCharger.ts

@@ -27,6 +27,7 @@ export const MembershipCharger = {
 
         let createdCount = 0;
         let createdPrice = 0;
+        const chunkSize = 100;
 
         // eslint-disable-next-line no-constant-condition
         while (true) {
@@ -35,7 +36,7 @@ export const MembershipCharger = {
                 .where('balanceItemId', null)
                 .where('deletedAt', null)
                 .whereNot('organizationId', chargeVia)
-                .limit(100)
+                .limit(chunkSize)
                 .orderBy(
                     new SQLOrderBy({
                         column: SQL.column('id'),
@@ -57,6 +58,7 @@ export const MembershipCharger = {
                 if (membership.balanceItemId) {
                     continue;
                 }
+
                 const type = getType(membership.membershipTypeId);
                 if (!type) {
                     console.error('Unknown membership type id ', membership.membershipTypeId)
@@ -74,6 +76,14 @@ export const MembershipCharger = {
                     continue;
                 }
 
+                // Force price update (required because could have changed - especially for free memberships in combination with deletes)
+                try {
+                    await membership.calculatePrice(member)
+                } catch (e) {
+                    console.error('Failed to update price for membership. Not charged.', membership.id, e)
+                    continue;
+                }
+
                 const balanceItem = new BalanceItem();
                 balanceItem.unitPrice = membership.price
                 balanceItem.amount = 1
@@ -101,6 +111,7 @@ export const MembershipCharger = {
 
                 await balanceItem.save();
                 membership.balanceItemId = balanceItem.id;
+                membership.maximumFreeAmount = membership.freeAmount;
                 await membership.save()
 
                 createdBalanceItems.push(balanceItem)
@@ -111,7 +122,7 @@ export const MembershipCharger = {
 
             await BalanceItem.updateOutstanding(createdBalanceItems)
 
-            if (memberships.length < 100) {
+            if (memberships.length < chunkSize) {
                 break;
             }
             
@@ -124,5 +135,76 @@ export const MembershipCharger = {
         }
 
         console.log('Charged ' + Formatter.integer(createdCount) +'  memberships, for a total value of ' + Formatter.price(createdPrice))
+    },
+
+    async updatePrices(organizationId?: string) {
+        console.log('Update prices...')
+        
+        // Loop all
+        let lastId = "";
+        let createdCount = 0;
+        const chunkSize = 100;
+
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            const q = MemberPlatformMembership.select()
+                .where('id', SQLWhereSign.Greater, lastId)
+                .where('balanceItemId', null)
+                .where('deletedAt', null);
+
+            if (organizationId) {
+                q.where('organizationId', organizationId)
+            }
+                
+            const memberships = await q
+                .limit(chunkSize)
+                .orderBy(
+                    new SQLOrderBy({
+                        column: SQL.column('id'),
+                        direction: 'ASC'
+                    })
+                )
+                .fetch();
+        
+            if (memberships.length === 0) {
+                break;
+            }
+
+            const memberIds = Formatter.uniqueArray(memberships.map(m => m.memberId))
+            const members = await Member.getByIDs(...memberIds)
+
+            for (const membership of memberships) {
+                const member = members.find(m => m.id === membership.memberId)
+
+                if (!member) {
+                    console.error('Unexpected missing member id ', membership.memberId, 'for membership', membership.id)
+                    continue;
+                }
+
+                // Force price update (required because could have changed - especially for free memberships in combination with deletes)
+                try {
+                    await membership.calculatePrice(member)
+                    await membership.save()
+                } catch (e) {
+                    console.error('Failed to update price for membership', membership.id, e)
+                    continue;
+                }
+                console.log('Updated price for membership', membership.id, membership.price)
+                createdCount += 1;
+            }
+
+            if (memberships.length < chunkSize) {
+                break;
+            }
+            
+            const z = lastId;
+            lastId = memberships[memberships.length - 1].id;
+
+            if (lastId === z) {
+                throw new Error('Unexpected infinite loop found in MembershipCharger')
+            }
+        }
+
+        console.log('Updated prices of ' + Formatter.integer(createdCount) +'  memberships')
     }
 };

package/src/helpers/fetchToAsyncIterator.ts

@@ -1,10 +1,9 @@
-import { EncodableObject } from "@simonbackx/simple-encoding";
-import { LimitedFilteredRequest, PaginatedResponse } from "@stamhoofd/structures";
+import { IPaginatedResponse, LimitedFilteredRequest } from "@stamhoofd/structures";
 
-export function fetchToAsyncIterator<T extends EncodableObject>(
+export function fetchToAsyncIterator<T>(
     initialFilter: LimitedFilteredRequest, 
     loader: {
-        fetch(request: LimitedFilteredRequest): Promise<PaginatedResponse<T, LimitedFilteredRequest>>
+        fetch(request: LimitedFilteredRequest): Promise<IPaginatedResponse<T, LimitedFilteredRequest>>
     }
 ): AsyncIterable<T> {
     return {

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

@@ -0,0 +1,40 @@
+import { Migration } from '@simonbackx/simple-database';
+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")
+        return;
+    }
+
+    process.stdout.write('\n');
+    let c = 0;
+    let id: string = '';
+
+    await logger.setContext({tags: ['silent-seed', 'seed']}, async () => {
+        while(true) {
+            const items = await BalanceItem.where({
+                id: {
+                    value: id,
+                    sign: '>'
+                }
+            }, {limit: 1000, sort: ['id']});
+
+            await BalanceItem.updateOutstanding(items)
+
+            c += items.length;
+            process.stdout.write('.');
+
+            if (items.length < 1000) {
+                break;
+            }
+            id = items[items.length - 1].id;
+        }
+    })
+
+    console.log("Updated outstanding balance for " + c + " items")
+
+    // Do something here
+    return Promise.resolve()
+})