@stamhoofd/models 2.116.0 → 2.117.0

package/src/models/AuditLog.ts

@@ -1,7 +1,7 @@
 import { column } from '@simonbackx/simple-database';
 import { ArrayDecoder, Decoder, MapDecoder, StringDecoder, StringOrNumberDecoder } from '@simonbackx/simple-encoding';
 import { QueryableModel } from '@stamhoofd/sql';
-import { AuditLogPatchItem, AuditLogReplacement, AuditLogSource, AuditLogType } from '@stamhoofd/structures';
+import { AuditLogPatchItem, AuditLogReplacement, AuditLogSource, AuditLogType, getAuditLogTypeReplacements } from '@stamhoofd/structures';
 import { v7 as uuidv7 } from 'uuid';
 
 export class AuditLog extends QueryableModel {
@@ -70,4 +70,13 @@ export class AuditLog extends QueryableModel {
         },
     })
     createdAt: Date;
+
+    validate() {
+        const replacements = getAuditLogTypeReplacements(this.type);
+        for (const replacement of replacements) {
+            if (!this.replacements.has(replacement)) {
+                throw new Error(`Missing replacement ${replacement}`);
+            }
+        }
+    }
 }

package/src/models/BalanceItem.ts

@@ -48,6 +48,12 @@ export class BalanceItem extends QueryableModel {
     @column({ type: 'string', nullable: true })
     orderId: string | null = null;
 
+    /**
+     * The STPackage ID that is linked to this balance item
+     */
+    @column({ type: 'string', nullable: true })
+    packageId: string | null = null;
+
     /**
      * The depending balance item ID that is linked to this balance item
      * -> as soon as this balance item is paid, we'll mark this balance item as pending if it is still hidden
@@ -65,6 +71,20 @@ export class BalanceItem extends QueryableModel {
     @column({ type: 'string' })
     description = '';
 
+    /**
+     * In case this balance item is associated with an item that was charged for a certain period, the startDate is saved here.
+     * e.g. startDate of the registration.
+     */
+    @column({ type: 'datetime', nullable: true })
+    startDate: Date | null = null;
+
+    /**
+     * In case this balance item is associated with an item that was charged for a certain period, the endDate is saved here.
+     * e.g. endDate of the registration.
+     */
+    @column({ type: 'datetime', nullable: true })
+    endDate: Date | null = null;
+
     /**
      * @deprecated Use quantity
      */
@@ -306,6 +326,16 @@ export class BalanceItem extends QueryableModel {
         return this.priceWithVAT - this.pricePaid - this.pricePending;
     }
 
+    /**
+     * Returns zero if the balance item is canceled, otherwise priceWithVAT
+     */
+    get priceDue() {
+        if (this.status === BalanceItemStatus.Canceled) {
+            return 0;
+        }
+        return this.priceWithVAT;
+    }
+
     /**
      * price minus pricePaid
      */
@@ -513,7 +543,7 @@ export class BalanceItem extends QueryableModel {
         await Database.update(query, params);
     }
 
-    static async loadPayments(items: BalanceItem[]) {
+    static async loadPayments(items: (BalanceItem | { id: string })[]) {
         if (items.length == 0) {
             return { balanceItemPayments: [], payments: [] };
         }
@@ -535,7 +565,7 @@ export class BalanceItem extends QueryableModel {
         });
     }
 
-    static async getStructureWithPayments(items: BalanceItem[]): Promise<BalanceItemWithPayments[]> {
+    static async getStructureWithPayments(items: (BalanceItem | BalanceItemStruct)[]): Promise<BalanceItemWithPayments[]> {
         if (items.length === 0) {
             return [];
         }

package/src/models/Invoice.ts

@@ -153,63 +153,6 @@ export class Invoice extends QueryableModel {
     })
     updatedAt: Date;
 
-    static async createFrom(organization: { id: string }, struct: InvoiceStruct) {
-        const model = new Invoice();
-        model.customer = struct.customer;
-        model.seller = struct.seller;
-        model.organizationId = organization.id;
-        model.payingOrganizationId = struct.payingOrganizationId;
-
-        model.payableRoundingAmount = struct.payableRoundingAmount;
-        model.VATTotal = struct.VATTotal;
-        model.VATTotalAmount = struct.VATTotalAmount;
-        model.totalWithoutVAT = struct.totalWithoutVAT;
-        model.totalWithVAT = struct.totalWithVAT;
-        model.totalBalanceInvoicedAmount = struct.totalBalanceInvoicedAmount;
-
-        model.ipAddress = struct.ipAddress;
-        model.userAgent = struct.userAgent;
-
-        model.stripeAccountId = struct.stripeAccountId;
-        model.reference = struct.reference;
-
-        model.negativeInvoiceId = struct.negativeInvoiceId;
-
-        await model.save();
-
-        // Create balances
-        try {
-            for (const item of struct.items) {
-                const invoiced = new InvoicedBalanceItem();
-                invoiced.invoiceId = model.id;
-                invoiced.organizationId = model.organizationId;
-                invoiced.balanceItemId = item.balanceItemId;
-
-                invoiced.VATExcempt = item.VATExcempt;
-                invoiced.VATPercentage = item.VATPercentage;
-                invoiced.VATIncluded = item.VATIncluded;
-
-                invoiced.unitPrice = item.unitPrice;
-                invoiced.quantity = item.quantity;
-
-                invoiced.balanceInvoicedAmount = item.balanceInvoicedAmount;
-
-                invoiced.totalWithoutVAT = item.totalWithoutVAT;
-
-                await invoiced.save();
-            }
-        }
-        catch (e) {
-            try {
-                await model.delete();
-            }
-            catch (ee) {
-                console.error('Error while trying to delete invoice because of fail save', ee, 'Deleting because of error', e);
-            }
-            throw e;
-        }
-    }
-
     static async loadBalanceItems(invoices: Invoice[]) {
         if (invoices.length === 0) {
             return { invoicedBalanceItems: [] };

package/src/models/Organization.ts

@@ -210,7 +210,7 @@ export class Organization extends QueryableModel {
     /**
      * Potentially includes a path
      */
-    getHost(i18n?: I18n): string {
+    getRegistrationHost(i18n?: { language: Language; locale: string }): string {
         if (this.registerDomain) {
             let d = this.registerDomain;
 
@@ -220,10 +220,10 @@ export class Organization extends QueryableModel {
 
             return d;
         }
-        return this.getDefaultHost(i18n);
+        return this.getDefaultRegistrationHost(i18n);
     }
 
-    getDefaultHost(i18n?: I18n): string {
+    getDefaultRegistrationHost(i18n?: { language: Language; locale: string }): string {
         if (!STAMHOOFD.domains.registration) {
             return STAMHOOFD.domains.dashboard + '/' + (i18n?.locale ?? this.i18n.locale) + '/' + appToUri('registration') + '/' + this.uri;
         }
@@ -236,6 +236,26 @@ export class Organization extends QueryableModel {
         return this.uri + '.' + defaultDomain;
     }
 
+    get registerUrl() {
+        return 'https://' + this.getRegistrationHost();
+    }
+
+    /**
+     * @deprecated
+     * use getRegistrationHost
+     */
+    getHost(i18n?: I18n): string {
+        return this.getRegistrationHost(i18n);
+    }
+
+    /**
+     * @deprecated
+     * Use getDefaultRegistrationHost
+     */
+    getDefaultHost(i18n?: I18n): string {
+        return this.getDefaultRegistrationHost(i18n);
+    }
+
     get marketingDomain(): string {
         return STAMHOOFD.domains.marketing[this.address.country] ?? STAMHOOFD.domains.marketing[''];
     }
@@ -940,4 +960,13 @@ export class Organization extends QueryableModel {
 
         return providers;
     }
+
+    override async delete(): Promise<void> {
+        // Clear periodID first to remove circular dependency
+        if (this.periodId) {
+            await Organization.update().where('id', this.id).set('periodId', null).update();
+        }
+
+        return await super.delete();
+    }
 }

package/src/models/Registration.ts

@@ -1,12 +1,11 @@
-import { column, Database, ManyToOneRelation } from '@simonbackx/simple-database';
-import { AppliedRegistrationDiscount, EmailTemplateType, GroupPrice, PaymentMethod, PaymentMethodHelper, Recipient, RecordAnswer, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, Replacement, StockReservation } from '@stamhoofd/structures';
-import { Formatter } from '@stamhoofd/utility';
+import { column, ManyToOneRelation } from '@simonbackx/simple-database';
+import { AppliedRegistrationDiscount, EmailTemplateType, GroupPrice, Recipient, RecordAnswer, RecordAnswerDecoder, RegisterItemOption, Registration as RegistrationStructure, Replacement, StockReservation } from '@stamhoofd/structures';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ArrayDecoder, MapDecoder, StringDecoder } from '@simonbackx/simple-encoding';
-import { QueryableModel } from '@stamhoofd/sql';
+import { QueryableModel, SQL } from '@stamhoofd/sql';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
-import { Group, Organization, User } from './index.js';
+import { Group, Organization } from './index.js';
 
 export class Registration extends QueryableModel {
     static table = 'registrations';
@@ -169,21 +168,23 @@ export class Registration extends QueryableModel {
      * This is used for billing
      */
     static async getActiveMembers(organizationId: string): Promise<number> {
-        const query = `
-        SELECT COUNT(DISTINCT \`${Registration.table}\`.memberId) as c FROM \`${Registration.table}\` 
-        JOIN \`groups\` ON \`groups\`.id = \`${Registration.table}\`.groupId
-        WHERE \`groups\`.organizationId = ? AND \`${Registration.table}\`.cycle = \`groups\`.cycle AND \`groups\`.deletedAt is null AND \`${Registration.table}\`.registeredAt is not null AND \`${Registration.table}\`.deactivatedAt is null`;
-
-        const [results] = await Database.select(query, [organizationId]);
-        const count = results[0]['']['c'];
-
-        if (Number.isInteger(count)) {
-            return count as number;
-        }
-        else {
-            console.error('Unexpected result for occupancy', results);
-            throw new Error('Query failed');
+        const organization = await Organization.getByID(organizationId);
+        if (!organization) {
+            return 0;
         }
+
+        return await this.select()
+            .join(
+                SQL.join(Group.table)
+                    .where(SQL.column('id'), SQL.parentColumn('groupId')),
+            )
+            .where('periodId', organization.periodId)
+            .where('deactivatedAt', null)
+            .where('registeredAt', '!=', null)
+            .where(SQL.column(Group.table, 'deletedAt'), null)
+            .count(
+                SQL.distinct(SQL.column('memberId')),
+            );
     }
 
     async getRecipients(organization: Organization, group: import('./').Group) {
@@ -251,85 +252,6 @@ export class Registration extends QueryableModel {
         });
     }
 
-    static async sendTransferEmail(user: User, organization: Organization, payment: import('./').Payment) {
-        const paymentGeneral = await payment.getGeneralStructure();
-        const groupIds = paymentGeneral.groupIds;
-
-        const recipients = [
-            Recipient.create({
-                firstName: user.firstName,
-                lastName: user.lastName,
-                email: user.email,
-                userId: user.id,
-                replacements: [
-                    Replacement.create({
-                        token: 'priceToPay',
-                        value: Formatter.price(payment.price),
-                    }),
-                    Replacement.create({
-                        token: 'paymentMethod',
-                        value: PaymentMethodHelper.getName(payment.method ?? PaymentMethod.Unknown),
-                    }),
-                    Replacement.create({
-                        token: 'transferDescription',
-                        value: (payment.transferDescription ?? ''),
-                    }),
-                    Replacement.create({
-                        token: 'transferBankAccount',
-                        value: payment.transferSettings?.iban ?? '',
-                    }),
-                    Replacement.create({
-                        token: 'transferBankCreditor',
-                        value: payment.transferSettings?.creditor ?? organization.name,
-                    }),
-                    Replacement.create({
-                        token: 'overviewContext',
-                        value: $t(`01d5fd7e-2960-4eb4-ab3a-2ac6dcb2e39c`) + ' ' + paymentGeneral.memberNames,
-                    }),
-                    Replacement.create({
-                        token: 'memberNames',
-                        value: paymentGeneral.memberNames,
-                    }),
-                    Replacement.create({
-                        token: 'overviewTable',
-                        value: '',
-                        html: paymentGeneral.getDetailsHTMLTable(),
-                    }),
-                    Replacement.create({
-                        token: 'paymentTable',
-                        value: '',
-                        html: paymentGeneral.getHTMLTable(),
-                    }),
-                    Replacement.create({
-                        token: 'registerUrl',
-                        value: 'https://' + organization.getHost(),
-                    }),
-                    Replacement.create({
-                        token: 'organizationName',
-                        value: organization.name,
-                    }),
-                ],
-            }),
-        ];
-
-        let group: Group | undefined | null = null;
-
-        if (groupIds.length == 1) {
-            const Group = (await import('./index.js')).Group;
-            group = await Group.getByID(groupIds[0]);
-        }
-
-        // Create e-mail builder
-        await sendEmailTemplate(organization, {
-            template: {
-                type: EmailTemplateType.RegistrationTransferDetails,
-                group,
-            },
-            type: 'transactional',
-            recipients,
-        });
-    }
-
     shouldIncludeStock() {
         return (this.registeredAt !== null && this.deactivatedAt === null) || this.canRegister || (this.reservedUntil && this.reservedUntil > new Date());
     }

package/src/models/RegistrationPeriod.ts

@@ -68,6 +68,12 @@ export class RegistrationPeriod extends QueryableModel {
         return RegistrationPeriodStruct.create(this);
     }
 
+    configureForNewOrganization() {
+        this.settings = RegistrationPeriodSettings.create({});
+        this.startDate = new Date();
+        this.endDate = new Date(Date.now() + 1000 * 60 * 60 * 24 * 31); // 1 month
+    }
+
     static async getByDate(date: Date, organizationId: string | null): Promise<RegistrationPeriod | null> {
         if (STAMHOOFD.userMode === 'organization' && organizationId === null) {
             throw new SimpleError({

package/src/models/STPackage.ts

@@ -6,7 +6,6 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { QueryableModel } from '@stamhoofd/sql';
 import { sendEmailTemplate } from '../helpers/EmailBuilder.js';
-import { GroupBuilder } from '../helpers/GroupBuilder.js';
 import { Organization } from './index.js';
 
 export class STPackage extends QueryableModel {
@@ -66,55 +65,6 @@ export class STPackage extends QueryableModel {
     @column({ type: 'datetime', nullable: true })
     lastEmailAt: Date | null = null;
 
-    static async getForOrganization(organizationId: string) {
-        const pack1 = await STPackage.where({ organizationId, validAt: { sign: '!=', value: null }, removeAt: { sign: '>', value: new Date() } });
-        const pack2 = await STPackage.where({ organizationId, validAt: { sign: '!=', value: null }, removeAt: null });
-
-        return [...pack1, ...pack2];
-    }
-
-    static async getForOrganizationIncludingExpired(organizationId: string) {
-        return await STPackage.where({ organizationId, validAt: { sign: '!=', value: null } }, { sort: [{ column: 'validAt', direction: 'DESC' }] });
-    }
-
-    static async getOrganizationPackagesMap(organizationId: string): Promise<Map<STPackageType, STPackageStatus>> {
-        const packages = await this.getForOrganizationIncludingExpired(organizationId);
-
-        const map = new Map<STPackageType, STPackageStatus>();
-        for (const pack of packages) {
-            const exist = map.get(pack.meta.type);
-            if (exist) {
-                exist.merge(pack.createStatus());
-            }
-            else {
-                map.set(pack.meta.type, pack.createStatus());
-            }
-        }
-
-        return map;
-    }
-
-    static async updateOrganizationPackages(organizationId: string) {
-        console.log('Updating packages for organization ' + organizationId);
-        const map = await this.getOrganizationPackagesMap(organizationId);
-
-        const organization = await Organization.getByID(organizationId);
-        if (organization) {
-            const didUseMembers = organization.meta.packages.useMembers && organization.meta.packages.useActivities;
-            organization.meta.packages.packages = map;
-            await organization.save();
-
-            if (!didUseMembers && organization.meta.packages.useMembers && organization.meta.packages.useActivities) {
-                console.log('Building groups and categories for ' + organization.id);
-                const builder = new GroupBuilder(organization);
-                await builder.build();
-            }
-        }
-        else {
-            console.error("Couldn't find organization when updating packages " + organizationId);
-        }
-    }
-
     async activate() {
         if (this.validAt !== null) {
             return;

package/dist/src/helpers/GroupBuilder.d.ts

@@ -1,9 +0,0 @@
-import { Group, Organization } from '../models/index.js';
-export declare class GroupBuilder {
-    organization: Organization;
-    constructor(organization: Organization);
-    build(): Promise<void>;
-    createSGVGroups(): Promise<Group[]>;
-    createChiroGroups(): Promise<void>;
-}
-//# sourceMappingURL=GroupBuilder.d.ts.map

package/dist/src/helpers/GroupBuilder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"GroupBuilder.d.ts","sourceRoot":"","sources":["../../../src/helpers/GroupBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzD,qBAAa,YAAY;IACrB,YAAY,EAAE,YAAY,CAAC;gBAEf,YAAY,EAAE,YAAY;IAIhC,KAAK;IAgEL,eAAe;IA2Kf,iBAAiB;CAyK1B"}