@stamhoofd/models 2.3.0 → 2.4.0

package/src/helpers/EmailBuilder.ts

@@ -2,13 +2,14 @@ import { EmailAddress, EmailBuilder } from "@stamhoofd/email";
 import { Recipient, Replacement } from "@stamhoofd/structures";
 import { Formatter } from "@stamhoofd/utility";
 
-import { Organization, PasswordToken, User } from "../models";
+import { Organization, Platform, User } from "../models";
+import { SimpleError } from "@simonbackx/simple-errors";
 
-export async function getEmailBuilder(organization: Organization, email: {
+export async function getEmailBuilder(organization: Organization|null, email: {
     defaultReplacements?: Replacement[],
     recipients: Recipient[], 
     from: string, 
-    replyTo?: string, 
+    replyTo?: string|null, 
     subject: string, 
     //text: string | null, 
     html: string | null,
@@ -21,21 +22,31 @@ export async function getEmailBuilder(organization: Organization, email: {
     type?: "transactional" | "broadcast",
     unsubscribeType?: 'all'|'marketing',
     fromStamhoofd?: boolean,
-    singleBcc?: string
+    singleBcc?: string,
+    callback?: (error: Error|null) => void; // for each email
 }) {
+    const platform = await Platform.getSharedStruct()
     // Update recipients
     const cleaned: Recipient[] = []
     for (const recipient of email.recipients) {
         try {
-            const unsubscribe = await EmailAddress.getOrCreate(recipient.email, email.fromStamhoofd ? null : organization.id)
+            const unsubscribe = await EmailAddress.getOrCreate(recipient.email, email.fromStamhoofd || !organization ? null : organization.id)
 
             if (unsubscribe.unsubscribedAll || unsubscribe.hardBounce || unsubscribe.markedAsSpam || !unsubscribe.token || (unsubscribe.unsubscribedMarketing && email.unsubscribeType === 'marketing')) {
                 // Ignore
+                if (email.callback) {
+                    email.callback(
+                        new SimpleError({
+                            code: 'email_unsubscribed',
+                            message: unsubscribe.unsubscribedAll ? "Recipient has unsubscribed" : (unsubscribe.hardBounce ? 'Recipient has hard bounced' : (unsubscribe.markedAsSpam ? 'Recipient has marked as spam' : 'Recipient has unsubscribed from marketing'))
+                        })
+                    )
+                }
                 continue
             }
             recipient.replacements.push(Replacement.create({
                 token: "unsubscribeUrl",
-                value: "https://"+STAMHOOFD.domains.dashboard+"/"+organization.i18n.locale+"/unsubscribe?id="+encodeURIComponent(unsubscribe.id)+"&token="+encodeURIComponent(unsubscribe.token)+"&type="+encodeURIComponent(email.unsubscribeType ?? 'all')
+                value: "https://"+STAMHOOFD.domains.dashboard+"/"+(organization ? (organization.i18n.locale + '/') : '')+"unsubscribe?id="+encodeURIComponent(unsubscribe.id)+"&token="+encodeURIComponent(unsubscribe.token)+"&type="+encodeURIComponent(email.unsubscribeType ?? 'all')
             }))
 
             // Override headers
@@ -55,14 +66,12 @@ export async function getEmailBuilder(organization: Organization, email: {
         recipient.replacements = recipient.replacements.slice()
 
         // Default signInUrl
-        let signInUrl = "https://"+organization.getHost()+"/login?email="+encodeURIComponent(recipient.email)
+        let signInUrl = "https://"+(organization && STAMHOOFD.userMode === 'organization' ? organization.getHost() : STAMHOOFD.domains.dashboard)+"/login?email="+encodeURIComponent(recipient.email)
 
-        if (recipient.userId) {
-            const recipientUser = await User.getByID(recipient.userId)
-            if (recipientUser && recipientUser.organizationId === organization.id && recipientUser.email === recipient.email) {
-                // We can create a special token
-                signInUrl = await PasswordToken.getMagicSignInUrl(recipientUser, organization)
-            }
+        const recipientUser = await User.getForAuthentication(organization?.id ?? null, recipient.email)
+        if (!recipientUser) {
+            // We can create a special token
+            signInUrl = "https://"+(organization && STAMHOOFD.userMode === 'organization' ? organization.getHost() : STAMHOOFD.domains.dashboard)+"/account-aanmaken?email="+encodeURIComponent(recipient.email)
         }
 
         recipient.replacements.push(Replacement.create({
@@ -74,8 +83,13 @@ export async function getEmailBuilder(organization: Organization, email: {
             recipient.replacements.push(...email.defaultReplacements)
         }
 
-        const extra = organization.meta.getEmailReplacements()
-        recipient.replacements.push(...extra)
+        if (organization) {
+            const extra = organization.meta.getEmailReplacements()
+            recipient.replacements.push(...extra)
+        } else {
+            const extra = platform.config.getEmailReplacements()
+            recipient.replacements.push(...extra)
+        }
     }
 
     const queue = email.recipients.slice()
@@ -107,7 +121,7 @@ export async function getEmailBuilder(organization: Organization, email: {
 
         return {
             from: email.from,
-            replyTo: email.replyTo,
+            replyTo: email.replyTo ?? undefined,
             bcc: emailIndex === 1 ? email.singleBcc : undefined,
             to: [
                 {
@@ -120,8 +134,9 @@ export async function getEmailBuilder(organization: Organization, email: {
             html: replacedHtml ?? undefined,
             attachments: email.attachments,
             headers: recipient.headers,
-            type: email.type
+            type: email.type,
+            callback: email.callback
         }
     }
     return builder;
-}
+}

package/src/helpers/GroupBuilder.ts

@@ -87,7 +87,6 @@ export class GroupBuilder {
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
-            prices: this.organization.meta.defaultPrices,
             minAge: 6,
             maxAge: 7
         })
@@ -102,7 +101,6 @@ export class GroupBuilder {
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
-            prices: this.organization.meta.defaultPrices,
             minAge: 17,
             maxAge: 17
         })
@@ -118,7 +116,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 8,
                 maxAge: 10
             })
@@ -133,7 +130,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 11,
                 maxAge: 13
             })
@@ -148,7 +144,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 16
             })
@@ -165,7 +160,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 8,
                 maxAge: 10
             })
@@ -180,7 +174,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 11,
                 maxAge: 13
             })
@@ -195,7 +188,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 16
             })
@@ -212,7 +204,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 8,
                 maxAge: 10
             })
