From 928e85a18b292a7aad306cc1ca878fdaefe6e5e5 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 17 Oct 2017 15:40:31 +0530 Subject: [PATCH 1/9] =?UTF-8?q?Github=20issue#1227,=20Google=20Analytics?= =?UTF-8?q?=20ID=20+=20Click=20ID=20integration=20for=20marketing=20?= =?UTF-8?q?=E2=80=94=20Added=20the=20required=20fields=20to=20salesforce?= =?UTF-8?q?=20lead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle.yml | 2 +- consumer/src/services/ConsumerService.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 763373e..113780c 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ test: deployment: development: - branch: ["dev", "circleci", "test"] + branch: ["dev", "feature/adding-google-analytics-fields", "test"] commands: - ./deploy/eb-deploy.sh tc-connect2sf DEV $CIRCLE_BUILD_NUM production: diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index fd8fc7c..25739f3 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -95,7 +95,9 @@ class ConsumerService { TC_Connect_Project_Status__c: _.get(project,"status",""), Ref_Code__c: _.get(project, "details.utm.code",""), TC_Connect_Direct_Project_Id__c: _.get(project, "directProjectId",""), - TC_Connect_Cancel_Reason__c: _.get(project,"cancelReason","") + TC_Connect_Cancel_Reason__c: _.get(project,"cancelReason",""), + Google_Analytics_Click_ID__c: _.get(project,"details.utm.google._gclid",""), + Google_Analytics_Client_ID__c: _.get(project,"details.utm.google._gacid","") }; return SalesforceService.createObject('Lead', lead, accessToken, instanceUrl) .then((leadId) => { From 0edb1e54f36846a3b1eee563afdfa4e8c4978f40 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 17 Oct 2017 15:51:59 +0530 Subject: [PATCH 2/9] =?UTF-8?q?Github=20issue#1227,=20Google=20Analytics?= =?UTF-8?q?=20ID=20+=20Click=20ID=20integration=20for=20marketing=20?= =?UTF-8?q?=E2=80=94=20Fixing=20unit=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consumer/test/ConsumerService.spec.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/consumer/test/ConsumerService.spec.js b/consumer/test/ConsumerService.spec.js index 62efa31..d39c6dd 100644 --- a/consumer/test/ConsumerService.spec.js +++ b/consumer/test/ConsumerService.spec.js @@ -29,7 +29,11 @@ describe('ConsumerService', () => { id: 1, details: { utm: { - code: "123" + code: "123", + google: { + _gacid: "1234.5678", + _gclid: "5678.1234" + } } }, cancelReason: null, @@ -85,7 +89,9 @@ describe('ConsumerService', () => { TC_Connect_Project_Status__c: '', TC_Connect_Cancel_Reason__c: null, TC_Connect_Direct_Project_Id__c: '', - TC_Connect_Description__c:'' + TC_Connect_Description__c:'', + Google_Analytics_Click_ID__c:'5678.1234', + Google_Analytics_Client_ID__c:'1234.5678' }; const expectedCampaignMember = { From a760a33317fc8f6e0341ee2a85c97f2370f69620 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 17 Oct 2017 16:51:43 +0530 Subject: [PATCH 3/9] logging --- consumer/src/services/ConsumerService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index 25739f3..88d5e71 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -83,6 +83,7 @@ class ConsumerService { const campaignId = responses[0]; const user = responses[1]; const { accessToken, instanceUrl } = responses[2]; + console.log(_.get(project, "details.utm"), "UTM") const lead = { FirstName: user.firstName, LastName: user.lastName, From c2af7096e6fde186dfb4a11b5aebb3ecf2ddd2b2 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Tue, 17 Oct 2017 17:05:13 +0530 Subject: [PATCH 4/9] removed logging --- consumer/src/services/ConsumerService.js | 1 - 1 file changed, 1 deletion(-) diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index 88d5e71..25739f3 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -83,7 +83,6 @@ class ConsumerService { const campaignId = responses[0]; const user = responses[1]; const { accessToken, instanceUrl } = responses[2]; - console.log(_.get(project, "details.utm"), "UTM") const lead = { FirstName: user.firstName, LastName: user.lastName, From c11a53db256fdd6959a3b89347acb32dcb6f9e6e Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 18 Oct 2017 09:55:23 +0530 Subject: [PATCH 5/9] =?UTF-8?q?Github=20issue#1227,=20Google=20Analytics?= =?UTF-8?q?=20ID=20+=20Click=20ID=20integration=20for=20marketing=20?= =?UTF-8?q?=E2=80=94=20Removed=20temporary=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 113780c..3d3f7ad 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ test: deployment: development: - branch: ["dev", "feature/adding-google-analytics-fields", "test"] + branch: ["dev", "test"] commands: - ./deploy/eb-deploy.sh tc-connect2sf DEV $CIRCLE_BUILD_NUM production: From c9fe62600b2fba5bfa862fbb13f1447b83555506 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 18 Oct 2017 10:36:42 +0530 Subject: [PATCH 6/9] =?UTF-8?q?Github=20issue#1227,=20Send=20project=20own?= =?UTF-8?q?er's=20user=20@handle=20to=20SFDC=20project=20lead=20object=20?= =?UTF-8?q?=E2=80=94=20Added=20user=20handle=20to=20the=20lead=E2=80=99s?= =?UTF-8?q?=20custom=20field=20TC=5FHandle=5F=5Fc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle.yml | 2 +- consumer/src/services/ConsumerService.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3d3f7ad..80d9610 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ test: deployment: development: - branch: ["dev", "test"] + branch: ["dev", "feature/adding-user-handle-link", "test"] commands: - ./deploy/eb-deploy.sh tc-connect2sf DEV $CIRCLE_BUILD_NUM production: diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index 25739f3..58aef45 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -90,6 +90,7 @@ class ConsumerService { LeadSource: leadSource, Company: company, OwnerId: config.ownerId, + TC_Handle__c: user.handle, TC_Connect_Project_Id__c: project.id, TC_Connect_Description__c: _.get(project,"description",""), TC_Connect_Project_Status__c: _.get(project,"status",""), From 2044a8a3e2f3496356d8e61fe6f6faa6a32fa3fb Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 18 Oct 2017 10:42:07 +0530 Subject: [PATCH 7/9] Fixing unit test --- consumer/test/ConsumerService.spec.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/consumer/test/ConsumerService.spec.js b/consumer/test/ConsumerService.spec.js index d39c6dd..3483e13 100644 --- a/consumer/test/ConsumerService.spec.js +++ b/consumer/test/ConsumerService.spec.js @@ -18,6 +18,7 @@ describe('ConsumerService', () => { firstName: 'john', lastName: 'doe', email: 'jd@example.com', + handle: 'jdoe' }; const sfAuth = { accessToken: 'fake-token', @@ -84,6 +85,7 @@ describe('ConsumerService', () => { LeadSource: 'Connect', Company: 'Unknown', OwnerId: config.ownerId, + TC_Handle__c: 'jdoe', TC_Connect_Project_Id__c: 1, Ref_Code__c: '123', TC_Connect_Project_Status__c: '', From 972924fca560208aa160b8a3cebd2cbb92a56224 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 18 Oct 2017 11:44:46 +0530 Subject: [PATCH 8/9] logging --- consumer/src/services/ConsumerService.js | 1 + 1 file changed, 1 insertion(+) diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index 58aef45..4074412 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -83,6 +83,7 @@ class ConsumerService { const campaignId = responses[0]; const user = responses[1]; const { accessToken, instanceUrl } = responses[2]; + console.log(user.handle, 'user.handle') const lead = { FirstName: user.firstName, LastName: user.lastName, From b81f910099c9c67f27bbc86ca9669a9c0743c473 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 18 Oct 2017 11:59:07 +0530 Subject: [PATCH 9/9] Removing dev/local changes --- circle.yml | 2 +- consumer/src/services/ConsumerService.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 80d9610..3d3f7ad 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,7 @@ test: deployment: development: - branch: ["dev", "feature/adding-user-handle-link", "test"] + branch: ["dev", "test"] commands: - ./deploy/eb-deploy.sh tc-connect2sf DEV $CIRCLE_BUILD_NUM production: diff --git a/consumer/src/services/ConsumerService.js b/consumer/src/services/ConsumerService.js index 4074412..58aef45 100644 --- a/consumer/src/services/ConsumerService.js +++ b/consumer/src/services/ConsumerService.js @@ -83,7 +83,6 @@ class ConsumerService { const campaignId = responses[0]; const user = responses[1]; const { accessToken, instanceUrl } = responses[2]; - console.log(user.handle, 'user.handle') const lead = { FirstName: user.firstName, LastName: user.lastName,