Skip to content

Commit

Permalink
Merge branch 'develop' into enhance.algolia
Browse files Browse the repository at this point in the history
  • Loading branch information
shrouti1507 authored Apr 17, 2024
2 parents a140e2d + 5381b68 commit 6cfb2af
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 23 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

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.62.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.61.1...v1.62.0) (2024-04-15)


### Features

* do away myaxios ([#3222](https://github.com/rudderlabs/rudder-transformer/issues/3222)) ([9214594](https://github.com/rudderlabs/rudder-transformer/commit/9214594bab2c86a4ae6f75e12531f778490cf127))
* for reddit adding currency and value for addToCart, viewConent event as well ([#3239](https://github.com/rudderlabs/rudder-transformer/issues/3239)) ([ad235e7](https://github.com/rudderlabs/rudder-transformer/commit/ad235e785bf6039e11231a915be098130b25ec3b))
* logger upgrade in services, dest, source ([#3228](https://github.com/rudderlabs/rudder-transformer/issues/3228)) ([c204113](https://github.com/rudderlabs/rudder-transformer/commit/c204113eab37a782f217488d0d626a8d6df345d3))
* rakuten: adding a default value for tr ([#3240](https://github.com/rudderlabs/rudder-transformer/issues/3240)) ([3748f24](https://github.com/rudderlabs/rudder-transformer/commit/3748f24e21634fc74c5e5b3761551c64c8e69942))


### Bug Fixes

* adding check for reserved key words in extract custom fields ([#3264](https://github.com/rudderlabs/rudder-transformer/issues/3264)) ([3399c47](https://github.com/rudderlabs/rudder-transformer/commit/3399c47fdce1b3d19e29306ca3c5692a2fbc30fb))
* deployment file paths ([#3216](https://github.com/rudderlabs/rudder-transformer/issues/3216)) ([808727d](https://github.com/rudderlabs/rudder-transformer/commit/808727de17e400ed102a843ab3b30f81f8900f24))
* email mappings ([#3247](https://github.com/rudderlabs/rudder-transformer/issues/3247)) ([791cbf5](https://github.com/rudderlabs/rudder-transformer/commit/791cbf55fc6940af4e3208212b82c891c6618fc3))
* fixed userId mapping, now mapping to uid instead of id ([#3262](https://github.com/rudderlabs/rudder-transformer/issues/3262)) ([9c6b251](https://github.com/rudderlabs/rudder-transformer/commit/9c6b251a6c784cc391f27e846a008fbe2901e2c8))
* hs bugsnag error ([#3252](https://github.com/rudderlabs/rudder-transformer/issues/3252)) ([9daf1c9](https://github.com/rudderlabs/rudder-transformer/commit/9daf1c989258bd410d5780c1b11c4f6df9654af5))
* hubspot: search for contact using secondary prop ([#3258](https://github.com/rudderlabs/rudder-transformer/issues/3258)) ([0b57204](https://github.com/rudderlabs/rudder-transformer/commit/0b5720446693efe1fd0ccdfc141bd7f21b2c32ae))
* impact: support custom product mapping ([#3249](https://github.com/rudderlabs/rudder-transformer/issues/3249)) ([cb8ff2f](https://github.com/rudderlabs/rudder-transformer/commit/cb8ff2fb943c49df4ac083bd179d9674b40eb602))
* marketo bulk ignore null while checking data type mismatch ([#3263](https://github.com/rudderlabs/rudder-transformer/issues/3263)) ([6e3274b](https://github.com/rudderlabs/rudder-transformer/commit/6e3274bfba9e7838d1f81d845a070427b67e75f5))
* shopify: send 500 for identifier call in case of failure ([#3235](https://github.com/rudderlabs/rudder-transformer/issues/3235)) ([8eb4c4e](https://github.com/rudderlabs/rudder-transformer/commit/8eb4c4e9b8daebbaeb1d12ff0c17915fe19c2b50))

### [1.61.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.61.0...v1.61.1) (2024-04-03)

## [1.61.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.60.0...v1.61.0) (2024-04-02)
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.61.1",
"version": "1.62.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/delivery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const NON_DETERMINABLE = 'Non-determinable';

export class DeliveryController {
public static async deliverToDestination(ctx: Context) {
logger.info('Native(Delivery):: Request to transformer::', ctx.request.body);
logger.debug('Native(Delivery):: Request to transformer::', ctx.request.body);
let deliveryResponse: DeliveryV0Response;
const requestMetadata = MiscService.getRequestMetadata(ctx);
const deliveryRequest = ctx.request.body as ProxyV0Request;
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/destination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export class DestinationController {
}

public static batchProcess(ctx: Context) {
logger.info('Native(Process-Transform-Batch):: Requst to transformer::', ctx.request.body);
logger.debug('Native(Process-Transform-Batch):: Requst to transformer::', ctx.request.body);
const startTime = new Date();
const requestMetadata = MiscService.getRequestMetadata(ctx);
const routerRequest = ctx.request.body as RouterTransformationRequest;
Expand Down
6 changes: 5 additions & 1 deletion src/v0/destinations/awin/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ const trackProduct = (properties, advertiserId, commissionParts) => {
productsArray.forEach((product) => {
const productPayloadNew = {
advertiserId,
orderReference: properties.order_id || properties.orderId,
orderReference:
properties.order_id ||
properties.orderId ||
properties.orderReference ||
properties.order_reference,
productId: product.product_id || product.productId,
productName: product.name,
productItemPrice: product.price,
Expand Down
9 changes: 8 additions & 1 deletion src/v0/destinations/hs/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -752,11 +752,18 @@ const splitEventsForCreateUpdate = async (inputs, destination) => {
}
const secondaryProp = primaryToSecondaryFields[identifierType];
if (secondaryProp) {
// second condition is for secondary property for identifier type
/* second condition is for secondary property for identifier type
For example:
update[secondaryProp] = "[email protected];[email protected];[email protected]"
destinationExternalId = "[email protected]"
So we are splitting all the emails in update[secondaryProp] into an array using ';'
and then checking if array includes destinationExternalId
*/
const filteredInfoForSecondaryProp = hsIdsToBeUpdated.filter((update) =>
update[secondaryProp]
?.toString()
.toLowerCase()
.split(';')
.includes(destinationExternalId.toString().toLowerCase()),
);
if (filteredInfoForSecondaryProp.length > 0) {
Expand Down
17 changes: 9 additions & 8 deletions src/v0/destinations/monday/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const getGroupId = (groupTitle, board) => {
}
});
if (groupId) {
return groupId;
return JSON.stringify(groupId);
}
throw new ConfigurationError(`Group ${groupTitle} doesn't exist in the board`);
};
Expand Down Expand Up @@ -239,19 +239,20 @@ const populatePayload = (message, Config, boardDeatailsResponse) => {
columnToPropertyMapping,
boardDeatailsResponse.response?.data,
);
const items = [
`board_id: ${boardId}`,
`item_name: ${JSON.stringify(message.properties?.name)}`,
`column_values: ${JSON.stringify(columnValues)}`,
];
if (groupTitle) {
if (!message.properties?.name) {
throw new InstrumentationError('Item name is required to create an item');
}
const groupId = getGroupId(groupTitle, boardDeatailsResponse.response?.data);
payload.query = `mutation { create_item (board_id: ${boardId}, group_id: ${groupId} item_name: ${JSON.stringify(
message.properties?.name,
)}, column_values: ${JSON.stringify(columnValues)}) {id}}`;
} else {
payload.query = `mutation { create_item (board_id: ${boardId}, item_name: ${JSON.stringify(
message.properties?.name,
)}, column_values: ${JSON.stringify(columnValues)}) {id}}`;
items.push(`group_id: ${groupId}`);
}
const itemsQuery = items.join(', ');
payload.query = `mutation { create_item (${itemsQuery}) {id}}`;
return payload;
};

Expand Down
2 changes: 1 addition & 1 deletion src/v0/destinations/twitter_ads/transform.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function validateRequest(message) {
}

function process(event, requestMetadata, logger) {
logger.info(`[TWITTER ADS]: Transforming request received with info`);
logger.debug(`[TWITTER ADS]: Transforming request received with info`);
const { message, metadata, destination } = event;

validateRequest(message);
Expand Down
10 changes: 5 additions & 5 deletions test/integrations/destinations/monday/processor/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const data = [
FORM: {},
JSON: {
query:
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down Expand Up @@ -172,7 +172,7 @@ export const data = [
FORM: {},
JSON: {
query:
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down Expand Up @@ -716,7 +716,7 @@ export const data = [
body: {
JSON: {
query:
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down Expand Up @@ -827,7 +827,7 @@ export const data = [
body: {
JSON: {
query:
'mutation { create_item (board_id: 339283933, group_id: group_title item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}", group_id: "group_title") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down Expand Up @@ -1188,7 +1188,7 @@ export const data = [
body: {
JSON: {
query:
'mutation { create_item (board_id: 339283933, group_id: group_title item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"},\\"checkbox\\":{\\"checked\\":true},\\"numbers\\":\\"45\\",\\"text\\":\\"texting\\",\\"country\\":{\\"countryName\\":\\"Unites States\\",\\"countryCode\\":\\"US\\"},\\"location\\":{\\"address\\":\\"New York\\",\\"lat\\":\\"51.23\\",\\"lng\\":\\"35.3\\"},\\"phone\\":{\\"phone\\":\\"2626277272\\",\\"countryShortName\\":\\"US\\"},\\"rating\\":3,\\"link\\":{\\"url\\":\\"demo.com\\",\\"text\\":\\"websiteLink\\"},\\"long_text\\":{\\"text\\":\\"property description\\"},\\"world_clock\\":{\\"timezone\\":\\"America/New_York\\"}}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"},\\"checkbox\\":{\\"checked\\":true},\\"numbers\\":\\"45\\",\\"text\\":\\"texting\\",\\"country\\":{\\"countryName\\":\\"Unites States\\",\\"countryCode\\":\\"US\\"},\\"location\\":{\\"address\\":\\"New York\\",\\"lat\\":\\"51.23\\",\\"lng\\":\\"35.3\\"},\\"phone\\":{\\"phone\\":\\"2626277272\\",\\"countryShortName\\":\\"US\\"},\\"rating\\":3,\\"link\\":{\\"url\\":\\"demo.com\\",\\"text\\":\\"websiteLink\\"},\\"long_text\\":{\\"text\\":\\"property description\\"},\\"world_clock\\":{\\"timezone\\":\\"America/New_York\\"}}", group_id: "group_title") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down
4 changes: 2 additions & 2 deletions test/integrations/destinations/monday/router/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const data = [
FORM: {},
JSON: {
query:
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{}") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down Expand Up @@ -159,7 +159,7 @@ export const data = [
body: {
JSON: {
query:
'mutation { create_item (board_id: 339283933, group_id: group_title item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}") {id}}',
'mutation { create_item (board_id: 339283933, item_name: "Task 1", column_values: "{\\"status\\":{\\"label\\":\\"Done\\"},\\"email\\":{\\"email\\":\\"[email protected]\\",\\"text\\":\\"emailId\\"}}", group_id: "group_title") {id}}',
},
JSON_ARRAY: {},
XML: {},
Expand Down

0 comments on commit 6cfb2af

Please sign in to comment.