From 538e0bffdaef039d8aa207b0cca7e705be479050 Mon Sep 17 00:00:00 2001 From: Moumita <36885121+MoumitaM@users.noreply.github.com> Date: Thu, 7 Apr 2022 20:11:10 +0530 Subject: [PATCH] FB util file renamed and fixed `originalTimestamp` override (#488) * fixed util file name mismatch * prevent originalTimestamp override * Update utils/EventRepository.js Co-authored-by: Sai Kumar Battinoju <88789928+saikumarrs@users.noreply.github.com> * Minor formatting issue fixed Co-authored-by: Sai Kumar Battinoju <88789928+saikumarrs@users.noreply.github.com> Co-authored-by: saikumarrs --- integrations/FacebookPixel/util.js | 4 ---- integrations/FacebookPixel/utils.js | 9 +++++++++ utils/EventRepository.js | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 integrations/FacebookPixel/util.js create mode 100644 integrations/FacebookPixel/utils.js diff --git a/integrations/FacebookPixel/util.js b/integrations/FacebookPixel/util.js deleted file mode 100644 index 5e66c8a055..0000000000 --- a/integrations/FacebookPixel/util.js +++ /dev/null @@ -1,4 +0,0 @@ -function getEventId(message){ - 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 diff --git a/integrations/FacebookPixel/utils.js b/integrations/FacebookPixel/utils.js new file mode 100644 index 0000000000..a6fb98d96a --- /dev/null +++ b/integrations/FacebookPixel/utils.js @@ -0,0 +1,9 @@ +function getEventId(message) { + return ( + message.traits.event_id || + message.context.traits.event_id || + message.properties.event_id || + message.messageId + ); +} +export default getEventId; diff --git a/utils/EventRepository.js b/utils/EventRepository.js index f497bbaaef..cfe333ee4b 100644 --- a/utils/EventRepository.js +++ b/utils/EventRepository.js @@ -63,7 +63,8 @@ class EventRepository { */ enqueue(rudderElement, type) { const message = rudderElement.getElementContent(); - message.originalTimestamp = getCurrentTimeFormatted(); + message.originalTimestamp = + message.originalTimestamp || getCurrentTimeFormatted(); message.sentAt = getCurrentTimeFormatted(); // add this, will get modified when actually being sent // check message size, if greater log an error