public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some fixes

Browse source
This commit is contained in:
Tomas Bures 2019-02-18 22:42:57 +00:00
parent 8d95f43dbc
commit 0c3510d626
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/models/campaigns.js
View file

@ -708,9 +708,7 @@ async function _changeStatusByMessageTx(tx, context, message, subscriptionStatus
const statusField = statusFieldMapping[subscriptionStatus];
if (message.status === SubscriptionStatus.SUBSCRIBED) {
await tx('campaigns').increment(statusField, 1).where('id', message.campaign);
}
await tx('campaigns').increment(statusField, 1).where('id', message.campaign);
await tx('campaign_messages')
.where('id', message.id)
@ -726,7 +724,11 @@ async function changeStatusByCampaignCidAndSubscriptionIdTx(tx, context, campaig
const message = await tx('campaign_messages')
.innerJoin('campaigns', 'campaign_messages.campaign', 'campaigns.id')
.where('campaigns.cid', campaignCid)
.where({subscription: subscriptionId, list: listId});
.where({subscription: subscriptionId, list: listId})
.select([
'campaign_messages.id', 'campaign_messages.campaign', 'campaign_messages.list', 'campaign_messages.subscription', 'campaign_messages.status'
])
.first();
if (!message) {
throw new Error('Invalid campaign.')