@@ -227,7 +218,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 11,
                 maxAge: 13
             })
@@ -242,7 +232,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 16
             })
@@ -268,7 +257,6 @@ export class GroupBuilder {
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
-            prices: this.organization.meta.defaultPrices,
             minAge: 6,
             maxAge: 7
         })
@@ -282,7 +270,6 @@ export class GroupBuilder {
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
-            prices: this.organization.meta.defaultPrices,
             minAge: 8,
             maxAge: 9
         })
@@ -297,7 +284,6 @@ export class GroupBuilder {
             genderType: mixedType,
             startDate: this.organization.meta.defaultStartDate,
             endDate: this.organization.meta.defaultEndDate,
-            prices: this.organization.meta.defaultPrices,
             minAge: 16,
             maxAge: 17
         })
@@ -312,7 +298,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 10,
                 maxAge: 11
             })
@@ -326,7 +311,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 12,
                 maxAge: 13
             })
@@ -340,7 +324,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.Mixed,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 15
             })
@@ -356,7 +339,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 10,
                 maxAge: 11
             })
@@ -370,7 +352,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 12,
                 maxAge: 13
             })
@@ -384,7 +365,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyFemale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 15
             })
@@ -400,7 +380,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 10,
                 maxAge: 11
             })
@@ -414,7 +393,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 12,
                 maxAge: 13
             })
@@ -428,7 +406,6 @@ export class GroupBuilder {
                 genderType: GroupGenderType.OnlyMale,
                 startDate: this.organization.meta.defaultStartDate,
                 endDate: this.organization.meta.defaultEndDate,
-                prices: this.organization.meta.defaultPrices,
                 minAge: 14,
                 maxAge: 15
             })

package/src/migrations/1721050380-email-table.sql

