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

Merge pull request #789 from notz/fix-trigger-campaign-id

Browse source 
Fix trigger campaign id
This commit is contained in:
Tomas Bures 2019-12-07 08:19:29 +01:00 committed by GitHub
commit 4cdc4ed833
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/services/triggers.js
View file

@ -65,7 +65,7 @@ async function run() {
sqlQry = sqlQry.innerJoin( sqlQry = sqlQry.innerJoin(
function () { function () {
return this.from('campaign_messages') return this.from('campaign_messages')
.where('campaign_messages.campaign', campaign.id) .where('campaign_messages.campaign', trigger.source_campaign)
.where('campaign_messages.list', cpgList.list) .where('campaign_messages.list', cpgList.list)
.as('campaign_messages'); .as('campaign_messages');
}, 'campaign_messages.subscription', subsTable + '.id'); }, 'campaign_messages.subscription', subsTable + '.id');
@ -76,7 +76,7 @@ async function run() {
sqlQry = sqlQry.innerJoin( sqlQry = sqlQry.innerJoin(
function () { function () {
return this.from('campaign_links') return this.from('campaign_links')
.where('campaign_links.campaign', campaign.id) .where('campaign_links.campaign', trigger.source_campaign)
.where('campaign_links.list', cpgList.list) .where('campaign_links.list', cpgList.list)
.where('campaign_links.link', links.LinkId.OPEN) .where('campaign_links.link', links.LinkId.OPEN)
.as('campaign_links'); .as('campaign_links');
@ -88,7 +88,7 @@ async function run() {
sqlQry = sqlQry.innerJoin( sqlQry = sqlQry.innerJoin(
function () { function () {
return this.from('campaign_links') return this.from('campaign_links')
.where('campaign_links.campaign', campaign.id) .where('campaign_links.campaign', trigger.source_campaign)
.where('campaign_links.list', cpgList.list) .where('campaign_links.list', cpgList.list)
.where('campaign_links.link', links.LinkId.GENERAL_CLICK) .where('campaign_links.link', links.LinkId.GENERAL_CLICK)
.as('campaign_links'); .as('campaign_links');
@ -100,7 +100,7 @@ async function run() {
sqlQry = sqlQry.innerJoin( sqlQry = sqlQry.innerJoin(
function () { function () {
return this.from('campaign_messages') return this.from('campaign_messages')
.where('campaign_messages.campaign', campaign.id) .where('campaign_messages.campaign', trigger.source_campaign)
.where('campaign_messages.list', cpgList.list) .where('campaign_messages.list', cpgList.list)
.as('campaign_messages'); .as('campaign_messages');
}, 'campaign_messages.subscription', subsTable + '.id') }, 'campaign_messages.subscription', subsTable + '.id')
@ -109,7 +109,7 @@ async function run() {
.select('*') .select('*')
.from('campaign_links') .from('campaign_links')
.whereRaw(`campaign_links.subscription = ${subsTable}.id`) .whereRaw(`campaign_links.subscription = ${subsTable}.id`)
.where('campaign_links.campaign', campaign.id) .where('campaign_links.campaign', trigger.source_campaign)
.where('campaign_links.list', cpgList.list) .where('campaign_links.list', cpgList.list)
.where('campaign_links.link', links.LinkId.OPEN); .where('campaign_links.link', links.LinkId.OPEN);
}); });
@ -120,7 +120,7 @@ async function run() {
sqlQry = sqlQry.innerJoin( sqlQry = sqlQry.innerJoin(
function () { function () {
return this.from('campaign_messages') return this.from('campaign_messages')
.where('campaign_messages.campaign', campaign.id) .where('campaign_messages.campaign', trigger.source_campaign)
.where('campaign_messages.list', cpgList.list) .where('campaign_messages.list', cpgList.list)
.as('campaign_messages'); .as('campaign_messages');
}, 'campaign_messages.subscription', subsTable + '.id') }, 'campaign_messages.subscription', subsTable + '.id')
@ -129,7 +129,7 @@ async function run() {
.select('*') .select('*')
.from('campaign_links') .from('campaign_links')
.whereRaw(`campaign_links.subscription = ${subsTable}.id`) .whereRaw(`campaign_links.subscription = ${subsTable}.id`)
.where('campaign_links.campaign', campaign.id) .where('campaign_links.campaign', trigger.source_campaign)
.where('campaign_links.list', cpgList.list) .where('campaign_links.list', cpgList.list)
.where('campaign_links.link', links.LinkId.GENERAL_CLICK); .where('campaign_links.link', links.LinkId.GENERAL_CLICK);
}); });