From a8025f2ba852f3b5dba559479286c0d11b9dbdc2 Mon Sep 17 00:00:00 2001 From: RudderStack Date: Mon, 4 Apr 2022 19:36:32 +0530 Subject: [PATCH 1/6] assigning event_id as per cloud mode --- integrations/FacebookPixel/browser.js | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 582edd994e..2c909e60c6 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -73,7 +73,7 @@ class FacebookPixel { page(rudderElement) { const { properties, messageId } = rudderElement.message; - window.fbq("track", "PageView", properties, { eventID: messageId }); + window.fbq("track", "PageView", properties, { event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId }); } identify(rudderElement) { @@ -199,7 +199,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); each((val, key) => { @@ -213,7 +213,7 @@ class FacebookPixel { value: revValue, }, { - eventID: messageId, + event_id: messageId, } ); } @@ -244,7 +244,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); @@ -261,7 +261,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } @@ -293,7 +293,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); @@ -310,7 +310,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } @@ -369,7 +369,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); @@ -384,7 +384,7 @@ class FacebookPixel { value: revValue, }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } @@ -404,7 +404,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); @@ -419,7 +419,7 @@ class FacebookPixel { value: revValue, }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } @@ -464,7 +464,7 @@ class FacebookPixel { customProperties ), { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); @@ -479,7 +479,7 @@ class FacebookPixel { value: revValue, }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } @@ -494,7 +494,7 @@ class FacebookPixel { const payloadVal = this.buildPayLoad(rudderElement, false); payloadVal.value = revValue; window.fbq("trackSingleCustom", self.pixelId, event, payloadVal, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, }); } else { each((val, key) => { @@ -502,7 +502,7 @@ class FacebookPixel { payload.currency = currVal; window.fbq("trackSingle", self.pixelId, val, payload, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, }); } }, standardTo); @@ -518,7 +518,7 @@ class FacebookPixel { value: revValue, }, { - eventID: messageId, + event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, } ); } From 8188e7ebeaaa0d3769a64181274f1c307212b7e6 Mon Sep 17 00:00:00 2001 From: RudderStack Date: Mon, 4 Apr 2022 22:11:58 +0530 Subject: [PATCH 2/6] created util function --- integrations/FacebookPixel/browser.js | 31 ++++++++++++++------------- utils/getEventId.js | 4 ++++ 2 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 utils/getEventId.js diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 2c909e60c6..433914e5f0 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -4,6 +4,7 @@ import each from "@ndhoule/each"; import sha256 from "crypto-js/sha256"; import ScriptLoader from "../ScriptLoader"; import logger from "../../utils/logUtil"; +import getEventId from "../../utils/getEventId.js"; import { getHashFromArray } from "../utils/commonUtils"; import { NAME, traitsMapper } from "./constants"; import { constructPayload } from "../../utils/utils"; @@ -73,7 +74,7 @@ class FacebookPixel { page(rudderElement) { const { properties, messageId } = rudderElement.message; - window.fbq("track", "PageView", properties, { event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId }); + window.fbq("track", "PageView", properties, { getEventId(message) }); } identify(rudderElement) { @@ -199,7 +200,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); each((val, key) => { @@ -244,7 +245,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); @@ -261,7 +262,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } @@ -293,7 +294,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); @@ -310,7 +311,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } @@ -369,7 +370,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); @@ -384,7 +385,7 @@ class FacebookPixel { value: revValue, }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } @@ -404,7 +405,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); @@ -419,7 +420,7 @@ class FacebookPixel { value: revValue, }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } @@ -464,7 +465,7 @@ class FacebookPixel { customProperties ), { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); @@ -479,7 +480,7 @@ class FacebookPixel { value: revValue, }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } @@ -494,7 +495,7 @@ class FacebookPixel { const payloadVal = this.buildPayLoad(rudderElement, false); payloadVal.value = revValue; window.fbq("trackSingleCustom", self.pixelId, event, payloadVal, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), }); } else { each((val, key) => { @@ -502,7 +503,7 @@ class FacebookPixel { payload.currency = currVal; window.fbq("trackSingle", self.pixelId, val, payload, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), }); } }, standardTo); @@ -518,7 +519,7 @@ class FacebookPixel { value: revValue, }, { - event_id: traits.event_id || context.traits.event_id || properties.event_id || messageId, + event_id: getEventId(message), } ); } diff --git a/utils/getEventId.js b/utils/getEventId.js new file mode 100644 index 0000000000..f13e59c874 --- /dev/null +++ b/utils/getEventId.js @@ -0,0 +1,4 @@ +function getEventId(message){ + return traits.event_id || context.traits.event_id || properties.event_id || messageId; +}; +export default getEventId; \ No newline at end of file From d6465646a79053e92991dae64940564afb46f335 Mon Sep 17 00:00:00 2001 From: RudderStack Date: Tue, 5 Apr 2022 10:40:15 +0530 Subject: [PATCH 3/6] fixing code errors --- integrations/FacebookPixel/browser.js | 32 +++++++++++++-------------- utils/getEventId.js | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 433914e5f0..820fbace6b 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -74,7 +74,7 @@ class FacebookPixel { page(rudderElement) { const { properties, messageId } = rudderElement.message; - window.fbq("track", "PageView", properties, { getEventId(message) }); + window.fbq("track", "PageView", properties, { event_id: getEventId(rudderElement.message) }); } identify(rudderElement) { @@ -200,7 +200,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); each((val, key) => { @@ -214,7 +214,7 @@ class FacebookPixel { value: revValue, }, { - event_id: messageId, + event_id: getEventId(rudderElement.message), } ); } @@ -245,7 +245,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); @@ -262,7 +262,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } @@ -294,7 +294,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); @@ -311,7 +311,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } @@ -370,7 +370,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); @@ -385,7 +385,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } @@ -405,7 +405,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); @@ -420,7 +420,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } @@ -465,7 +465,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); @@ -480,7 +480,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } @@ -495,7 +495,7 @@ class FacebookPixel { const payloadVal = this.buildPayLoad(rudderElement, false); payloadVal.value = revValue; window.fbq("trackSingleCustom", self.pixelId, event, payloadVal, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), }); } else { each((val, key) => { @@ -503,7 +503,7 @@ class FacebookPixel { payload.currency = currVal; window.fbq("trackSingle", self.pixelId, val, payload, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), }); } }, standardTo); @@ -519,7 +519,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(message), + event_id: getEventId(rudderElement.message), } ); } diff --git a/utils/getEventId.js b/utils/getEventId.js index f13e59c874..5e66c8a055 100644 --- a/utils/getEventId.js +++ b/utils/getEventId.js @@ -1,4 +1,4 @@ function getEventId(message){ - return traits.event_id || context.traits.event_id || properties.event_id || messageId; + return message.traits.event_id || message.context.traits.event_id || message.properties.event_id || message.messageId; }; export default getEventId; \ No newline at end of file From bb3770d1a05283f216aa5fcf80fbf1c34179354d Mon Sep 17 00:00:00 2001 From: KAZA ROHITH KUMAR <58467752+rohithkaza@users.noreply.github.com> Date: Tue, 5 Apr 2022 12:34:28 +0530 Subject: [PATCH 4/6] Update integrations/FacebookPixel/browser.js Co-authored-by: Utsab Chowdhury --- integrations/FacebookPixel/browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 820fbace6b..78f23c5fbe 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -73,7 +73,7 @@ class FacebookPixel { } page(rudderElement) { - const { properties, messageId } = rudderElement.message; + const { properties } = rudderElement.message; window.fbq("track", "PageView", properties, { event_id: getEventId(rudderElement.message) }); } From 48ecef1adeec119290f7ce4a276ea88504c5ccb7 Mon Sep 17 00:00:00 2001 From: RudderStack Date: Tue, 5 Apr 2022 12:40:40 +0530 Subject: [PATCH 5/6] updated util.js file path --- integrations/FacebookPixel/browser.js | 2 +- utils/getEventId.js => integrations/FacebookPixel/util.js | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename utils/getEventId.js => integrations/FacebookPixel/util.js (100%) diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 78f23c5fbe..1da3dbbb69 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -4,7 +4,7 @@ import each from "@ndhoule/each"; import sha256 from "crypto-js/sha256"; import ScriptLoader from "../ScriptLoader"; import logger from "../../utils/logUtil"; -import getEventId from "../../utils/getEventId.js"; +import getEventId from "./utils"; import { getHashFromArray } from "../utils/commonUtils"; import { NAME, traitsMapper } from "./constants"; import { constructPayload } from "../../utils/utils"; diff --git a/utils/getEventId.js b/integrations/FacebookPixel/util.js similarity index 100% rename from utils/getEventId.js rename to integrations/FacebookPixel/util.js From 2e5b5133fb6664a56bcc3a5e6ba459127517195d Mon Sep 17 00:00:00 2001 From: RudderStack Date: Tue, 5 Apr 2022 13:05:46 +0530 Subject: [PATCH 6/6] reduced repeated function call --- integrations/FacebookPixel/browser.js | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/integrations/FacebookPixel/browser.js b/integrations/FacebookPixel/browser.js index 1da3dbbb69..55f832108b 100644 --- a/integrations/FacebookPixel/browser.js +++ b/integrations/FacebookPixel/browser.js @@ -157,6 +157,7 @@ class FacebookPixel { query = properties.query; } const customProperties = this.buildPayLoad(rudderElement, true); + const eventID = getEventId(rudderElement.message); if (event === "Product List Viewed") { let contentType; const contentIds = []; @@ -200,7 +201,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); each((val, key) => { @@ -214,7 +215,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -245,7 +246,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); @@ -262,7 +263,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -294,7 +295,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); @@ -311,7 +312,7 @@ class FacebookPixel { : this.formatRevenue(price), }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -370,7 +371,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); @@ -385,7 +386,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -405,7 +406,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); @@ -420,7 +421,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -465,7 +466,7 @@ class FacebookPixel { customProperties ), { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); @@ -480,7 +481,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); } @@ -495,7 +496,7 @@ class FacebookPixel { const payloadVal = this.buildPayLoad(rudderElement, false); payloadVal.value = revValue; window.fbq("trackSingleCustom", self.pixelId, event, payloadVal, { - event_id: getEventId(rudderElement.message), + event_id: eventID, }); } else { each((val, key) => { @@ -503,7 +504,7 @@ class FacebookPixel { payload.currency = currVal; window.fbq("trackSingle", self.pixelId, val, payload, { - event_id: getEventId(rudderElement.message), + event_id: eventID, }); } }, standardTo); @@ -519,7 +520,7 @@ class FacebookPixel { value: revValue, }, { - event_id: getEventId(rudderElement.message), + event_id: eventID, } ); }