@@ -0,0 +1,24 @@
+CREATE TABLE `emails` (
+  `id` varchar(36) NOT NULL DEFAULT '',
+  `organizationId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `userId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `recipientFilter` json NOT NULL,
+  `subject` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci,
+  `text` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci,
+  `html` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci,
+  `json` json NOT NULL,
+  `status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `recipientsStatus` varchar(255) NOT NULL,
+  `attachments` json NOT NULL,
+  `sentAt` datetime DEFAULT NULL,
+  `updatedAt` datetime NOT NULL,
+  `createdAt` datetime NOT NULL,
+  `fromAddress` text,
+  `recipientCount` int DEFAULT NULL,
+  `fromName` text,
+  PRIMARY KEY (`id`),
+  KEY `organizationId` (`organizationId`),
+  KEY `userId` (`userId`),
+  CONSTRAINT `emails_ibfk_1` FOREIGN KEY (`organizationId`) REFERENCES `organizations` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `emails_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/migrations/1721050381-email-recipients-table.sql

@@ -0,0 +1,18 @@
+CREATE TABLE `email_recipients` (
+  `id` varchar(36) NOT NULL,
+  `emailId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `firstName` varchar(128) DEFAULT NULL,
+  `lastName` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `email` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `replacements` json NOT NULL,
+  `failErrorMessage` text,
+  `failCount` int NOT NULL DEFAULT '0',
+  `firstFailedAt` datetime DEFAULT NULL,
+  `lastFailedAt` datetime DEFAULT NULL,
+  `sentAt` datetime DEFAULT NULL,
+  `updatedAt` datetime NOT NULL,
+  `createdAt` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `emailId` (`emailId`),
+  CONSTRAINT `email_recipients_ibfk_1` FOREIGN KEY (`emailId`) REFERENCES `emails` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/migrations/1721342679-responsibility-groupId.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_responsibility_records`
+ADD COLUMN `groupId` varchar(36) NULL AFTER `memberId`;

package/src/migrations/1721342680-responsibility-groupId-foreign-key.sql

@@ -0,0 +1 @@
+ALTER TABLE `member_responsibility_records` ADD FOREIGN KEY (`groupId`) REFERENCES `groups` (`id`) ON UPDATE CASCADE ON DELETE CASCADE;

package/src/migrations/1721400546-users-memberId.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `users`
+ADD COLUMN `memberId` varchar(36) NULL AFTER `id`;
+ALTER TABLE `users` ADD FOREIGN KEY (`memberId`) REFERENCES `members` (`id`) ON UPDATE CASCADE ON DELETE SET NULL;

package/src/migrations/1721639159-membership-deleted-at.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `deletedAt` datetime NULL AFTER `createdAt`;

package/src/migrations/1721639160-membership-generated.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `member_platform_memberships`
+ADD COLUMN `generated` tinyint NOT NULL DEFAULT '0';

package/src/migrations/1721841819-group-type.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `groups`
+ADD COLUMN `type` varchar(36) NOT NULL DEFAULT 'Membership' AFTER `id`;

package/src/migrations/1722090482-events.sql

@@ -0,0 +1,18 @@
+CREATE TABLE `events` (
+  `id` varchar(36) NOT NULL DEFAULT '',
+  `typeId` varchar(36) NOT NULL,
+  `name` text NOT NULL,
+  `startDate` datetime NOT NULL,
+  `endDate` datetime NOT NULL,
+  `createdAt` datetime NOT NULL,
+  `updatedAt` datetime NOT NULL,
+  `organizationId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `groupId` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL,
+  `meta` json NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `organizationId` (`organizationId`),
+  KEY `groupId` (`groupId`),
+  KEY `startDate` (`startDate`) USING BTREE,
+  CONSTRAINT `events_ibfk_1` FOREIGN KEY (`organizationId`) REFERENCES `organizations` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `events_ibfk_2` FOREIGN KEY (`groupId`) REFERENCES `groups` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;

package/src/models/DocumentTemplate.ts

@@ -96,14 +96,14 @@ export class DocumentTemplate extends Model {
                     id: "registration.startDate",
                     type: RecordType.Date,
                 }), // settings will be overwritten
-                dateValue: group?.settings?.getStartDate({cycle: registration.cycle === group.cycle ? undefined : registration.cycle}) ?? null
+                dateValue: group?.settings?.startDate
             }),
             "registration.endDate": RecordDateAnswer.create({
                 settings: RecordSettings.create({
                     id: "registration.endDate",
                     type: RecordType.Date,
                 }), // settings will be overwritten
-                dateValue: group?.settings?.getEndDate({cycle: registration.cycle === group.cycle ? undefined : registration.cycle}) ?? null
+                dateValue: group?.settings?.endDate
             }),
             "registration.price": 
                 RecordPriceAnswer.create({