Merge branch 'develop' into fix.network-handlers

rudderlabs · Jan 25, 2024 · 30c4eca · 30c4eca
2 parents b1327eb + db2c170
commit 30c4eca
Show file tree

Hide file tree

Showing 149 changed files with 20,084 additions and 31,492 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.54.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.54.0...v1.54.1) (2024-01-24)
+
+
+### Bug Fixes
+
+* remove brand mapping from products to contents in tiktok_ads ([49c4988](https://github.com/rudderlabs/rudder-transformer/commit/49c4988cc872f40780fa640240c209c3d768fab4))
+
+## [1.54.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.53.0...v1.54.0) (2024-01-22)
+
+
+### Features
+
+* add regulation to features.json ([2ae4378](https://github.com/rudderlabs/rudder-transformer/commit/2ae437820952b87dace289ec04d5c116d77cf70c))
+* add regulation to features.json ([#2988](https://github.com/rudderlabs/rudder-transformer/issues/2988)) ([65c79a8](https://github.com/rudderlabs/rudder-transformer/commit/65c79a8fd02218cee5d12e51004cdc023a0e7989))
+* onboard new tiktok version events 2.0 ([#2961](https://github.com/rudderlabs/rudder-transformer/issues/2961)) ([0fca088](https://github.com/rudderlabs/rudder-transformer/commit/0fca088980368954e9a82addedd6a4544035259a))
+
+
+### Bug Fixes
+
+* add valid code coverage file in workflows ([#3000](https://github.com/rudderlabs/rudder-transformer/issues/3000)) ([34bf49d](https://github.com/rudderlabs/rudder-transformer/commit/34bf49d19f33326008a467230574e4f1c78e9ddb))
+* error handling for trade desk first party data flow ([#2986](https://github.com/rudderlabs/rudder-transformer/issues/2986)) ([32c9c03](https://github.com/rudderlabs/rudder-transformer/commit/32c9c038ca96477cbe8d94d2a19679817b952e4c))
+* fixing network and default error messages for marketo bulk upload ([#3016](https://github.com/rudderlabs/rudder-transformer/issues/3016)) ([3741073](https://github.com/rudderlabs/rudder-transformer/commit/3741073ea37e83aa1e6e35c3ccb26d5a41a49617))
+* klaviyo validate event name to be string before accessing it ([#2998](https://github.com/rudderlabs/rudder-transformer/issues/2998)) ([7aa6687](https://github.com/rudderlabs/rudder-transformer/commit/7aa6687829783df3924a89698a53b9cb315449eb))
+* mailjet source operating on array instead object ([#2999](https://github.com/rudderlabs/rudder-transformer/issues/2999)) ([0dbb307](https://github.com/rudderlabs/rudder-transformer/commit/0dbb307bf5d18893e3331cd92bc16bae1b4a6add))
+* mixpanel alias simplified merge error message ([#2996](https://github.com/rudderlabs/rudder-transformer/issues/2996)) ([e53b304](https://github.com/rudderlabs/rudder-transformer/commit/e53b3046252bb5abcae046445baf4a67c40f37a3))
+* optimise build and coverage ([#2985](https://github.com/rudderlabs/rudder-transformer/issues/2985)) ([81ab6e8](https://github.com/rudderlabs/rudder-transformer/commit/81ab6e86070a9992141bad405c6f52d1ab186f11))
+* ortto remove phn:phone field if no phone is there in payload ([#2997](https://github.com/rudderlabs/rudder-transformer/issues/2997)) ([0c2f7bc](https://github.com/rudderlabs/rudder-transformer/commit/0c2f7bcbf705787087a8d9073145e282851ddb6f))
+* pr conflicts in back merge ([#2984](https://github.com/rudderlabs/rudder-transformer/issues/2984)) ([f16066c](https://github.com/rudderlabs/rudder-transformer/commit/f16066cc8f867378f1b9bb9812f8efe389ca5bc8))
+* **slack:** add support of blank space in handlebar ([#2959](https://github.com/rudderlabs/rudder-transformer/issues/2959)) ([ff12d8f](https://github.com/rudderlabs/rudder-transformer/commit/ff12d8ffddccbdac934c7cbac03730cd2593147f))
+* tiktok add missing field brand ([#2942](https://github.com/rudderlabs/rudder-transformer/issues/2942)) ([ca76297](https://github.com/rudderlabs/rudder-transformer/commit/ca76297147f0a2c12d68d97dda95b9a44efe4020))
+* tiktok_ads remove page.url as a required field ([#3006](https://github.com/rudderlabs/rudder-transformer/issues/3006)) ([595f819](https://github.com/rudderlabs/rudder-transformer/commit/595f81982a2604ec08621e15cea7c16564d5ecab))
+
 ## [1.53.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.52.4...v1.53.0) (2024-01-08)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.53.0",
+  "version": "1.54.1",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

diff --git a/src/v0/destinations/tiktok_ads/util.js b/src/v0/destinations/tiktok_ads/util.js
@@ -23,7 +23,6 @@ const getContents = (message, getContentType = true) => {
         price: product.price,
         quantity: product.quantity,
         description: product.description,
-        brand: product.brand,
       };
       contents.push(removeUndefinedAndNullValues(singleProduct));
     });

diff --git a/test/__tests__/data/pinterest_tag_router_batch_output.json b/test/__tests__/data/pinterest_tag_router_batch_output.json
@@ -142,10 +142,12 @@
       },
       "metadata": [
         {
-          "jobId": 1
+          "jobId": 1,
+          "userId": "u1"
         },
         {
-          "jobId": 2
+          "jobId": 2,
+          "userId": "u1"
         }
       ],
       "batched": true,
@@ -329,13 +331,16 @@
       },
       "metadata": [
         {
-          "jobId": 3
+          "jobId": 3,
+          "userId": "u1"
         },
         {
-          "jobId": 4
+          "jobId": 4,
+          "userId": "u1"
         },
         {
-          "jobId": 6
+          "jobId": 6,
+          "userId": "u1"
         }
       ],
       "batched": true,
@@ -445,7 +450,8 @@
       },
       "metadata": [
         {
-          "jobId": 7
+          "jobId": 7,
+          "userId": "u1"
         }
       ],
       "batched": true,
@@ -496,7 +502,8 @@
     {
       "metadata": [
         {
-          "jobId": 5
+          "jobId": 5,
+          "userId": "u1"
         }
       ],
       "batched": false,
@@ -736,10 +743,12 @@
       },
       "metadata": [
         {
-          "jobId": 8
+          "jobId": 8,
+          "userId": "u1"
         },
         {
-          "jobId": 9
+          "jobId": 9,
+          "userId": "u1"
         }
       ],
       "statusCode": 200
@@ -852,7 +861,8 @@
       },
       "metadata": [
         {
-          "jobId": 10
+          "jobId": 10,
+          "userId": "u1"
         }
       ],
       "statusCode": 200

diff --git a/test/__tests__/data/pinterest_tag_router_error_input.json b/test/__tests__/data/pinterest_tag_router_error_input.json
@@ -75,7 +75,8 @@
       }
     },
     "metadata": {
-      "jobId": 5
+      "jobId": 5,
+      "userId": "u1"
     },
     "destination": {
       "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",

diff --git a/test/__tests__/data/pinterest_tag_router_error_output.json b/test/__tests__/data/pinterest_tag_router_error_output.json
@@ -2,7 +2,8 @@
   {
     "metadata": [
       {
-        "jobId": 5
+        "jobId": 5,
+        "userId": "u1"
       }
     ],
     "batched": false,

diff --git a/test/__tests__/data/pinterest_tag_router_input.json b/test/__tests__/data/pinterest_tag_router_input.json
@@ -77,7 +77,8 @@
         }
       },
       "metadata": {
-        "jobId": 1
+        "jobId": 1,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -198,7 +199,8 @@
         }
       },
       "metadata": {
-        "jobId": 2
+        "jobId": 2,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -300,7 +302,8 @@
         }
       },
       "metadata": {
-        "jobId": 3
+        "jobId": 3,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -421,7 +424,8 @@
         }
       },
       "metadata": {
-        "jobId": 4
+        "jobId": 4,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -542,7 +546,8 @@
         }
       },
       "metadata": {
-        "jobId": 5
+        "jobId": 5,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -663,7 +668,8 @@
         }
       },
       "metadata": {
-        "jobId": 6
+        "jobId": 6,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -764,7 +770,8 @@
         "files": {}
       },
       "metadata": {
-        "jobId": 7
+        "jobId": 7,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -888,7 +895,8 @@
         }
       },
       "metadata": {
-        "jobId": 8
+        "jobId": 8,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -1011,7 +1019,8 @@
         }
       },
       "metadata": {
-        "jobId": 9
+        "jobId": 9,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",
@@ -1134,7 +1143,8 @@
         }
       },
       "metadata": {
-        "jobId": 10
+        "jobId": 10,
+        "userId": "u1"
       },
       "destination": {
         "ID": "1pYpzzvcn7AQ2W9GGIAZSsN6Mfq",

diff --git a/test/__tests__/data/pinterest_tag_router_output.json b/test/__tests__/data/pinterest_tag_router_output.json
@@ -294,22 +294,28 @@
       },
       "metadata": [
         {
-          "jobId": 1
+          "jobId": 1,
+          "userId": "u1"
         },
         {
-          "jobId": 2
+          "jobId": 2,
+          "userId": "u1"
         },
         {
-          "jobId": 3
+          "jobId": 3,
+          "userId": "u1"
         },
         {
-          "jobId": 4
+          "jobId": 4,
+          "userId": "u1"
         },
         {
-          "jobId": 6
+          "jobId": 6,
+          "userId": "u1"
         },
         {
-          "jobId": 7
+          "jobId": 7,
+          "userId": "u1"
         }
       ],
       "batched": true,
@@ -360,7 +366,8 @@
     {
       "metadata": [
         {
-          "jobId": 5
+          "jobId": 5,
+          "userId": "u1"
         }
       ],
       "statTags": {
@@ -593,13 +600,16 @@
       },
       "metadata": [
         {
-          "jobId": 8
+          "jobId": 8,
+          "userId": "u1"
         },
         {
-          "jobId": 9
+          "jobId": 9,
+          "userId": "u1"
         },
         {
-          "jobId": 10
+          "jobId": 10,
+          "userId": "u1"
         }
       ],
       "batched": true,

diff --git a/test/__tests__/pinterestConversion.test.js b/test/__tests__/pinterestConversion.test.js
@@ -7,6 +7,8 @@ const path = require("path");
 const version = "v0";
 
 const transformer = require(`../../src/${version}/destinations/${integration}/transform`);
+const { assertRouterOutput } = require('../testHelper');
+
 const inputDataFile = fs.readFileSync(
   path.resolve(__dirname, `./data/${integration}_input.json`)
 );
@@ -44,6 +46,7 @@ describe(`${name} Tests`, () => {
     inputRouterData.forEach((input, index) => {
       it(`Payload: ${index}`, async () => {
         let output = await transformer.processRouterDest(input);
+        assertRouterOutput(output, input);
         expect(output).toEqual(expectedRouterData[index]);
       });
     });

diff --git a/test/__tests__/utilities/test-utils.js b/test/__tests__/utilities/test-utils.js
@@ -2,6 +2,7 @@ const fs = require("fs");
 const _ = require("lodash");
 const path = require("path");
 const { ConfigFactory, Executor } = require("rudder-transformer-cdk");
+const { assertRouterOutput } = require('../../testHelper');
 
 // TODO: separate this out later as the list grows
 const cdkEnabledDestinations = {
@@ -95,7 +96,9 @@ function executeTransformationTest(dest, transformAt) {
             if (transformAt == "processor") {
               actualData = await transformer.process(tcInput);
             } else {
-              actualData = (await transformer.processRouterDest([tcInput]))[0];
+              actual = await transformer.processRouterDest([tcInput])
+              assertRouterOutput(actual, [tcInput]);
+              actualData = (actual)[0];
             }
           }
           // Compare actual and expected data
@@ -115,6 +118,7 @@ function executeTransformationTest(dest, transformAt) {
           const version = "v0";
           const transformer = require(`../../../src/${version}/destinations/${dest}/transform`);
           actualData = await transformer.processRouterDest(commonInput);
+          assertRouterOutput(actualData, commonInput);
           const cloneActual = _.cloneDeep(actualData);
           cloneActual[0].statTags = "undefined";
           // Compare actual and expected data