From 57907f9260881ce20fabd8206a6f29a8f06101d8 Mon Sep 17 00:00:00 2001 From: Tomas Bures Date: Sat, 11 Jan 2020 13:59:59 +0100 Subject: [PATCH] Merge of of PR #827 --- server/lib/message-sender.js | 4 ++-- server/models/templates.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/lib/message-sender.js b/server/lib/message-sender.js index 8d59e677..1ce9313a 100644 --- a/server/lib/message-sender.js +++ b/server/lib/message-sender.js @@ -682,7 +682,7 @@ async function queueCampaignMessageTx(tx, sendConfigurationId, listId, subscript }); } -async function queueAPITransactionalMessage(tx, sendConfigurationId, email, subject, html, text, tagLanguage, mergeTags, attachments) { +async function queueAPITransactionalMessageTx(tx, sendConfigurationId, email, subject, html, text, tagLanguage, mergeTags, attachments) { const msgData = { to: { address: email @@ -788,4 +788,4 @@ module.exports.queueCampaignMessageTx = queueCampaignMessageTx; module.exports.queueSubscriptionMessage = queueSubscriptionMessage; module.exports.dropQueuedMessage = dropQueuedMessage; module.exports.getMessage = getMessage; -module.exports.queueAPITransactionalMessage = queueAPITransactionalMessage; +module.exports.queueAPITransactionalMessageTx = queueAPITransactionalMessageTx; diff --git a/server/models/templates.js b/server/models/templates.js index 1d7fb6f4..3613b8e8 100644 --- a/server/models/templates.js +++ b/server/models/templates.js @@ -163,13 +163,13 @@ async function remove(context, id) { } async function sendAsTransactionalEmail(context, templateId, sendConfigurationId, emails, subject, mergeTags, attachments) { - await knex.transaction(async tx => { - const template = await getById(context, templateId, false); + const template = await getById(context, templateId, false); - await shares.enforceEntityPermission(context, 'sendConfiguration', sendConfigurationId, 'sendWithoutOverrides'); + await shares.enforceEntityPermission(context, 'sendConfiguration', sendConfigurationId, 'sendWithoutOverrides'); + await knex.transaction(async tx => { for (const email of emails) { - await messageSender.queueAPITransactionalMessage(tx, sendConfigurationId, email, subject, template.html, template.text, template.tag_language, {...mergeTags, EMAIL: email }, attachments); + await messageSender.queueAPITransactionalMessageTx(tx, sendConfigurationId, email, subject, template.html, template.text, template.tag_language, {...mergeTags, EMAIL: email }, attachments); } }); }