@stamhoofd/models 2.121.0 → 2.122.1

package/src/models/EventNotification.ts

@@ -1,8 +1,8 @@
 import { column, ManyToManyRelation } from '@simonbackx/simple-database';
-import { MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
+import { EnumDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import type { RecordAnswer} from '@stamhoofd/structures';
-import { EventNotificationStatus, RecordAnswerDecoder } from '@stamhoofd/structures';
+import type { RecordAnswer } from '@stamhoofd/structures';
+import { EventNotificationStatus, RecordAnswerMapDecoder } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 import { Event } from './Event.js';
 
@@ -26,7 +26,7 @@ export class EventNotification extends QueryableModel {
     @column({ type: 'datetime' })
     endDate: Date;
 
-    @column({ type: 'string' })
+    @column({ type: 'string', decoder: new EnumDecoder(EventNotificationStatus) })
     status = EventNotificationStatus.Draft;
 
     /**
@@ -39,13 +39,13 @@ export class EventNotification extends QueryableModel {
     @column({ type: 'string' })
     organizationId: string;
 
-    @column({ type: 'json', decoder: new MapDecoder(StringDecoder, RecordAnswerDecoder) })
+    @column({ type: 'json', decoder: RecordAnswerMapDecoder })
     recordAnswers: Map<string, RecordAnswer> = new Map();
 
     /**
      * Contains the answers of an event notification that were accepted
      */
-    @column({ type: 'json', decoder: new MapDecoder(StringDecoder, RecordAnswerDecoder) })
+    @column({ type: 'json', decoder: RecordAnswerMapDecoder })
     acceptedRecordAnswers: Map<string, RecordAnswer> = new Map();
 
     @column({ type: 'string', nullable: true })

package/src/models/Invoice.ts

@@ -5,6 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
 import { InvoicedBalanceItem } from './InvoicedBalanceItem.js';
+import { Formatter } from '@stamhoofd/utility';
 
 export class Invoice extends QueryableModel {
     static table = 'invoices';
@@ -153,4 +154,12 @@ export class Invoice extends QueryableModel {
         const invoicedBalanceItems = await InvoicedBalanceItem.select().where('invoiceId', invoices.map(i => i.id)).fetch();
         return { invoicedBalanceItems };
     }
+
+    generateCustomerFilename(ext: 'pdf' | 'xml') {
+        if (!this.number || !this.invoicedAt) {
+            return this.id + '.' + ext;
+        }
+        const date = this.invoicedAt
+        return Formatter.dateIso(date) + ' - ' + (this.totalWithVAT < 0 ? $t('%1aE') : $t('%1Zw')) + ' ' + this.number + ' - ' + Formatter.fileSlug(this.seller.name) + '.' + ext;
+    }
 }

package/src/models/MemberPlatformMembership.test.ts

@@ -0,0 +1,70 @@
+import { PlatformMembershipType, PlatformMembershipTypeBehaviour, PlatformMembershipTypeConfig } from '@stamhoofd/structures';
+
+import { MemberFactory } from '../factories/MemberFactory.js';
+import { OrganizationFactory } from '../factories/OrganizationFactory.js';
+import { RegistrationPeriodFactory } from '../factories/RegistrationPeriodFactory.js';
+import { MemberPlatformMembership } from './MemberPlatformMembership.js';
+import { Platform } from './Platform.js';
+
+describe('MemberPlatformMembership', () => {
+    beforeEach(() => {
+        vitest.useFakeTimers({ toFake: ['Date'] }).setSystemTime(new Date(2024, 4, 1, 0, 0, 0, 0));
+    });
+
+    afterEach(() => {
+        vitest.useRealTimers();
+    });
+
+    async function setupDaysMembership(maximumDays: number) {
+        const period = await new RegistrationPeriodFactory({
+            startDate: new Date(2024, 0, 1, 0, 0, 0, 0),
+            endDate: new Date(2024, 11, 31, 23, 59, 59, 999),
+        }).create();
+        const organization = await new OrganizationFactory({ period }).create();
+        const member = await new MemberFactory({ organization }).create();
+        const membershipType = PlatformMembershipType.create({
+            name: 'Days membership',
+            behaviour: PlatformMembershipTypeBehaviour.Days,
+            periods: new Map([
+                [period.id, PlatformMembershipTypeConfig.create({
+                    startDate: period.startDate,
+                    endDate: period.endDate,
+                    maximumDays,
+                })],
+            ]),
+        });
+
+        const platform = await Platform.getForEditing();
+        platform.periodId = period.id;
+        platform.config.membershipTypes = [membershipType];
+        await platform.save();
+
+        const membership = new MemberPlatformMembership();
+        membership.memberId = member.id;
+        membership.membershipTypeId = membershipType.id;
+        membership.organizationId = organization.id;
+        membership.periodId = period.id;
+
+        return { member, membership };
+    }
+
+    test('allows the inclusive maximum number of days', async () => {
+        const { member, membership } = await setupDaysMembership(2);
+        membership.startDate = new Date(2024, 4, 1, 0, 0, 0, 0);
+        membership.endDate = new Date(2024, 4, 2, 0, 0, 0, 0);
+
+        await expect(membership.calculatePrice(member)).resolves.toBeUndefined();
+        expect(membership.maximumFreeAmount).toBe(2);
+    });
+
+    test('rejects days memberships that exceed maximum days', async () => {
+        const { member, membership } = await setupDaysMembership(2);
+        membership.startDate = new Date(2024, 4, 1, 0, 0, 0, 0);
+        membership.endDate = new Date(2024, 4, 3, 0, 0, 0, 0);
+
+        await expect(membership.calculatePrice(member)).rejects.toMatchObject({
+            code: 'invalid_field',
+            field: 'endDate',
+        });
+    });
+});

package/src/models/MemberPlatformMembership.ts

@@ -207,8 +207,7 @@ export class MemberPlatformMembership extends QueryableModel {
             this.startDate = startBrussels.toJSDate();
             this.endDate = endBrussels.toJSDate();
             this.expireDate = null;
-        }
-        else {
+        } else {
             this.endDate = Formatter.luxon(periodConfig.endDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate();
             this.expireDate = periodConfig.expireDate ? Formatter.luxon(periodConfig.expireDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate() : null;
 
@@ -222,8 +221,7 @@ export class MemberPlatformMembership extends QueryableModel {
                     startBrussels = startBrussels.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
                     this.startDate = startBrussels.toJSDate();
                 }
-            }
-            else {
+            } else {
                 // Keep the set date, but make sure it is at 0:00 in CET
                 let startBrussels = Formatter.luxon(this.startDate);
                 startBrussels = startBrussels.set({ hour: 0, minute: 0, second: 0, millisecond: 0 });
@@ -248,6 +246,16 @@ export class MemberPlatformMembership extends QueryableModel {
             this.endDate = Formatter.luxon(this.startDate).set({ hour: 23, minute: 59, second: 59, millisecond: 0 }).toJSDate();
         }
 
+        const maximumEndDate = periodConfig.getMaximumEndDate(this.startDate, membershipType.behaviour);
+        if (this.endDate > maximumEndDate) {
+            throw new SimpleError({
+                code: 'invalid_field',
+                field: 'endDate',
+                message: 'End date is after the maximum allowed end date',
+                human: $t('%15C', { date: Formatter.date(maximumEndDate) }),
+            });
+        }
+
         if (periodConfig.trialDays) {
             // Check whether you are elegible for a trial
             const latestTrialDate = await this.isElegibleForTrial(member);
@@ -267,12 +275,10 @@ export class MemberPlatformMembership extends QueryableModel {
                 }
 
                 this.trialUntil = trialUntil.toJSDate();
-            }
-            else {
+            } else {
                 this.trialUntil = null;
             }
-        }
-        else {
+        } else {
             // No trial
             this.trialUntil = null;
         }
@@ -347,8 +353,7 @@ export class MemberPlatformMembership extends QueryableModel {
             if (alreadyUsed < periodConfig.amountFree) {
                 freeDays = periodConfig.amountFree - alreadyUsed;
                 console.log('Free membership created for ', this.id, periodConfig.amountFree, alreadyUsed);
-            }
-            else {
+            } else {
                 console.log('No free membership created for', this.id, periodConfig.amountFree, alreadyUsed);
             }
         }
@@ -359,8 +364,7 @@ export class MemberPlatformMembership extends QueryableModel {
             this.priceWithoutDiscount = earliestPriceConfig.calculatePrice(tagIds, false, days);
             this.price = priceConfig.calculatePrice(tagIds, shouldApplyReducedPrice, Math.max(0, days - freeDays));
             this.freeAmount = Math.min(days, freeDays);
-        }
-        else {
+        } else {
             this.priceWithoutDiscount = earliestPriceConfig.getBasePrice(tagIds, false);
             this.price = priceConfig.getBasePrice(tagIds, shouldApplyReducedPrice);
             this.maximumFreeAmount = this.price > 0 ? 1 : 0;

package/src/models/Order.ts

@@ -286,8 +286,7 @@ export class Order extends QueryableModel {
             if (webshop) {
                 await this.setRelation(Order.webshop, webshop).updateTickets();
             }
-        }
-        else {
+        } else {
             this.markUpdated();
             await this.save();
         }
@@ -427,8 +426,7 @@ export class Order extends QueryableModel {
                 // Remove any reserved stock
                 const updated = Order.updateTimeSlotStock(timeSlot, this.data, false);
                 changed = changed || updated;
-            }
-            else {
+            } else {
                 this.data.reservedOrder = false;
                 this.data.reservedPersons = 0;
                 changed = true;
@@ -442,8 +440,7 @@ export class Order extends QueryableModel {
             if (timeSlot) {
                 const updated = Order.updateTimeSlotStock(timeSlot, this.data, add);
                 changed = changed || updated;
-            }
-            else {
+            } else {
                 console.error('Missing timeslot ' + s.id + ' in webshop ' + this.webshopId);
             }
         }
@@ -456,6 +453,7 @@ export class Order extends QueryableModel {
                     if (previousData !== null) {
                         // Already removed
                         item.reservedSeats = [];
+                        // eslint-disable-next-line no-useless-assignment
                         changed = true;
                     }
 
@@ -491,8 +489,7 @@ export class Order extends QueryableModel {
                 code.reserved = false;
                 discountCodeUsageMap.set(code.id, (discountCodeUsageMap.get(code.id) ?? 0) - 1);
                 changed = true;
-            }
-            else if (!code.reserved && add) {
+            } else if (!code.reserved && add) {
                 code.reserved = true;
                 discountCodeUsageMap.set(code.id, (discountCodeUsageMap.get(code.id) ?? 0) + 1);
                 changed = true;
@@ -599,8 +596,7 @@ export class Order extends QueryableModel {
                     ticketMap.set(item.product.id, offset + item.amount);
                 }
             }
-        }
-        else {
+        } else {
             // Create a shared ticket for the whole order
             const ticket = new Ticket();
             ticket.orderId = this.id;
@@ -752,8 +748,7 @@ export class Order extends QueryableModel {
         // Needs to happen before validation, because we can include the tickets in the validation that way
         if (this.validAt === null) {
             await this.setRelation(Order.webshop, webshop).markValid(payment, tickets);
-        }
-        else {
+        } else {
             this.markUpdated();
             await this.save();
 
@@ -764,8 +759,7 @@ export class Order extends QueryableModel {
             if (this.data.customer.email.length > 0) {
                 if (didCreateTickets) {
                     await this.setRelation(Order.webshop, webshop).sendTickets();
-                }
-                else {
+                } else {
                     if (payment && payment.method === PaymentMethod.Transfer) {
                         await this.setRelation(Order.webshop, webshop).sendPaidMail();
                     }
@@ -976,40 +970,34 @@ export class Order extends QueryableModel {
                     await this.sendEmailTemplate({
                         type: EmailTemplateType.TicketsConfirmationPOS,
                     });
-                }
-                else {
+                } else {
                     await this.sendEmailTemplate({
                         type: EmailTemplateType.TicketsConfirmation,
                     });
                 }
-            }
-            else {
+            } else {
                 if (this.webshop.meta.ticketType === WebshopTicketType.None) {
                     if (payment && payment.method === PaymentMethod.Transfer) {
                         // Also send a copy
                         await this.sendEmailTemplate({
                             type: EmailTemplateType.OrderConfirmationTransfer,
                         });
-                    }
-                    else if (payment && payment.method === PaymentMethod.PointOfSale) {
+                    } else if (payment && payment.method === PaymentMethod.PointOfSale) {
                         await this.sendEmailTemplate({
                             type: EmailTemplateType.OrderConfirmationPOS,
                         });
-                    }
-                    else {
+                    } else {
                         // Also send a copy
                         await this.sendEmailTemplate({
                             type: EmailTemplateType.OrderConfirmationOnline,
                         });
                     }
-                }
-                else {
+                } else {
                     if (payment && payment.method === PaymentMethod.Transfer) {
                         await this.sendEmailTemplate({
                             type: EmailTemplateType.TicketsConfirmationTransfer,
                         });
-                    }
-                    else {
+                    } else {
                         console.error('Unexpected missing tickets for order where tickets are expected');
                     }
                 }

package/src/models/Organization.ts

@@ -6,19 +6,21 @@ import { I18n } from '@stamhoofd/backend-i18n/I18n';
 import type { EmailInterfaceRecipient } from '@stamhoofd/email';
 import { QueueHandler } from '@stamhoofd/queues';
 import { QueryableModel, SQL } from '@stamhoofd/sql';
-import type { OrganizationEmail, PrivatePaymentConfiguration } from '@stamhoofd/structures';
-import { Address, appToUri, Company, DNSRecordStatus, EmailTemplateType, GroupType, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
+import type { AppType, OrganizationEmail, PrivatePaymentConfiguration } from '@stamhoofd/structures';
+import { AccessRight, Address, appToUri, Company, DNSRecordStatus, EmailTemplateType, getAppHost, GroupType, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, Recipient, Replacement, STPackageType, TransferSettings } from '@stamhoofd/structures';
+import type { PaymentMandate } from '@stamhoofd/structures/PaymentMandate.js';
+import { Country } from '@stamhoofd/types/Country';
+import { Language } from '@stamhoofd/types/Language';
+import { Formatter, Sorter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from 'uuid';
 import { validateDNSRecords } from '../helpers/DNSValidator.js';
 import { OrganizationServerMetaData } from '../structures/OrganizationServerMetaData.js';
 import { Group } from './Group.js';
 import { OrganizationRegistrationPeriod } from './OrganizationRegistrationPeriod.js';
-import { StripeAccount } from './StripeAccount.js';
-import { Country } from '@stamhoofd/types/Country';
-import { Language } from '@stamhoofd/types/Language';
 import { Registration } from './Registration.js';
-import type { PaymentMandate } from '@stamhoofd/structures/PaymentMandate.js';
+import { StripeAccount } from './StripeAccount.js';
+import { Token } from './Token.js';
+import type { User } from './User.js';
 
 export class Organization extends QueryableModel {
     static table = 'organizations';
@@ -211,57 +213,12 @@ export class Organization extends QueryableModel {
         return organization;
     }
 
-    /**
-     * Potentially includes a path
-     */
-    getRegistrationHost(i18n?: { language: Language; locale: string }): string {
-        if (this.registerDomain) {
-            let d = this.registerDomain;
-
-            if (i18n && i18n.language !== this.i18n.language) {
-                d += '/' + i18n.language;
-            }
-
-            return d;
-        }
-        return this.getDefaultRegistrationHost(i18n);
-    }
-
-    getDefaultRegistrationHost(i18n?: { language: Language; locale: string }): string {
-        if (!STAMHOOFD.domains.registration) {
-            return STAMHOOFD.domains.dashboard + '/' + (i18n?.locale ?? this.i18n.locale) + '/' + appToUri('registration') + '/' + this.uri;
-        }
-        let defaultDomain = STAMHOOFD.domains.registration[this.address.country] ?? STAMHOOFD.domains.registration[''];
-
-        if (i18n && i18n.language !== this.i18n.language) {
-            defaultDomain += '/' + i18n.language;
-        }
-
-        return this.uri + '.' + defaultDomain;
-    }
-
     getDashboardHost(i18n?: { language: Language; locale: string }): string {
-        return STAMHOOFD.domains.dashboard + '/' + (i18n?.locale ?? this.i18n.locale) + '/' + appToUri('dashboard') + '/' + this.uri;
-    }
-
-    get registerUrl() {
-        return 'https://' + this.getRegistrationHost();
-    }
-
-    /**
-     * @deprecated
-     * use getRegistrationHost
-     */
-    getHost(i18n?: I18n): string {
-        return this.getRegistrationHost(i18n);
+        return getAppHost('dashboard', this, true, i18n);
     }
 
-    /**
-     * @deprecated
-     * Use getDefaultRegistrationHost
-     */
-    getDefaultHost(i18n?: I18n): string {
-        return this.getDefaultRegistrationHost(i18n);
+    get registerUrl(): string {
+        return 'https://' + getAppHost('registration', this, false);
     }
 
     get marketingDomain(): string {
@@ -303,8 +260,7 @@ export class Organization extends QueryableModel {
                 await created.save();
                 return created;
             });
-        }
-        else {
+        } else {
             oPeriod = oPeriods[0];
         }
 
@@ -367,8 +323,7 @@ export class Organization extends QueryableModel {
 
                     console.log('Did set register domain for ' + this.id + ' to ' + organization.registerDomain);
                 }
-            }
-            else {
+            } else {
                 // Clear register domain
                 if (organization.registerDomain) {
                     // We need to clear it, to prevent sending e-mails with invalid links
@@ -406,8 +361,7 @@ export class Organization extends QueryableModel {
                     type: EmailTemplateType.OrganizationStableDNS,
                     bcc: true,
                 });
-            }
-            else if (!wasActive && this.privateMeta.mailDomainActive && (!didSendDomainSetupMail || didSendWarning) && !organization.serverMeta.isDNSUnstable) {
+            } else if (!wasActive && this.privateMeta.mailDomainActive && (!didSendDomainSetupMail || didSendWarning) && !organization.serverMeta.isDNSUnstable) {
                 organization.serverMeta.didSendDomainSetupMail = true;
                 await organization.save();
 
@@ -415,15 +369,13 @@ export class Organization extends QueryableModel {
                     await this.sendEmailTemplate({
                         type: EmailTemplateType.OrganizationDNSSetupComplete,
                     });
-                }
-                else {
+                } else {
                     await this.sendEmailTemplate({
                         type: EmailTemplateType.OrganizationValidDNS,
                     });
                 }
             }
-        }
-        else {
+        } else {
             // DNS settings gone broken
             if (organization.privateMeta.mailDomain) {
                 organization.privateMeta.pendingMailDomain = organization.privateMeta.pendingMailDomain ?? organization.privateMeta.mailDomain;
@@ -448,8 +400,7 @@ export class Organization extends QueryableModel {
                     type: EmailTemplateType.OrganizationUnstableDNS,
                     bcc: true,
                 });
-            }
-            else if (!organization.serverMeta.isDNSUnstable && organization.serverMeta.didSendDomainSetupMail && organization.serverMeta.DNSRecordWarningCount == 0) {
+            } else if (!organization.serverMeta.isDNSUnstable && organization.serverMeta.didSendDomainSetupMail && organization.serverMeta.DNSRecordWarningCount == 0) {
                 organization.serverMeta.DNSRecordWarningCount += 1;
                 await organization.save();
 
@@ -500,6 +451,10 @@ export class Organization extends QueryableModel {
                     token: 'mailDomain',
                     value: this.privateMeta.mailDomain ?? this.privateMeta.pendingMailDomain ?? '',
                 }),
+                Replacement.create({
+                    token: 'organizationName',
+                    value: this.name,
+                }),
             ],
             unsubscribeType: 'marketing',
             fromStamhoofd: true,
@@ -547,8 +502,7 @@ export class Organization extends QueryableModel {
 
             await client.send(deleteCmd);
             console.log('Deleted AWS mail idenitiy @' + this.id + ' for ' + this.privateMeta.mailDomain);
-        }
-        catch (e) {
+        } catch (e) {
             console.error('Could not delete AWS email identitiy @' + this.id + ' for ' + this.privateMeta.mailDomain);
             console.error(e);
         }
@@ -615,8 +569,7 @@ export class Organization extends QueryableModel {
                 // Recreate it immediately
                 exists = false;
             }
-        }
-        catch (e) {
+        } catch (e) {
             console.error(e);
         }
 
@@ -860,6 +813,17 @@ export class Organization extends QueryableModel {
         return admins.filter(a => a.permissions && a.permissions.forOrganization(this)?.hasFullAccess());
     }
 
+    /**
+     * These email addresess are private
+     */
+    async getFinanceAdmins() {
+        const admins = await this.getAdmins();
+        const filtered = admins.filter(a => a.permissions && (a.permissions.forOrganization(this)?.hasFullAccess() || a.permissions.forOrganization(this)?.hasAccessRight(AccessRight.OrganizationFinanceDirector)));
+
+        // Only full access
+        return filtered;
+    }
+
     /**
      * These email addresess are private
      */
@@ -879,32 +843,90 @@ export class Organization extends QueryableModel {
         return filtered.flatMap(f => f.getEmailTo());
     }
 
+    adminsToRecipients(admins: User[]) {
+        return admins.flatMap((f) => {
+            return Recipient.create({
+                firstName: f.firstName,
+                lastName: f.lastName,
+                email: f.email,
+                replacements: [],
+            });
+        });
+    }
+
     /**
      * These email addresess are private
      */
     async getAdminRecipients(): Promise<Recipient[]> {
-        let filtered = await this.getFullAdmins();
+        const filtered = await this.getFullAdmins();
+        return this.adminsToRecipients(filtered);
+    }
 
-        if (STAMHOOFD.environment === 'production') {
-            if (filtered.length > 1) {
-                // remove stamhoofd email addresses
-                filtered = filtered.filter(e => !e.email.endsWith('@stamhoofd.be') && !e.email.endsWith('@stamhoofd.nl'));
-            }
+    /**
+     * These email addresess are private
+     */
+    async getFinanceAdminRecipients(): Promise<Recipient[]> {
+        const filtered = await this.getFullAdmins();
+        return this.adminsToRecipients(filtered);
+    }
+
+    /**
+     * These email addresess are private
+     */
+    async getInvoicingToEmails() {
+        // Circular reference fix
+        const filtered = await this.getFinanceAdmins();
+
+        if (filtered.length > 0) {
+            return filtered.flatMap(f => f.getEmailTo()).map((recipient) => {
+                if (!recipient.name) {
+                    return recipient.email;
+                }
+                const cleanedName = Formatter.emailSenderName(recipient.name);
+                if (cleanedName.length < 2) {
+                    return recipient.email;
+                }
+                return '"' + cleanedName + '" <' + recipient.email + '>';
+            }).join(', ');
         }
 
-        return filtered.flatMap((f) => {
-            return Recipient.create({
-                firstName: f.firstName,
-                lastName: f.lastName,
-                email: f.email,
-                replacements: [
-                    Replacement.create({
-                        token: 'organizationName',
-                        value: this.name,
-                    }),
-                ],
-            });
+        return undefined;
+    }
+
+    /**
+     * Returns one email for invoices. since in ubl we can only add one address.
+     * We choose the oldest user that was active in the last 3 months (otherwise the oldest user if noone was active)
+     */
+    async getInvoicingToEmail(): Promise<string | undefined> {
+        // Circular reference fix
+        const admins = await this.getAdmins();
+
+        const tokens = await Token.select().where('userId', admins.map(a => a.id)).fetch();
+
+        // Sort by admins that were active in the last 3 months, then creation date
+        const cutoffDate = new Date(Date.now() - 1000 * 60 * 60 * 24 * 31 * 3);
+        admins.sort((a, b) => {
+            const aTokens = tokens.filter(t => t.userId === a.id);
+            const bTokens = tokens.filter(t => t.userId === b.id);
+            const aActive = !!aTokens.find(t => t.updatedAt > cutoffDate);
+            const bActive = !!bTokens.find(t => t.updatedAt > cutoffDate);
+            return Sorter.stack(
+                Sorter.byBooleanValue(aActive, bActive),
+                Sorter.byDateValue(b.createdAt, a.createdAt),
+            );
         });
+
+        const filtered = admins.filter(a => a.verified && a.permissions && !a.email.endsWith('@stamhoofd.be') && (a.permissions.forOrganization(this)?.hasFullAccess() || a.permissions.forOrganization(this)?.hasAccessRight(AccessRight.OrganizationFinanceDirector)));
+
+        if (filtered.length > 0) {
+            return filtered.map(f => f.email)[0];
+        }
+        const filtered2 = admins.filter(a => a.verified && a.permissions && (a.permissions.forOrganization(this)?.hasFullAccess() || a.permissions.forOrganization(this)?.hasAccessRight(AccessRight.OrganizationFinanceDirector)));
+
+        if (filtered2.length > 0) {
+            return filtered2.map(f => f.email)[0];
+        }
+        return undefined;
     }
 
     /**
@@ -926,10 +948,10 @@ export class Organization extends QueryableModel {
         if (mandate) {
             return {
                 provider: mandate.provider,
-                stripeAccount: null
-            }
+                stripeAccount: null,
+            };
         }
-        
+
         let stripeAccount = (config.stripeAccountId ? (await StripeAccount.getByID(config.stripeAccountId)) : null) ?? null;
         if (stripeAccount && stripeAccount.organizationId !== this.id) {
             console.warn('Stripe account ' + stripeAccount.id + ' is not linked to organization ' + this.id);
@@ -1016,7 +1038,7 @@ export class Organization extends QueryableModel {
      * Assures at least one company at all times
      */
     get defaultCompanies() {
-        return this.meta.companies.length
+        const b = this.meta.companies.length
             ? this.meta.companies
             : [
                     Company.create({
@@ -1024,5 +1046,12 @@ export class Organization extends QueryableModel {
                         address: this.address,
                     }),
                 ];
+
+        // Missing address -> use organization address
+        if (!b[0].address) {
+            b[0].address = this.address;
+        }
+
+        return b;
     }
 }