Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pull main into develop post release v1.50.0 #2827

Merged
merged 4 commits into from
Nov 14, 2023
Merged

chore(release): pull main into develop post release v1.50.0 #2827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b928461
chore(release): 1.50.0
web-flow Nov 13, 2023
a56d668
fix: source transform error stat (#2825)
chandumlg Nov 13, 2023
2055dab
fix: snapchat_conversion category mapping (#2826)
aashishmalik Nov 14, 2023
c702456
chore(release): pull release/v1.50.0 into main (#2824)
aashishmalik Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

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.50.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.49.1...v1.50.0) (2023-11-13)


### Features

* add clickId support for tiktok and pinterest destination ([#2784](https://github.com/rudderlabs/rudder-transformer/issues/2784)) ([0e14296](https://github.com/rudderlabs/rudder-transformer/commit/0e1429663d167a2c5cded0d9130374eb586a18c0))
* add delivery_category as part of contents, remove flattening custom_data in FB conversions ([#2812](https://github.com/rudderlabs/rudder-transformer/issues/2812)) ([e82cef8](https://github.com/rudderlabs/rudder-transformer/commit/e82cef88e154d47519f0deeb60f55773f25fd3ad))
* add delivery_category as part of contents, update flattening custom_data in FB Pixel ([#2816](https://github.com/rudderlabs/rudder-transformer/issues/2816)) ([ee1f473](https://github.com/rudderlabs/rudder-transformer/commit/ee1f4733e82291375d85a6de8b8626ffdc8907b1))
* adding support for future oauth facility in salesforce ([#2746](https://github.com/rudderlabs/rudder-transformer/issues/2746)) ([916ea4c](https://github.com/rudderlabs/rudder-transformer/commit/916ea4c8d08f69b68b7795dd513a25a3cded55fa))
* introduce v1/source/sourceType endpoint ([#2722](https://github.com/rudderlabs/rudder-transformer/issues/2722)) ([0996e81](https://github.com/rudderlabs/rudder-transformer/commit/0996e816d3671c3e25561f76e3219be99225f24b))
* move cdkV1 to cdkv2 component tests ([#2804](https://github.com/rudderlabs/rudder-transformer/issues/2804)) ([195b48a](https://github.com/rudderlabs/rudder-transformer/commit/195b48ac0f438a200933e4bbb956fcc3941b7aed))
* use custom screen name amplitude ([#2823](https://github.com/rudderlabs/rudder-transformer/issues/2823)) ([93a82bd](https://github.com/rudderlabs/rudder-transformer/commit/93a82bd4856b462768d0213ae3de8b9b78e9858c))


### Bug Fixes

* source_transform_error stat label correction ([#2825](https://github.com/rudderlabs/rudder-transformer/issues/2825)) ([f3bcd7c](https://github.com/rudderlabs/rudder-transformer/commit/f3bcd7c9338ef96267be84f845c63f5234d37e33))
* shopify redis metric when there is no data returned for a key ([#2811](https://github.com/rudderlabs/rudder-transformer/issues/2811)) ([c02370e](https://github.com/rudderlabs/rudder-transformer/commit/c02370e38fabb581698baa00e1ddd3da93dc07fa))
* snapchat_conversion category mapping ([#2826](https://github.com/rudderlabs/rudder-transformer/issues/2826)) ([7acd004](https://github.com/rudderlabs/rudder-transformer/commit/7acd004e4290dfb5ea20402929041462eddb4496))

### [1.49.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.49.0...v1.49.1) (2023-11-10)


Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rudder-transformer",
"version": "1.49.1",
"version": "1.50.0",
"description": "",
"homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
"bugs": {
Expand Down
2 changes: 1 addition & 1 deletion src/services/source/nativeIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class NativeIntegrationSourceService implements IntegrationSource
} catch (error: FixMe) {
const metaTO = this.getTags();
stats.increment('source_transform_errors', {
sourceType,
source: sourceType,
version,
});
return PostTransformationServiceSource.handleFailureEventsSource(error, metaTO);
Expand Down
2 changes: 1 addition & 1 deletion src/v0/destinations/snapchat_conversion/data/OrderCompletedConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"destKey": "item_category",
"sourceKeys": "properties.item_category",
"sourceKeys": ["properties.item_category", "properties.category"],
"required": false
},
{
Expand Down
309 changes: 309 additions & 0 deletions test/integrations/destinations/snapchat_conversion/processor/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4291,6 +4291,315 @@ export const data = [
},
},
},
{
name: 'snapchat_conversion',
description: 'Test Case for Order Completed event category',
feature: 'processor',
module: 'destination',
version: 'v0',
input: {
request: {
body: [
{
message: {
messageId: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
originalTimestamp: '2022-04-22T10:57:58Z',
channel: 'mobile',
anonymousId: 'ea5cfab2-3961-4d8a-8187-3d1858c99090',
context: {
traits: {
email: '[email protected]',
phone: '+91 2111111 ',
},
app: {
build: '1.0.0',
name: 'RudderLabs JavaScript SDK',
namespace: 'com.rudderlabs.javascript',
version: '1.0.0',
},
device: {
advertisingId: 'T0T0T072-5e28-45a1-9eda-ce22a3e36d1a',
id: '3f034872-5e28-45a1-9eda-ce22a3e36d1a',
manufacturer: 'Google',
name: 'generic_x86_arm',
type: 'ios',
attTrackingStatus: 3,
},
library: {
name: 'RudderLabs JavaScript SDK',
version: '1.0.0',
},
locale: 'en-US',
os: {
name: 'iOS',
version: '14.4.1',
},
screen: {
density: 2,
},
externalId: [
{
type: 'ga4AppInstanceId',
id: 'f0dd99v4f979fb997ce453373900f891',
},
],
userAgent:
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',
},
type: 'track',
event: 'Order Completed',
properties: {
brands: ['brand01', 'brand02'],
products: [
{
product_id: '123',
price: '14',
quantity: 1,
},
{
product_id: '124',
price: 14,
quantity: 3,
},
],
category: 'shoes'
},
integrations: {
All: true,
},
sentAt: '2022-04-22T10:57:58Z',
},
destination: {
DestinationDefinition: {
Config: {
cdkV2Enabled: false,
},
},
Config: {
apiKey: 'dummyApiKey',
pixelId: 'dummyPixelId',
appId: 'dhfeih44f',
snapAppId: 'hfhdhfd',
},
},
metadata: {
jobId: 31,
destinationId: 'd2',
workspaceId: 'w2',
},
},
],
method: 'POST',
},
},
output: {
response: {
status: 200,
body: [
{
metadata: {
jobId: 31,
destinationId: 'd2',
workspaceId: 'w2',
},
output: {
version: '1',
type: 'REST',
method: 'POST',
endpoint: 'https://tr.snapchat.com/v2/conversion',
headers: {
Authorization: 'Bearer dummyApiKey',
'Content-Type': 'application/json',
},
params: {},
body: {
JSON: {
event_type: 'PURCHASE',
item_ids: ['123', '124'],
brands: ['brand01', 'brand02'],
item_category: "shoes",
price: '56',
hashed_email: '73062d872926c2a556f17b36f50e328ddf9bff9d403939bd14b6c3b7f5a33fc2',
hashed_phone_number:
'bc77d64d7045fe44795ed926df37231a0cfb6ec6b74588c512790e9f143cc492',
hashed_mobile_ad_id:
'f9779d734aaee50f16ee0011260bae7048f1d9a128c62b6a661077875701edd2',
hashed_idfv: '54bd0b26a3d39dad90f5149db49b9fd9ba885f8e35d1d94cae69273f5e657b9f',
user_agent:
'mozilla/5.0 (macintosh; intel mac os x 10_15_2) applewebkit/537.36 (khtml, like gecko) chrome/79.0.3945.88 safari/537.36',
timestamp: '1650625078',
event_conversion_type: 'MOBILE_APP',
snap_app_id: 'hfhdhfd',
app_id: 'dhfeih44f',
},
JSON_ARRAY: {},
XML: {},
FORM: {},
},
files: {},
userId: '',
},
statusCode: 200,
},
],
},
},
},
{
name: 'snapchat_conversion',
description: 'Test Case for Order Completed event with both category and item_category',
feature: 'processor',
module: 'destination',
version: 'v0',
input: {
request: {
body: [
{
message: {
messageId: 'ec5481b6-a926-4d2e-b293-0b3a77c4d3be',
originalTimestamp: '2022-04-22T10:57:58Z',
channel: 'mobile',
anonymousId: 'ea5cfab2-3961-4d8a-8187-3d1858c99090',
context: {
traits: {
email: '[email protected]',
phone: '+91 2111111 ',
},
app: {
build: '1.0.0',
name: 'RudderLabs JavaScript SDK',
namespace: 'com.rudderlabs.javascript',
version: '1.0.0',
},
device: {
advertisingId: 'T0T0T072-5e28-45a1-9eda-ce22a3e36d1a',
id: '3f034872-5e28-45a1-9eda-ce22a3e36d1a',
manufacturer: 'Google',
name: 'generic_x86_arm',
type: 'ios',
attTrackingStatus: 3,
},
library: {
name: 'RudderLabs JavaScript SDK',
version: '1.0.0',
},
locale: 'en-US',
os: {
name: 'iOS',
version: '14.4.1',
},
screen: {
density: 2,
},
externalId: [
{
type: 'ga4AppInstanceId',
id: 'f0dd99v4f979fb997ce453373900f891',
},
],
userAgent:
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',
},
type: 'track',
event: 'Order Completed',
properties: {
brands: ['brand01', 'brand02'],
products: [
{
product_id: '123',
price: '14',
quantity: 1,
},
{
product_id: '124',
price: 14,
quantity: 3,
},
],
category: 'shoes',
item_category: 'glass'
},
integrations: {
All: true,
},
sentAt: '2022-04-22T10:57:58Z',
},
destination: {
DestinationDefinition: {
Config: {
cdkV2Enabled: false,
},
},
Config: {
apiKey: 'dummyApiKey',
pixelId: 'dummyPixelId',
appId: 'dhfeih44f',
snapAppId: 'hfhdhfd',
},
},
metadata: {
jobId: 31,
destinationId: 'd2',
workspaceId: 'w2',
},
},
],
method: 'POST',
},
},
output: {
response: {
status: 200,
body: [
{
metadata: {
jobId: 31,
destinationId: 'd2',
workspaceId: 'w2',
},
output: {
version: '1',
type: 'REST',
method: 'POST',
endpoint: 'https://tr.snapchat.com/v2/conversion',
headers: {
Authorization: 'Bearer dummyApiKey',
'Content-Type': 'application/json',
},
params: {},
body: {
JSON: {
event_type: 'PURCHASE',
item_ids: ['123', '124'],
brands: ['brand01', 'brand02'],
item_category: "glass",
price: '56',
hashed_email: '73062d872926c2a556f17b36f50e328ddf9bff9d403939bd14b6c3b7f5a33fc2',
hashed_phone_number:
'bc77d64d7045fe44795ed926df37231a0cfb6ec6b74588c512790e9f143cc492',
hashed_mobile_ad_id:
'f9779d734aaee50f16ee0011260bae7048f1d9a128c62b6a661077875701edd2',
hashed_idfv: '54bd0b26a3d39dad90f5149db49b9fd9ba885f8e35d1d94cae69273f5e657b9f',
user_agent:
'mozilla/5.0 (macintosh; intel mac os x 10_15_2) applewebkit/537.36 (khtml, like gecko) chrome/79.0.3945.88 safari/537.36',
timestamp: '1650625078',
event_conversion_type: 'MOBILE_APP',
snap_app_id: 'hfhdhfd',
app_id: 'dhfeih44f',
},
JSON_ARRAY: {},
XML: {},
FORM: {},
},
files: {},
userId: '',
},
statusCode: 200,
},
],
},
},
}
].map((tc) => ({
...tc,
mockFns: (_) => {
Expand Down
Loading