@stamhoofd/models 2.12.0 → 2.16.0

package/src/models/MergedMember.ts

@@ -0,0 +1,112 @@
+import { Model, column } from "@simonbackx/simple-database";
+import { MemberDetails } from "@stamhoofd/structures";
+import { Member } from "./";
+
+export class MergedMember extends Model {
+    static override table = "merged_members";
+  
+    //#region Member columns
+    @column({
+      primary: true,
+      type: "string",
+    })
+    id: string = "";
+  
+    @column({ type: "string", nullable: true })
+    organizationId: string | null = null;
+  
+    @column({
+      type: "string",
+    })
+    firstName: string;
+  
+    @column({
+      type: "string",
+    })
+    lastName: string;
+  
+    @column({
+      type: "string",
+      nullable: true,
+    })
+    birthDay: string | null;
+  
+    @column({
+      type: "string",
+      nullable: true,
+    })
+    memberNumber: string | null;
+  
+    @column({ type: "json", decoder: MemberDetails })
+    details: MemberDetails;
+  
+    /**
+     * Not yet paid balance
+     */
+    @column({ type: "integer" })
+    outstandingBalance = 0;
+  
+    @column({
+      type: "datetime",
+      beforeSave(old?: any) {
+        if (old !== undefined) {
+          return old;
+        }
+        const date = new Date();
+        date.setMilliseconds(0);
+        return date;
+      },
+    })
+    createdAt: Date;
+  
+    @column({
+      type: "datetime",
+      beforeSave() {
+        const date = new Date();
+        date.setMilliseconds(0);
+        return date;
+      },
+      skipUpdate: true,
+    })
+    updatedAt: Date;
+    //#endregion
+  
+    //#region extra columns
+    @column({
+      type: "string",
+      nullable: false,
+    })
+    mergedToId: string = "";
+  
+    @column({
+      type: "datetime",
+      beforeSave(old?: any) {
+        if (old !== undefined) {
+          return old;
+        }
+        const date = new Date();
+        date.setMilliseconds(0);
+        return date;
+      },
+    })
+    mergedAt: Date;
+    //#endregion
+  
+    static fromMember(member: Member, mergedToId: string): MergedMember {
+      const mergedMember = new MergedMember();
+      mergedMember.mergedToId = mergedToId;
+      mergedMember.mergedAt = new Date();
+  
+      mergedMember.id = member.id;
+      mergedMember.organizationId = member.organizationId;
+      mergedMember.firstName = member.firstName;
+      mergedMember.lastName = member.lastName;
+      mergedMember.birthDay = member.birthDay;
+      mergedMember.memberNumber = member.memberNumber;
+      mergedMember.outstandingBalance = member.outstandingBalance;
+      mergedMember.createdAt = new Date(member.createdAt);
+      mergedMember.updatedAt = new Date(member.updatedAt);
+      mergedMember.details = member.details.clone();
+      return mergedMember;
+    }
+  }

package/src/models/Order.ts

@@ -2,13 +2,13 @@ import { column, ManyToOneRelation, Model } from "@simonbackx/simple-database";
 import { SimpleError } from "@simonbackx/simple-errors";
 import { Email } from '@stamhoofd/email';
 import { QueueHandler } from "@stamhoofd/queues";
-import { BalanceItemPaymentWithPrivatePayment,BalanceItemWithPayments, BalanceItemWithPrivatePayments, EmailTemplateType, BalanceItemPaymentWithPayment, Order as OrderStruct, OrderData, OrderStatus, Payment as PaymentStruct, PaymentMethod, PrivateOrder, PrivatePayment, ProductType, Recipient, Replacement, WebshopPreview, WebshopStatus, WebshopTicketType, WebshopTimeSlot } from '@stamhoofd/structures';
+import { BalanceItemPaymentWithPayment, BalanceItemPaymentWithPrivatePayment, BalanceItemWithPayments, BalanceItemWithPrivatePayments, EmailTemplateType, OrderData, OrderStatus, Order as OrderStruct, PaymentMethod, Payment as PaymentStruct, PrivateOrder, PrivatePayment, ProductType, Recipient, Replacement, WebshopPreview, WebshopStatus, WebshopTicketType, WebshopTimeSlot } from '@stamhoofd/structures';
 import { Formatter } from "@stamhoofd/utility";
 import { v4 as uuidv4 } from "uuid";
 
