@stamhoofd/models 2.96.2 → 2.97.0

package/dist/src/models/Email.js

@@ -16,6 +16,7 @@ const EmailRecipient_1 = require("./EmailRecipient");
 const EmailTemplate_1 = require("./EmailTemplate");
 const Organization_1 = require("./Organization");
 const User_1 = require("./User");
+const Platform_1 = require("./Platform");
 function errorToSimpleErrors(e) {
     if ((0, simple_errors_1.isSimpleErrors)(e)) {
         return e;
@@ -27,7 +28,7 @@ function errorToSimpleErrors(e) {
         return new simple_errors_1.SimpleErrors(new simple_errors_1.SimpleError({
             code: 'unknown_error',
             message: ((typeof e === 'object' && e !== null && 'message' in e && typeof e.message === 'string') ? e.message : 'Unknown error'),
-            human: $t(`Onbekende fout`),
+            human: $t(`41db9fc8-77f4-49a7-a77b-40a4ae8c4d8f`),
         }));
     }
 }
@@ -37,6 +38,19 @@ class Email extends sql_1.QueryableModel {
     organizationId = null;
     senderId = null;
     userId = null;
+    /**
+     * Send the message as an email.
+     * You can't edit this after the message has been published.
+     *
+     * If false, when sending the message, it will switch to 'Sent' directly without adjusting the email_recipients directly.
+     */
+    sendAsEmail = true;
+    /**
+     * Show the message in the member portal
+     *
+     * Note: status should be 'Sent' for the message to be visible
+     */
+    showInMemberPortal = true;
     recipientFilter = structures_1.EmailRecipientFilter.create({});
     /**
      * Helper to prevent sending too many emails to the same person.
@@ -144,18 +158,50 @@ class Email extends sql_1.QueryableModel {
             throw new simple_errors_1.SimpleError({
                 code: 'invalid_recipients',
                 message: 'Failed to build recipients (count)',
-                human: $t(`Er ging iets mis bij het aanmaken van de ontvangers. Probeer je selectie aan te passen. Neem contact op als het probleem zich blijft voordoen.`) + ' ' + this.recipientsErrors.getHuman(),
+                human: $t(`457ec920-2867-4d59-bbec-4466677e1b50`) + ' ' + this.recipientsErrors.getHuman(),
             });
         }
         if (this.deletedAt) {
             throw new simple_errors_1.SimpleError({
                 code: 'invalid_state',
                 message: 'Email is deleted',
-                human: $t(`Deze e-mail is verwijderd en kan niet verzonden worden.`),
+                human: $t(`a0524f41-bdde-4fcc-9a9a-9350905377d8`),
             });
         }
         this.validateAttachments();
     }
+    throwIfNoUnsubscribeButton() {
+        if (this.sendAsEmail === false) {
+            return;
+        }
+        if (this.emailType) {
+            // System email, no need for unsubscribe button
+            return;
+        }
+        const replacement = '{{unsubscribeUrl}}';
+        if (this.html) {
+            // Check email contains an unsubscribe button
+            if (!this.html.includes(replacement)) {
+                throw new simple_errors_1.SimpleError({
+                    code: 'missing_unsubscribe_button',
+                    message: 'Missing unsubscribe button',
+                    human: $t(`dd55e04b-e5d9-4d9a-befc-443eef4175a8`),
+                    field: 'html',
+                });
+            }
+        }
+        if (this.text) {
+            // Check email contains an unsubscribe button
+            if (!this.text.includes(replacement)) {
+                throw new simple_errors_1.SimpleError({
+                    code: 'missing_unsubscribe_button',
+                    message: 'Missing unsubscribe button',
+                    human: $t(`dd55e04b-e5d9-4d9a-befc-443eef4175a8`),
+                    field: 'text',
+                });
+            }
+        }
+    }
     validateAttachments() {
         // Validate attachments
         const size = this.attachments.reduce((value, attachment) => {
@@ -361,6 +407,7 @@ class Email extends sql_1.QueryableModel {
     }
     async queueForSending(waitForSending = false) {
         this.throwIfNotReadyToSend();
+        this.throwIfNoUnsubscribeButton();
         await this.lock(async (upToDate) => {
             if (upToDate.status === structures_1.EmailStatus.Draft) {
                 upToDate.status = structures_1.EmailStatus.Queued;
@@ -417,6 +464,7 @@ class Email extends sql_1.QueryableModel {
                 let failedCount = 0;
                 try {
                     upToDate.throwIfNotReadyToSend();
+                    upToDate.throwIfNoUnsubscribeButton();
                     if (!from) {
                         throw new simple_errors_1.SimpleError({
                             code: 'invalid_field',
@@ -454,195 +502,197 @@ class Email extends sql_1.QueryableModel {
                         });
                     }
                     // Create a buffer of all attachments
-                    for (const attachment of upToDate.attachments) {
-                        if (!attachment.content && !attachment.file) {
-                            console.warn('Attachment without content found, skipping', attachment);
-                            continue;
-                        }
-                        let filename = $t('b1291584-d2ad-4ebd-88ed-cbda4f3755b4');
-                        if (attachment.contentType === 'application/pdf') {
-                            // tmp solution for pdf only
-                            filename += '.pdf';
-                        }
-                        if (attachment.file?.name) {
-                            filename = attachment.file.name.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
-                        }
-                        // Correct file name if needed
-                        if (attachment.filename) {
-                            filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
-                        }
-                        if (attachment.content) {
-                            attachments.push({
-                                filename: filename,
-                                content: attachment.content,
-                                contentType: attachment.contentType ?? undefined,
-                                encoding: 'base64',
-                            });
-                        }
-                        else {
-                            // Note: because we send lots of emails, we better download the file here so we can reuse it in every email instead of downloading it every time
-                            const withSigned = await attachment.file.withSignedUrl();
-                            if (!withSigned || !withSigned.signedUrl) {
-                                throw new simple_errors_1.SimpleError({
-                                    code: 'attachment_not_found',
-                                    message: 'Attachment not found',
-                                    human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
-                                });
+                    if (upToDate.sendAsEmail === true) {
+                        for (const attachment of upToDate.attachments) {
+                            if (!attachment.content && !attachment.file) {
+                                console.warn('Attachment without content found, skipping', attachment);
+                                continue;
                             }
-                            const filePath = withSigned.signedUrl;
-                            let fileBuffer = null;
-                            try {
-                                const response = await fetch(filePath);
-                                fileBuffer = Buffer.from(await response.arrayBuffer());
+                            let filename = $t('b1291584-d2ad-4ebd-88ed-cbda4f3755b4');
+                            if (attachment.contentType === 'application/pdf') {
+                                // tmp solution for pdf only
+                                filename += '.pdf';
+                            }
+                            if (attachment.file?.name) {
+                                filename = attachment.file.name.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
                             }
-                            catch (e) {
-                                throw new simple_errors_1.SimpleError({
-                                    code: 'attachment_not_found',
-                                    message: 'Attachment not found',
-                                    human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                            // Correct file name if needed
+                            if (attachment.filename) {
+                                filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
+                            }
+                            if (attachment.content) {
+                                attachments.push({
+                                    filename: filename,
+                                    content: attachment.content,
+                                    contentType: attachment.contentType ?? undefined,
+                                    encoding: 'base64',
+                                });
+                            }
+                            else {
+                                // Note: because we send lots of emails, we better download the file here so we can reuse it in every email instead of downloading it every time
+                                const withSigned = await attachment.file.withSignedUrl();
+                                if (!withSigned || !withSigned.signedUrl) {
+                                    throw new simple_errors_1.SimpleError({
+                                        code: 'attachment_not_found',
+                                        message: 'Attachment not found',
+                                        human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                                    });
+                                }
+                                const filePath = withSigned.signedUrl;
+                                let fileBuffer = null;
+                                try {
+                                    const response = await fetch(filePath);
+                                    fileBuffer = Buffer.from(await response.arrayBuffer());
+                                }
+                                catch (e) {
+                                    throw new simple_errors_1.SimpleError({
+                                        code: 'attachment_not_found',
+                                        message: 'Attachment not found',
+                                        human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                                    });
+                                }
+                                attachments.push({
+                                    filename: filename,
+                                    contentType: attachment.contentType ?? undefined,
+                                    content: fileBuffer,
                                 });
                             }
-                            attachments.push({
-                                filename: filename,
-                                contentType: attachment.contentType ?? undefined,
-                                content: fileBuffer,
-                            });
-                        }
-                    }
-                    // Start actually sending in batches of recipients that are not yet sent
-                    let idPointer = '';
-                    const batchSize = 100;
-                    let isSavingStatus = false;
-                    let lastStatusSave = new Date();
-                    async function saveStatus() {
-                        if (!upToDate) {
-                            return;
-                        }
-                        if (isSavingStatus) {
-                            return;
-                        }
-                        if ((new Date().getTime() - lastStatusSave.getTime()) < 1000 * 5) {
-                            // Save at most every 5 seconds
-                            return;
-                        }
-                        if (succeededCount < upToDate.succeededCount || softFailedCount < upToDate.softFailedCount || failedCount < upToDate.failedCount) {
-                            // Do not update on retries
-                            return;
-                        }
-                        lastStatusSave = new Date();
-                        isSavingStatus = true;
-                        upToDate.succeededCount = succeededCount;
-                        upToDate.softFailedCount = softFailedCount;
-                        upToDate.failedCount = failedCount;
-                        try {
-                            await upToDate.save();
-                        }
-                        finally {
-                            isSavingStatus = false;
-                        }
-                    }
-                    while (true) {
-                        abort.throwIfAborted();
-                        const data = await sql_1.SQL.select()
-                            .from('email_recipients')
-                            .where('emailId', upToDate.id)
-                            .where('id', sql_1.SQLWhereSign.Greater, idPointer)
-                            .orderBy(sql_1.SQL.column('id'), 'ASC')
-                            .limit(batchSize)
-                            .fetch();
-                        const recipients = EmailRecipient_1.EmailRecipient.fromRows(data, 'email_recipients');
-                        if (recipients.length === 0) {
-                            break;
                         }
-                        const sendingPromises = [];
-                        let skipped = 0;
-                        for (const recipient of recipients) {
-                            idPointer = recipient.id;
-                            if (recipient.sentAt) {
-                                succeededCount += 1;
-                                await saveStatus();
-                                skipped++;
-                                continue;
+                        // Start actually sending in batches of recipients that are not yet sent
+                        let idPointer = '';
+                        const batchSize = 100;
+                        let isSavingStatus = false;
+                        let lastStatusSave = new Date();
+                        async function saveStatus() {
+                            if (!upToDate) {
+                                return;
                             }
-                            if (!recipient.email) {
-                                skipped++;
-                                continue;
+                            if (isSavingStatus) {
+                                return;
                             }
-                            if (recipient.duplicateOfRecipientId) {
-                                skipped++;
-                                continue;
+                            if ((new Date().getTime() - lastStatusSave.getTime()) < 1000 * 5) {
+                                // Save at most every 5 seconds
+                                return;
                             }
-                            let promiseResolve;
-                            const promise = new Promise((resolve) => {
-                                promiseResolve = resolve;
-                            });
-                            const virtualRecipient = recipient.getRecipient();
-                            let resolved = false;
-                            const callback = async (error) => {
-                                if (resolved) {
-                                    return;
+                            if (succeededCount < upToDate.succeededCount || softFailedCount < upToDate.softFailedCount || failedCount < upToDate.failedCount) {
+                                // Do not update on retries
+                                return;
+                            }
+                            lastStatusSave = new Date();
+                            isSavingStatus = true;
+                            upToDate.succeededCount = succeededCount;
+                            upToDate.softFailedCount = softFailedCount;
+                            upToDate.failedCount = failedCount;
+                            try {
+                                await upToDate.save();
+                            }
+                            finally {
+                                isSavingStatus = false;
+                            }
+                        }
+                        while (true) {
+                            abort.throwIfAborted();
+                            const data = await sql_1.SQL.select()
+                                .from('email_recipients')
+                                .where('emailId', upToDate.id)
+                                .where('id', sql_1.SQLWhereSign.Greater, idPointer)
+                                .orderBy(sql_1.SQL.column('id'), 'ASC')
+                                .limit(batchSize)
+                                .fetch();
+                            const recipients = EmailRecipient_1.EmailRecipient.fromRows(data, 'email_recipients');
+                            if (recipients.length === 0) {
+                                break;
+                            }
+                            const sendingPromises = [];
+                            let skipped = 0;
+                            for (const recipient of recipients) {
+                                idPointer = recipient.id;
+                                if (recipient.sentAt) {
+                                    succeededCount += 1;
+                                    await saveStatus();
+                                    skipped++;
+                                    continue;
                                 }
-                                resolved = true;
-                                try {
-                                    if (error === null) {
-                                        // Mark saved
-                                        recipient.sentAt = new Date();
-                                        // Update repacements that have been generated
-                                        recipient.replacements = virtualRecipient.replacements;
-                                        succeededCount += 1;
-                                        await recipient.save();
-                                        await saveStatus();
+                                if (!recipient.email) {
+                                    skipped++;
+                                    continue;
+                                }
+                                if (recipient.duplicateOfRecipientId) {
+                                    skipped++;
+                                    continue;
+                                }
+                                let promiseResolve;
+                                const promise = new Promise((resolve) => {
+                                    promiseResolve = resolve;
+                                });
+                                const virtualRecipient = recipient.getRecipient();
+                                let resolved = false;
+                                const callback = async (error) => {
+                                    if (resolved) {
+                                        return;
                                     }
-                                    else {
-                                        recipient.failCount += 1;
-                                        recipient.failErrorMessage = error.message;
-                                        recipient.failError = errorToSimpleErrors(error);
-                                        recipient.firstFailedAt = recipient.firstFailedAt ?? new Date();
-                                        recipient.lastFailedAt = new Date();
-                                        if ((0, structures_1.isSoftEmailRecipientError)(recipient.failError)) {
-                                            softFailedCount += 1;
+                                    resolved = true;
+                                    try {
+                                        if (error === null) {
+                                            // Mark saved
+                                            recipient.sentAt = new Date();
+                                            // Update repacements that have been generated
+                                            recipient.replacements = virtualRecipient.replacements;
+                                            succeededCount += 1;
+                                            await recipient.save();
+                                            await saveStatus();
                                         }
                                         else {
-                                            failedCount += 1;
+                                            recipient.failCount += 1;
+                                            recipient.failErrorMessage = error.message;
+                                            recipient.failError = errorToSimpleErrors(error);
+                                            recipient.firstFailedAt = recipient.firstFailedAt ?? new Date();
+                                            recipient.lastFailedAt = new Date();
+                                            if ((0, structures_1.isSoftEmailRecipientError)(recipient.failError)) {
+                                                softFailedCount += 1;
+                                            }
+                                            else {
+                                                failedCount += 1;
+                                            }
+                                            await recipient.save();
+                                            await saveStatus();
                                         }
-                                        await recipient.save();
-                                        await saveStatus();
                                     }
-                                }
-                                catch (e) {
-                                    console.error(e);
-                                }
-                                promiseResolve();
-                            };
-                            // Do send the email
-                            // Create e-mail builder
-                            const builder = await (0, EmailBuilder_1.getEmailBuilder)(organization ?? null, {
-                                recipients: [
-                                    virtualRecipient,
-                                ],
-                                from,
-                                replyTo,
-                                subject: upToDate.subject,
-                                html: upToDate.html,
-                                type: upToDate.emailType ? 'transactional' : 'broadcast',
-                                attachments,
-                                callback(error) {
-                                    callback(error).catch(console.error);
-                                },
-                                headers: {
-                                    'X-Email-Id': upToDate.id,
-                                    'X-Email-Recipient-Id': recipient.id,
-                                },
-                            });
-                            abort.throwIfAborted(); // do not schedule if aborted
-                            email_1.Email.schedule(builder);
-                            sendingPromises.push(promise);
-                        }
-                        if (sendingPromises.length > 0 || skipped > 0) {
-                            await Promise.all(sendingPromises);
-                        }
-                        else {
-                            break;
+                                    catch (e) {
+                                        console.error(e);
+                                    }
+                                    promiseResolve();
+                                };
+                                // Do send the email
+                                // Create e-mail builder
+                                const builder = await (0, EmailBuilder_1.getEmailBuilder)(organization ?? null, {
+                                    recipients: [
+                                        virtualRecipient,
+                                    ],
+                                    from,
+                                    replyTo,
+                                    subject: upToDate.subject,
+                                    html: upToDate.html,
+                                    type: upToDate.emailType ? 'transactional' : 'broadcast',
+                                    attachments,
+                                    callback(error) {
+                                        callback(error).catch(console.error);
+                                    },
+                                    headers: {
+                                        'X-Email-Id': upToDate.id,
+                                        'X-Email-Recipient-Id': recipient.id,
+                                    },
+                                });
+                                abort.throwIfAborted(); // do not schedule if aborted
+                                email_1.Email.schedule(builder);
+                                sendingPromises.push(promise);
+                            }
+                            if (sendingPromises.length > 0 || skipped > 0) {
+                                await Promise.all(sendingPromises);
+                            }
+                            else {
+                                break;
+                            }
                         }
                     }
                 }
@@ -663,7 +713,7 @@ class Email extends sql_1.QueryableModel {
                     await upToDate.save();
                     throw e;
                 }
-                if (upToDate.emailRecipientsCount === 0 && upToDate.userId === null) {
+                if (upToDate.sendAsEmail && upToDate.emailRecipientsCount === 0 && upToDate.userId === null) {
                     // We only delete automated emails (email type) if they have no recipients
                     console.log('No recipients found for email ', upToDate.id, ' deleting...');
                     await upToDate.delete();
@@ -671,12 +721,12 @@ class Email extends sql_1.QueryableModel {
                 }
                 console.log('Finished sending email', upToDate.id);
                 // Mark email as sent
-                if ((succeededCount + failedCount + softFailedCount) === 0) {
+                if (upToDate.sendAsEmail && !upToDate.showInMemberPortal && (succeededCount + failedCount + softFailedCount) === 0) {
                     upToDate.status = structures_1.EmailStatus.Failed;
                     upToDate.emailErrors = new simple_errors_1.SimpleErrors(new simple_errors_1.SimpleError({
                         code: 'no_recipients',
                         message: 'No recipients',
-                        human: $t(`Geen ontvangers gevonden`),
+                        human: $t(`9fe3de8e-090c-4949-97da-4810ce9e61c7`),
                     }));
                 }
                 else {
@@ -765,6 +815,15 @@ class Email extends sql_1.QueryableModel {
                 return;
             }
             abort.throwIfAborted();
+            const organization = upToDate.organizationId ? (await Organization_1.Organization.getByID(upToDate.organizationId) ?? null) : null;
+            if (upToDate.organizationId && !organization) {
+                throw new simple_errors_1.SimpleError({
+                    code: 'organization_not_found',
+                    message: 'Organization not found',
+                    human: $t(`f3c6e2b1-2f3a-4e2f-8f7a-1e5f3d3c8e2a`),
+                });
+            }
+            const platform = await Platform_1.Platform.getSharedPrivateStruct();
             console.log('Building recipients for email', id);
             // If it is already creating -> something went wrong (e.g. server restart) and we can safely try again
             upToDate.recipientsStatus = structures_1.EmailRecipientsStatus.Creating;
@@ -799,7 +858,25 @@ class Email extends sql_1.QueryableModel {
                             if (!item.email && !item.memberId && !item.userId) {
                                 continue;
                             }
-                            item.replacements = (0, EmailBuilder_1.removeUnusedReplacements)(upToDate.html ?? '', item.replacements);
+                            const recipient = new EmailRecipient_1.EmailRecipient();
+                            recipient.emailType = upToDate.emailType;
+                            recipient.objectId = item.objectId;
+                            recipient.emailId = upToDate.id;
+                            recipient.email = item.email;
+                            recipient.firstName = item.firstName;
+                            recipient.lastName = item.lastName;
+                            recipient.replacements = item.replacements;
+                            recipient.memberId = item.memberId ?? null;
+                            recipient.userId = item.userId ?? null;
+                            recipient.organizationId = upToDate.organizationId ?? null;
+                            await (0, EmailBuilder_1.fillRecipientReplacements)(recipient, {
+                                platform,
+                                organization,
+                                from: upToDate.getFromAddress(),
+                                replyTo: null,
+                                forPreview: false,
+                            });
+                            recipient.replacements = (0, EmailBuilder_1.removeUnusedReplacements)(upToDate.html ?? '', recipient.replacements);
                             let duplicateOfRecipientId = null;
                             if (item.email && emailsSet.has(item.email)) {
                                 console.log('Found duplicate email recipient', item.email);
@@ -807,17 +884,18 @@ class Email extends sql_1.QueryableModel {
                                 const existing = await EmailRecipient_1.EmailRecipient.select()
                                     .where('emailId', upToDate.id)
                                     .where('email', item.email)
+                                    .where('duplicateOfRecipientId', null)
                                     .fetch();
                                 for (const other of existing) {
-                                    const merged = (0, EmailBuilder_1.mergeReplacementsIfEqual)(other.replacements, item.replacements);
+                                    const merged = (0, EmailBuilder_1.mergeReplacementsIfEqual)(other.replacements, recipient.replacements);
                                     if (merged !== false) {
-                                        console.log('Found duplicate email recipient', item.email, other.id);
+                                        console.log('Found mergeable duplicate email recipient', item.email, other.id);
                                         duplicateOfRecipientId = other.id;
                                         other.replacements = merged;
                                         other.firstName = other.firstName || item.firstName;
                                         other.lastName = other.lastName || item.lastName;
                                         await other.save();
-                                        item.replacements = merged;
+                                        recipient.replacements = merged;
                                         break;
                                     }
                                     else {
@@ -825,17 +903,6 @@ class Email extends sql_1.QueryableModel {
                                     }
                                 }
                             }
-                            const recipient = new EmailRecipient_1.EmailRecipient();
-                            recipient.emailType = upToDate.emailType;
-                            recipient.objectId = item.objectId;
-                            recipient.emailId = upToDate.id;
-                            recipient.email = item.email;
-                            recipient.firstName = item.firstName;
-                            recipient.lastName = item.lastName;
-                            recipient.replacements = item.replacements;
-                            recipient.memberId = item.memberId ?? null;
-                            recipient.userId = item.userId ?? null;
-                            recipient.organizationId = upToDate.organizationId ?? null;
                             recipient.duplicateOfRecipientId = duplicateOfRecipientId;
                             await recipient.save();
                             if (recipient.memberId) {
@@ -1069,6 +1136,12 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'string', nullable: true })
 ], Email.prototype, "userId", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'boolean' })
+], Email.prototype, "sendAsEmail", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'boolean' })
+], Email.prototype, "showInMemberPortal", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'json', decoder: structures_1.EmailRecipientFilter })
 ], Email.prototype, "recipientFilter", void 0);