@stamhoofd/models 2.92.0 → 2.94.0

package/dist/src/models/Email.js

@@ -15,6 +15,21 @@ const EmailBuilder_1 = require("../helpers/EmailBuilder");
 const EmailRecipient_1 = require("./EmailRecipient");
 const EmailTemplate_1 = require("./EmailTemplate");
 const Organization_1 = require("./Organization");
+function errorToSimpleErrors(e) {
+    if ((0, simple_errors_1.isSimpleErrors)(e)) {
+        return e;
+    }
+    else if ((0, simple_errors_1.isSimpleError)(e)) {
+        return new simple_errors_1.SimpleErrors(e);
+    }
+    else {
+        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`),
+        }));
+    }
+}
 class Email extends sql_1.QueryableModel {
     static table = 'emails';
     id;
@@ -34,17 +49,67 @@ class Email extends sql_1.QueryableModel {
     text = null;
     fromAddress = null;
     fromName = null;
-    recipientCount = null;
+    /**
+     * Amount of recipients with an email address
+     */
+    emailRecipientsCount = null;
+    /**
+     * Amount of recipients without an email address
+     */
+    otherRecipientsCount = null;
+    /**
+     * Amount of recipients that have successfully received the email.
+     */
+    succeededCount = 0;
+    /**
+     * Amount of recipients that somehow failed to receive the email,
+     * but with a soft error that doesn't require action.
+     * - Duplicate email in recipient list
+     * - Unsubscribed
+     */
+    softFailedCount = 0;
+    /**
+     * Amount of recipients that somehow failed to receive the email:
+     * - Invalid email address
+     * - Full email inbox
+     */
+    failedCount = 0;
+    /**
+     * Unique amount of members that are in the recipients list.
+     */
+    membersCount = 0;
+    /**
+     * Does only include bounces AFTER sending the email
+     */
+    hardBouncesCount = 0;
+    /**
+     * Does only include bounces AFTER sending the email
+     */
+    softBouncesCount = 0;
+    /**
+     * Does only include bounces AFTER sending the email
+     */
+    spamComplaintsCount = 0;
     status = structures_1.EmailStatus.Draft;
     recipientsStatus = structures_1.EmailRecipientsStatus.NotCreated;
+    /**
+     * Errors related to creating the recipients.
+     */
+    recipientsErrors = null;
+    /**
+     * Errors related to sending the email.
+     */
+    emailErrors = null;
     /**
      * todo: ignore automatically
      */
     attachments = [];
     sentAt = null;
+    deletedAt = null;
     createdAt;
     updatedAt;
     static recipientLoaders = new Map();
+    static pendingNotificationCountUpdates = new Map();
     throwIfNotReadyToSend() {
         if (this.subject == null || this.subject.length == 0) {
             throw new simple_errors_1.SimpleError({
@@ -74,6 +139,20 @@ class Email extends sql_1.QueryableModel {
                 human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
             });
         }
+        if (this.status === structures_1.EmailStatus.Draft && this.recipientsErrors !== null && this.recipientsStatus !== structures_1.EmailRecipientsStatus.Created) {
+            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(),
+            });
+        }
+        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.`),
+            });
+        }
         this.validateAttachments();
     }
     validateAttachments() {
@@ -178,12 +257,10 @@ class Email extends sql_1.QueryableModel {
         this.json = defaultTemplate.json;
         return true;
     }
-    async send() {
-        this.throwIfNotReadyToSend();
-        await this.save();
+    async lock(callback) {
         const id = this.id;
-        return await queues_1.QueueHandler.schedule('send-email', async function ({ abort }) {
-            let upToDate = await Email.getByID(id);
+        return await queues_1.QueueHandler.schedule('lock-email-' + id, async (options) => {
+            const upToDate = await Email.getByID(id);
             if (!upToDate) {
                 throw new simple_errors_1.SimpleError({
                     code: 'not_found',
@@ -191,224 +268,425 @@ class Email extends sql_1.QueryableModel {
                     human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
                 });
             }
-            if (upToDate.status === structures_1.EmailStatus.Sent || upToDate.status === structures_1.EmailStatus.Failed) {
-                // Already done
-                // In other cases -> queue has stopped and we can retry
-                return upToDate;
+            const c = await callback(upToDate, options);
+            this.copyFrom(upToDate);
+            return c;
+        });
+    }
+    static async bumpNotificationCount(emailId, type) {
+        // Send an update query
+        const base = Email.update()
+            .where('id', emailId);
+        switch (type) {
+            case 'hard-bounce': {
+                base.set('hardBouncesCount', new sql_1.SQLCalculation(sql_1.SQL.column('hardBouncesCount'), new sql_1.SQLPlusSign(), (0, sql_1.readDynamicSQLExpression)(1)));
+                break;
             }
-            if (upToDate.status === structures_1.EmailStatus.Sending) {
-                // This is a retry.
-                if (upToDate.emailType) {
-                    // Not eligible for retry
-                    upToDate.status = structures_1.EmailStatus.Failed;
-                    await upToDate.save();
-                    return upToDate;
-                }
-                if (upToDate.createdAt < new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 2)) {
-                    // Too long
-                    console.error('Email has been sending for too long. Marking as failed...', upToDate.id);
-                    upToDate.status = structures_1.EmailStatus.Failed;
-                    await upToDate.save();
-                    return upToDate;
-                }
+            case 'soft-bounce': {
+                base.set('softBouncesCount', new sql_1.SQLCalculation(sql_1.SQL.column('softBouncesCount'), new sql_1.SQLPlusSign(), (0, sql_1.readDynamicSQLExpression)(1)));
+                break;
             }
-            const organization = upToDate.organizationId ? await Organization_1.Organization.getByID(upToDate.organizationId) : null;
-            upToDate.throwIfNotReadyToSend();
-            let from = upToDate.getDefaultFromAddress(organization);
-            let replyTo = upToDate.getFromAddress();
-            if (!from) {
-                throw new simple_errors_1.SimpleError({
-                    code: 'invalid_field',
-                    message: 'Missing from',
-                    human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
-                });
+            case 'complaint': {
+                base.set('spamComplaintsCount', new sql_1.SQLCalculation(sql_1.SQL.column('spamComplaintsCount'), new sql_1.SQLPlusSign(), (0, sql_1.readDynamicSQLExpression)(1)));
+                break;
             }
-            // Can we send from this e-mail or reply-to?
-            if (upToDate.fromAddress && await (0, EmailBuilder_1.canSendFromEmail)(upToDate.fromAddress, organization ?? null)) {
-                from = upToDate.getFromAddress();
-                replyTo = null;
+        }
+        await base.update();
+        await this.checkNeedsNotificationCountUpdate(emailId, true);
+    }
+    static async checkNeedsNotificationCountUpdate(emailId, didUpdate = false) {
+        const existing = this.pendingNotificationCountUpdates.get(emailId);
+        const object = existing ?? {
+            timer: null,
+            lastUpdate: didUpdate ? new Date() : null,
+        };
+        if (didUpdate) {
+            object.lastUpdate = new Date();
+        }
+        if (existing) {
+            this.pendingNotificationCountUpdates.set(emailId, object);
+        }
+        if (object.lastUpdate && object.lastUpdate < new Date(Date.now() - 5 * 60 * 1000)) {
+            // After 5 minutes without notifications, run an update.
+            await this.updateNotificationsCounts(emailId);
+            // Stop here
+            return;
+        }
+        // Schedule a slow update of all counts
+        if (!object.timer) {
+            object.timer = setTimeout(() => {
+                object.timer = null;
+                this.checkNeedsNotificationCountUpdate(emailId).catch(console.error);
+            }, 1 * 60 * 1000);
+        }
+    }
+    static async updateNotificationsCounts(emailId) {
+        queues_1.QueueHandler.cancel('updateNotificationsCounts-' + emailId);
+        return await queues_1.QueueHandler.schedule('updateNotificationsCounts-' + emailId, async () => {
+            const query = sql_1.SQL.select(new sql_1.SQLSelectAs(new sql_1.SQLCount(sql_1.SQL.column('hardBounceError')), new sql_1.SQLAlias('data__hardBounces')), 
+            // If the current amount_due is negative, we can ignore that negative part if there is a future due item
+            new sql_1.SQLSelectAs(new sql_1.SQLCount(sql_1.SQL.column('softBounceError')), new sql_1.SQLAlias('data__softBounces')), new sql_1.SQLSelectAs(new sql_1.SQLCount(sql_1.SQL.column('spamComplaintError')), new sql_1.SQLAlias('data__complaints')))
+                .from(EmailRecipient_1.EmailRecipient.table)
+                .where('emailId', emailId);
+            const result = await query.fetch();
+            if (result.length !== 1) {
+                console.error('Unexpected result', result);
+                return;
             }
-            abort.throwIfAborted();
-            upToDate.status = structures_1.EmailStatus.Sending;
-            upToDate.sentAt = upToDate.sentAt ?? new Date();
-            await upToDate.save();
-            // Create recipients if not yet created
-            await upToDate.buildRecipients();
-            abort.throwIfAborted();
-            // Refresh model
-            upToDate = await Email.getByID(id);
-            if (!upToDate) {
-                throw new simple_errors_1.SimpleError({
-                    code: 'not_found',
-                    message: 'Email not found',
-                    human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
-                });
+            const row = result[0]['data'];
+            if (!row) {
+                console.error('Unexpected result row', result);
+                return;
             }
-            if (upToDate.recipientsStatus !== structures_1.EmailRecipientsStatus.Created) {
-                throw new simple_errors_1.SimpleError({
-                    code: 'recipients_not_created',
-                    message: 'Failed to create recipients',
-                    human: $t(`f660b2eb-e382-4d21-86e4-673ca7bc2d4a`),
-                });
+            const hardBounces = row['hardBounces'];
+            const softBounces = row['softBounces'];
+            const complaints = row['complaints'];
+            if (typeof hardBounces !== 'number' || typeof softBounces !== 'number' || typeof complaints !== 'number') {
+                console.error('Unexpected result values', row);
+                return;
             }
-            // Start actually sending in batches of recipients that are not yet sent
-            let idPointer = '';
-            const batchSize = 100;
-            const recipientsSet = new Set();
-            // Create a buffer of all attachments
-            const 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(/-+$/, '');
+            console.log('Updating email notification counts', emailId, hardBounces, softBounces, complaints);
+            // Send an update query
+            await Email.update()
+                .where('id', emailId)
+                .set('hardBouncesCount', hardBounces)
+                .set('softBouncesCount', softBounces)
+                .set('spamComplaintsCount', complaints)
+                .update();
+        });
+    }
+    async queueForSending(waitForSending = false) {
+        this.throwIfNotReadyToSend();
+        await this.lock(async (upToDate) => {
+            if (upToDate.status === structures_1.EmailStatus.Draft) {
+                upToDate.status = structures_1.EmailStatus.Queued;
+            }
+            if (upToDate.status === structures_1.EmailStatus.Failed) {
+                // Retry failed email
+                upToDate.status = structures_1.EmailStatus.Queued;
+            }
+            await upToDate.save();
+        });
+        if (waitForSending) {
+            return await this.resumeSending();
+        }
+        else {
+            this.resumeSending().catch(console.error);
+        }
+        return this;
+    }
+    async resumeSending() {
+        const id = this.id;
+        return await queues_1.QueueHandler.schedule('send-email', async ({ abort }) => {
+            return await this.lock(async function (upToDate) {
+                if (upToDate.status === structures_1.EmailStatus.Sent) {
+                    // Already done
+                    // In other cases -> queue has stopped and we can retry
+                    return upToDate;
                 }
-                // Correct file name if needed
-                if (attachment.filename) {
-                    filename = attachment.filename.toLowerCase().replace(/[^a-z0-9.]+/g, '-').replace(/^-+/, '').replace(/-+$/, '');
+                if (upToDate.status === structures_1.EmailStatus.Sending) {
+                    // This is an automatic retry.
+                    if (upToDate.emailType) {
+                        // Not eligible for retry
+                        upToDate.status = structures_1.EmailStatus.Failed;
+                        await upToDate.save();
+                        return upToDate;
+                    }
+                    if (upToDate.createdAt < new Date(new Date().getTime() - 1000 * 60 * 60 * 24 * 2)) {
+                        // Too long
+                        console.error('Email has been sending for too long. Marking as failed...', upToDate.id);
+                        upToDate.status = structures_1.EmailStatus.Failed;
+                        await upToDate.save();
+                        return upToDate;
+                    }
                 }
-                if (attachment.content) {
-                    attachments.push({
-                        filename: filename,
-                        content: attachment.content,
-                        contentType: attachment.contentType ?? undefined,
-                        encoding: 'base64',
-                    });
+                else if (upToDate.status !== structures_1.EmailStatus.Queued) {
+                    console.error('Email is not queued or sending, cannot send', upToDate.id, upToDate.status);
+                    return upToDate;
                 }
-                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) {
+                const organization = upToDate.organizationId ? await Organization_1.Organization.getByID(upToDate.organizationId) : null;
+                let from = upToDate.getDefaultFromAddress(organization);
+                let replyTo = upToDate.getFromAddress();
+                const attachments = [];
+                let succeededCount = 0;
+                let softFailedCount = 0;
+                let failedCount = 0;
+                try {
+                    upToDate.throwIfNotReadyToSend();
+                    if (!from) {
                         throw new simple_errors_1.SimpleError({
-                            code: 'attachment_not_found',
-                            message: 'Attachment not found',
-                            human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                            code: 'invalid_field',
+                            message: 'Missing from',
+                            human: $t(`e92cd077-b0f1-4b0a-82a0-8a8baa82e73a`),
                         });
                     }
-                    const filePath = withSigned.signedUrl;
-                    let fileBuffer = null;
-                    try {
-                        const response = await fetch(filePath);
-                        fileBuffer = Buffer.from(await response.arrayBuffer());
+                    // Can we send from this e-mail or reply-to?
+                    if (upToDate.fromAddress && await (0, EmailBuilder_1.canSendFromEmail)(upToDate.fromAddress, organization ?? null)) {
+                        from = upToDate.getFromAddress();
+                        replyTo = null;
                     }
-                    catch (e) {
+                    abort.throwIfAborted();
+                    upToDate.status = structures_1.EmailStatus.Sending;
+                    upToDate.sentAt = upToDate.sentAt ?? new Date();
+                    await upToDate.save();
+                    // Create recipients if not yet created
+                    await upToDate.buildRecipients();
+                    abort.throwIfAborted();
+                    // Refresh model
+                    const c = (await Email.getByID(id));
+                    if (!c) {
                         throw new simple_errors_1.SimpleError({
-                            code: 'attachment_not_found',
-                            message: 'Attachment not found',
-                            human: $t(`ce6ddaf0-8347-42c5-b4b7-fbe860c7b7f2`),
+                            code: 'not_found',
+                            message: 'Email not found',
+                            human: $t(`55899a7c-f3d4-43fe-a431-70a3a9e78e34`),
                         });
                     }
-                    attachments.push({
-                        filename: filename,
-                        contentType: attachment.contentType ?? undefined,
-                        content: fileBuffer,
-                    });
-                }
-            }
-            while (true) {
-                abort.throwIfAborted();
-                const data = await sql_1.SQL.select()
-                    .from('email_recipients')
-                    .where('emailId', upToDate.id)
-                    .where('sentAt', null)
-                    .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 = [];
-                for (const recipient of recipients) {
-                    if (recipientsSet.has(recipient.id)) {
-                        console.error('Found duplicate recipient while sending email', recipient.id);
-                        continue;
+                    upToDate.copyFrom(c);
+                    if (upToDate.recipientsStatus !== structures_1.EmailRecipientsStatus.Created) {
+                        throw new simple_errors_1.SimpleError({
+                            code: 'recipients_not_created',
+                            message: 'Failed to create recipients',
+                            human: $t(`f660b2eb-e382-4d21-86e4-673ca7bc2d4a`),
+                        });
                     }
-                    recipientsSet.add(recipient.email);
-                    idPointer = recipient.id;
-                    let promiseResolve;
-                    const promise = new Promise((resolve) => {
-                        promiseResolve = resolve;
-                    });
-                    const virtualRecipient = recipient.getRecipient();
-                    let resolved = false;
-                    const callback = async (error) => {
-                        if (resolved) {
+                    // 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`),
+                                });
+                            }
+                            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,
+                            });
+                        }
+                    }
+                    // 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;
                         }
-                        resolved = true;
+                        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 {
-                            if (error === null) {
-                                // Mark saved
-                                recipient.sentAt = new Date();
-                                // Update repacements that have been generated
-                                recipient.replacements = virtualRecipient.replacements;
-                                await recipient.save();
+                            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;
                             }
-                            else {
-                                recipient.failCount += 1;
-                                recipient.failErrorMessage = error.message;
-                                recipient.firstFailedAt = recipient.firstFailedAt ?? new Date();
-                                recipient.lastFailedAt = new Date();
-                                await recipient.save();
+                            if (!recipient.email) {
+                                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;
+                                }
+                                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 {
+                                        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();
+                                    }
+                                }
+                                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);
                         }
-                        catch (e) {
-                            console.error(e);
+                        if (sendingPromises.length > 0 || skipped > 0) {
+                            await Promise.all(sendingPromises);
                         }
-                        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);
-                        },
-                    });
-                    abort.throwIfAborted(); // do not schedule if aborted
-                    email_1.Email.schedule(builder);
-                    sendingPromises.push(promise);
+                        else {
+                            break;
+                        }
+                    }
+                }
+                catch (e) {
+                    if (!upToDate) {
+                        throw e;
+                    }
+                    upToDate.succeededCount = succeededCount;
+                    upToDate.softFailedCount = softFailedCount;
+                    upToDate.failedCount = failedCount;
+                    if ((0, queues_1.isAbortedError)(e) || (((0, simple_errors_1.isSimpleError)(e) || (0, simple_errors_1.isSimpleErrors)(e)) && e.hasCode('SHUTDOWN'))) {
+                        // Keep sending status: we'll resume after the reboot
+                        await upToDate.save();
+                        throw e;
+                    }
+                    upToDate.emailErrors = errorToSimpleErrors(e);
+                    upToDate.status = structures_1.EmailStatus.Failed;
+                    await upToDate.save();
+                    throw e;
                 }
-                if (sendingPromises.length > 0) {
-                    await Promise.all(sendingPromises);
+                if (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();
+                    return null;
+                }
+                console.log('Finished sending email', upToDate.id);
+                // Mark email as sent
+                if ((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`),
+                    }));
                 }
                 else {
-                    break;
+                    upToDate.status = structures_1.EmailStatus.Sent;
+                    upToDate.emailErrors = null;
                 }
-            }
-            if (upToDate.recipientCount === 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();
-                return null;
-            }
-            console.log('Finished sending email', upToDate.id);
-            // Mark email as sent
-            upToDate.status = structures_1.EmailStatus.Sent;
-            await upToDate.save();
-            return upToDate;
+                upToDate.succeededCount = succeededCount;
+                upToDate.softFailedCount = softFailedCount;
+                upToDate.failedCount = failedCount;
+                await upToDate.save();
+                return upToDate;
+            });
         });
     }
     updateCount() {
         const id = this.id;
-        queues_1.QueueHandler.schedule('email-count-' + this.id, async function () {
+        queues_1.QueueHandler.abort('email-count-' + this.id);
+        queues_1.QueueHandler.schedule('email-count-' + this.id, async function ({ abort }) {
             let upToDate = await Email.getByID(id);
             if (!upToDate || upToDate.sentAt || !upToDate.id || upToDate.status !== structures_1.EmailStatus.Draft) {
                 return;
@@ -430,10 +708,12 @@ class Email extends sql_1.QueryableModel {
                         limit: 1,
                         search: subfilter.search,
                     });
+                    abort.throwIfAborted();
                     const c = await loader.count(request, subfilter.subfilter);
                     count += c;
                 }
-                // Check if we have a more reliable recipientCount in the meantime
+                abort.throwIfAborted();
+                // Check if we have a more reliable emailRecipientsCount in the meantime
                 upToDate = await Email.getByID(id);
                 if (!upToDate) {
                     return;
@@ -441,12 +721,25 @@ class Email extends sql_1.QueryableModel {
                 if (upToDate.recipientsStatus === structures_1.EmailRecipientsStatus.Created) {
                     return;
                 }
-                upToDate.recipientCount = count;
+                upToDate.emailRecipientsCount = count;
                 await upToDate.save();
             }
             catch (e) {
+                if ((0, queues_1.isAbortedError)(e)) {
+                    return;
+                }
                 console.error('Failed to update count for email', id);
                 console.error(e);
+                // Check if we have a more reliable emailRecipientsCount in the meantime
+                upToDate = await Email.getByID(id);
+                if (!upToDate) {
+                    return;
+                }
+                if (upToDate.recipientsStatus === structures_1.EmailRecipientsStatus.Created) {
+                    return;
+                }
+                upToDate.recipientsErrors = errorToSimpleErrors(e);
+                await upToDate.save();
             }
         }).catch(console.error);
     }
@@ -467,7 +760,9 @@ class Email extends sql_1.QueryableModel {
             // If it is already creating -> something went wrong (e.g. server restart) and we can safely try again
             upToDate.recipientsStatus = structures_1.EmailRecipientsStatus.Creating;
             await upToDate.save();
+            const membersSet = new Set();
             let count = 0;
+            let countWithoutEmail = 0;
             try {
                 // Delete all recipients
                 await sql_1.SQL
@@ -491,10 +786,9 @@ class Email extends sql_1.QueryableModel {
                         abort.throwIfAborted();
                         const response = await loader.fetch(request, subfilter.subfilter);
                         for (const item of response.results) {
-                            if (!item.email) {
+                            if (!item.email && !item.memberId && !item.userId) {
                                 continue;
                             }
-                            count += 1;
                             const recipient = new EmailRecipient_1.EmailRecipient();
                             recipient.emailType = upToDate.emailType;
                             recipient.objectId = item.objectId;
@@ -503,19 +797,35 @@ class Email extends sql_1.QueryableModel {
                             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 recipient.save();
+                            if (recipient.memberId) {
+                                membersSet.add(recipient.memberId);
+                            }
+                            if (!recipient.email) {
+                                countWithoutEmail += 1;
+                            }
+                            else {
+                                count += 1;
+                            }
                         }
                         request = response.next ?? null;
                     }
                 }
                 upToDate.recipientsStatus = structures_1.EmailRecipientsStatus.Created;
-                upToDate.recipientCount = count;
+                upToDate.emailRecipientsCount = count;
+                upToDate.otherRecipientsCount = countWithoutEmail;
+                upToDate.recipientsErrors = null;
+                upToDate.membersCount = membersSet.size;
                 await upToDate.save();
             }
             catch (e) {
                 console.error('Failed to build recipients for email', id);
                 console.error(e);
                 upToDate.recipientsStatus = structures_1.EmailRecipientsStatus.NotCreated;
+                upToDate.recipientsErrors = errorToSimpleErrors(e);
                 await upToDate.save();
             }
         });
@@ -643,13 +953,43 @@ tslib_1.__decorate([
 ], Email.prototype, "fromName", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'integer', nullable: true })
-], Email.prototype, "recipientCount", void 0);
+], Email.prototype, "emailRecipientsCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer', nullable: true })
+], Email.prototype, "otherRecipientsCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "succeededCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "softFailedCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "failedCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "membersCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "hardBouncesCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "softBouncesCount", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'integer' })
+], Email.prototype, "spamComplaintsCount", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'string' })
 ], Email.prototype, "status", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'string' })
 ], Email.prototype, "recipientsStatus", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'json', nullable: true, decoder: simple_errors_1.SimpleErrors })
+], Email.prototype, "recipientsErrors", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({ type: 'json', nullable: true, decoder: simple_errors_1.SimpleErrors })
+], Email.prototype, "emailErrors", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({ type: 'json', decoder: new simple_encoding_1.ArrayDecoder(structures_1.EmailAttachment) })
 ], Email.prototype, "attachments", void 0);
@@ -659,6 +999,12 @@ tslib_1.__decorate([
         nullable: true,
     })
 ], Email.prototype, "sentAt", void 0);
+tslib_1.__decorate([
+    (0, simple_database_1.column)({
+        type: 'datetime',
+        nullable: true,
+    })
+], Email.prototype, "deletedAt", void 0);
 tslib_1.__decorate([
     (0, simple_database_1.column)({
         type: 'datetime', beforeSave(old) {