-import { getEmailBuilder } from "../helpers/EmailBuilder";
+import { getEmailBuilderForTemplate } from "../helpers/EmailBuilder";
 import { WebshopCounter } from '../helpers/WebshopCounter';
-import { BalanceItem, EmailTemplate, Organization, Payment, Ticket, Webshop, WebshopDiscountCode } from './';
+import { BalanceItem, Organization, Payment, Ticket, Webshop, WebshopDiscountCode } from './';
 
 export class Order extends Model {
     static table = "webshop_orders";
@@ -860,20 +860,6 @@ export class Order extends Model {
             return
         }
 
-        // First fetch template
-        let templates = (await EmailTemplate.where({ type: data.type, webshopId: this.webshop.id }))
-
-        if (templates.length == 0) {
-            templates = (await EmailTemplate.where({ type: data.type, organizationId: null }))
-        }
-
-        if (templates.length == 0) {
-            console.error("Could not find email template for type "+data.type)
-            return
-        }
-
-        const template = templates[0]
-
         let recipient = (await this.getStructure()).getRecipient(
             this.webshop.organization.getBaseStructure(), 
             WebshopPreview.create(this.webshop)
@@ -889,10 +875,12 @@ export class Order extends Model {
         }
 
         // Create e-mail builder
-        const builder = await getEmailBuilder(this.webshop.organization, {
+        const builder = await getEmailBuilderForTemplate(this.webshop.organization, {
             recipients: [recipient],
-            subject: template.subject,
-            html: template.html,
+            template: {
+                type: data.type,
+                webshopId: this.id
+            },
             // text: template.text,
             from: data.from,
             replyTo: data.replyTo,
@@ -900,7 +888,9 @@ export class Order extends Model {
             defaultReplacements: this.webshop.meta.getEmailReplacements()
         })
 
-        Email.schedule(builder)
+        if (builder) {
+            Email.schedule(builder)
+        }
     }
 
     /**

package/src/models/Organization.ts

@@ -3,17 +3,17 @@ import { DecodedRequest } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { I18n } from "@stamhoofd/backend-i18n";
 import { Email, EmailInterfaceRecipient } from "@stamhoofd/email";
-import { AccessRight, Address, Company, Country, DNSRecordStatus, EmailTemplateType, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, OrganizationRecordsConfiguration, OrganizationRegistrationPeriod as OrganizationRegistrationPeriodStruct, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from "@stamhoofd/structures";
+import { AccessRight, Address, Country, DNSRecordStatus, EmailTemplateType, OrganizationEmail, OrganizationMetaData, OrganizationPrivateMetaData, Organization as OrganizationStruct, PaymentMethod, PaymentProvider, PrivatePaymentConfiguration, Recipient, Replacement, STPackageType, TransferSettings } from "@stamhoofd/structures";
 import { AWSError } from 'aws-sdk';
 import SES from 'aws-sdk/clients/sesv2';
 import { PromiseResult } from 'aws-sdk/lib/request';
 import { v4 as uuidv4 } from "uuid";
 
+import { QueueHandler } from "@stamhoofd/queues";
 import { validateDNSRecords } from "../helpers/DNSValidator";
-import { getEmailBuilder } from "../helpers/EmailBuilder";
+import { getEmailBuilderForTemplate } from "../helpers/EmailBuilder";
 import { OrganizationServerMetaData } from '../structures/OrganizationServerMetaData';
-import { EmailTemplate, Group, OrganizationRegistrationPeriod, RegistrationPeriod, StripeAccount } from "./";
-import { QueueHandler } from "@stamhoofd/queues";
+import { Group, OrganizationRegistrationPeriod, StripeAccount } from "./";
 
 export class Organization extends Model {
     static table = "organizations";
@@ -426,22 +426,11 @@ export class Organization extends Model {
         replyTo?: string,
         bcc?: boolean
     }) {
-        // First fetch template
-        const templates = (await EmailTemplate.where({ type: data.type, organizationId: null }))
-
-        if (templates.length == 0) {
-            console.error("Could not find email template for type "+data.type)
-            return
-        }
-
-        const template = templates[0]
-
         const recipients = await this.getAdminRecipients();
-
         const defaultI18n = new I18n("nl", Country.Belgium)
         const i18n = this.i18n;
 
-        const replacementStrings = [
+        const replaceAll = [
             {
                 from: defaultI18n.$t("shared.domains.marketing"),
                 to: i18n.$t("shared.domains.marketing")
@@ -456,17 +445,13 @@ export class Organization extends Model {
             }
         ];
 
-        let html = template.html;
-
-        for (const s of replacementStrings) {
-            html = html.replaceAll(s.from, s.to)
-        }
-
         // Create e-mail builder
-        const builder = await getEmailBuilder(this, {
+        const builder = await getEmailBuilderForTemplate(this, {
+            replaceAll,
             recipients,
-            subject: template.subject,
-            html,
+            template: {
+                type: data.type
+            },
             from: data.personal ? Email.getPersonalEmailFor(this.i18n) : Email.getInternalEmailFor(this.i18n),
             singleBcc: data.bcc ? 'simon@stamhoofd.be' : undefined,
             replyTo: data.replyTo,
@@ -481,7 +466,9 @@ export class Organization extends Model {
             fromStamhoofd: true
         })
 
-        Email.schedule(builder)
+        if (builder) {
+            Email.schedule(builder)
+        }
     }
 
     async deleteAWSMailIdenitity(mailDomain: string) {
@@ -1002,6 +989,10 @@ export class Organization extends Model {
                 human: 'Deze betaalmethode werd helaas niet volledig geconfigureerd. Probeer later even opnieuw, neem contact met ons op of kies een andere betaalmethode.'
             })
         }
+
+        if (provider !== PaymentProvider.Stripe && stripeAccount) {
+            stripeAccount = null
+        }
         return {
             provider,
             stripeAccount

package/src/models/Payment.ts

@@ -164,6 +164,7 @@ export class Payment extends Model {
                         })
                     })
                 }),
+                ...(payment.provider !== PaymentProvider.Stripe ? {stripeAccountId: null} : {}),
                 ...(!includeSettlements) ? {settlement: null, transferFee: 0, stripeAccountId: null} : {}
             })
         })

package/src/models/Registration.ts

@@ -4,10 +4,10 @@ import { EmailTemplateType, GroupPrice, PaymentMethod, PaymentMethodHelper, Reci
 import { Formatter } from '@stamhoofd/utility';
 import { v4 as uuidv4 } from "uuid";
 
-import { getEmailBuilder } from '../helpers/EmailBuilder';
-import { Document, EmailTemplate, Group, Organization, User } from './';
 import { ArrayDecoder } from '@simonbackx/simple-encoding';
 import { QueueHandler } from '@stamhoofd/queues';
+import { getEmailBuilderForTemplate } from '../helpers/EmailBuilder';
+import { Document, Group, Organization, User } from './';
 
 export class Registration extends Model {
     static table = "registrations"
@@ -286,26 +286,6 @@ export class Registration extends Model {
             return
         }
 
-        // Most specific template: for specific group
-        let templates = (await EmailTemplate.where({ type: data.type, groupId: this.groupId, organizationId: group.organizationId }))
-
-        // Then for organization
-        if (templates.length == 0) {
-            templates = (await EmailTemplate.where({ type: data.type, organizationId: group.organizationId, groupId: null }))
-        }
-
-        // Then default
-        if (templates.length == 0) {
-            templates = (await EmailTemplate.where({ type: data.type, organizationId: null, groupId: null }))
-        }
-
-        if (templates.length == 0) {
-            console.error("Could not find email template for type "+data.type)
-            return
-        }
-
-        const template = templates[0]
-
         const organization = await Organization.getByID(group.organizationId);
         if (!organization) {
             return
@@ -316,37 +296,26 @@ export class Registration extends Model {
         const {from, replyTo} = organization.getGroupEmail(group)
 
         // Create e-mail builder
-        const builder = await getEmailBuilder(organization, {
+        const builder = await getEmailBuilderForTemplate(organization, {
+            template: {
+                type: data.type, 
+                groupId: this.groupId
+            },
             recipients,
-            subject: template.subject,
-            html: template.html,
             from,
             type: "transactional",
             replyTo
         })
 
-        Email.schedule(builder)
+        if (builder) {
+            Email.schedule(builder)
+        }
     }
 
     static async sendTransferEmail(user: User, organization: Organization, payment: import('./').Payment) {
         const data = {
             type: EmailTemplateType.RegistrationTransferDetails
         };
-
-        // First fetch template
-        let templates = (await EmailTemplate.where({ type: data.type, organizationId: organization.id, groupId: null }))
-
-        if (templates.length == 0) {
-            templates = (await EmailTemplate.where({ type: data.type, organizationId: null, groupId: null }))
-        }
-
-        if (templates.length == 0) {
-            console.error("Could not find email template for type "+data.type)
-            return
-        }
-
-        const template = templates[0]
-
         const paymentGeneral = await payment.getGeneralStructure();
         const groupIds = paymentGeneral.groupIds;
 
@@ -430,15 +399,18 @@ export class Registration extends Model {
         }
 
         // Create e-mail builder
-        const builder = await getEmailBuilder(organization, {
+        const builder = await getEmailBuilderForTemplate(organization, {
+            template: {
+                type: EmailTemplateType.RegistrationTransferDetails
+            },
             recipients,
-            subject: template.subject,
-            html: template.html,
             from,
             replyTo
         })
 
-        Email.schedule(builder)
+        if (builder) {
+            Email.schedule(builder)
+        }
     }
 
     shouldIncludeStock() {

package/src/models/STPackage.ts

@@ -5,9 +5,8 @@ import { EmailTemplateType, Recipient, Replacement, STPackageMeta, STPackageStat
 import { Formatter } from "@stamhoofd/utility";
 import { v4 as uuidv4 } from "uuid";
 
-import { getEmailBuilder } from "../helpers/EmailBuilder";
+import { getEmailBuilderForTemplate } from "../helpers/EmailBuilder";
 import { GroupBuilder } from "../helpers/GroupBuilder";
-import { EmailTemplate } from "./";
 import { Organization } from "./";
 
 export class STPackage extends Model {
@@ -257,14 +256,6 @@ export class STPackage extends Model {
         type: EmailTemplateType,
         replyTo?: string
     }) {
-        // First fetch template
-        const templates = await EmailTemplate.where({ type: data.type, organizationId: null })
-
-        if (!templates || templates.length == 0) {
-            console.error("Could not find email template for type "+data.type)
-            return
-        }
-
         const organization = await Organization.getByID(this.organizationId)
 
         if (!organization) {
@@ -272,7 +263,6 @@ export class STPackage extends Model {
             return
         }
 
-        const template = templates[0]
         const admins = await organization.getFullAdmins()
 
         const recipients = admins.map(admin => 
@@ -308,17 +298,19 @@ export class STPackage extends Model {
                 ]
             })
         );
-
         
         // Create e-mail builder
-        const builder = await getEmailBuilder(organization, {
+        const builder = await getEmailBuilderForTemplate(organization, {
+            template: {
+                type: data.type
+            },
             recipients,
-            subject: template.subject,
-            html: template.html,
             from: Email.getInternalEmailFor(organization.i18n),
             replyTo: data.replyTo
         })
 
-        Email.schedule(builder)
+        if (builder) {
+            Email.schedule(builder)
+        }
     }
 }

package/src/models/User.ts

@@ -1,7 +1,7 @@
 
 import { column, Database, ManyToOneRelation, Model } from "@simonbackx/simple-database";
 import { EmailInterfaceRecipient } from "@stamhoofd/email";
-import { LoginProviderType, NewUser, Permissions, UserMeta, UserPermissions, User as UserStruct } from "@stamhoofd/structures";
+import { LoginProviderType, NewUser, Permissions, Recipient, Replacement, UserMeta, UserPermissions, User as UserStruct } from "@stamhoofd/structures";
 import argon2 from "argon2";
 import { v4 as uuidv4 } from "uuid";
 
@@ -92,6 +92,29 @@ export class User extends Model {
         return null;
     }
 
+    createRecipient(...replacements: Replacement[]) {
+        return Recipient.create({
+            firstName: this.firstName,
+            lastName: this.lastName,
+            email: this.email,
+            replacements: [
+                ...replacements,
+                Replacement.create({
+                    token: 'firstName',
+                    value: this.firstName ?? ''
+                }),
+                Replacement.create({
+                    token: 'lastName',
+                    value: this.lastName ?? ''
+                }),
+                Replacement.create({
+                    token: 'email',
+                    value: this.email
+                })
+            ]
+        })
+    }
+
     static async getAdmins(organizationIds: string[], options?: {verified?: boolean}) {
         if (organizationIds.length == 0) {
             return []

package/src/models/index.ts

@@ -4,6 +4,7 @@ export {User} from "./User"
 export {Payment} from "./Payment"
 export {Registration} from "./Registration"
 export {Member, RegistrationWithMember, MemberWithRegistrations} from "./Member"
+export {MergedMember} from "./MergedMember"
 
 export * from "./EmailVerificationCode"