From 03b203ec73601d3ac354666d037927375bf489ec Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Thu, 21 Jul 2022 09:27:34 +1000 Subject: [PATCH 1/3] Add start date and end date to billing account endpoint used by copilots --- src/services/salesforceService.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/services/salesforceService.js b/src/services/salesforceService.js index 183c7c9f..8b0693e3 100644 --- a/src/services/salesforceService.js +++ b/src/services/salesforceService.js @@ -102,7 +102,9 @@ class SalesforceService { null, // fallback to null if cannot parse ), markup: _.get(o, config.get('sfdcBillingAccountMarkupField')), - active: _.get(o, config.get('sfdcBillingAccountActiveField')), + active: _.get(o, config.get('sfdcBillingAccountActiveField')), + startDate: _.get(o, 'Topcoder_Billing_Account__r.Start_Date__c'), + endDate: _.get(o, 'Topcoder_Billing_Account__r.End_Date__c'), })); return billingAccounts.length > 0 ? billingAccounts[0] : {}; }); From bf97c4ffbcb98ceca8f1edae3c0acf393536ecb5 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 22 Jul 2022 13:39:11 +1000 Subject: [PATCH 2/3] Fix lint complaint --- src/services/salesforceService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/salesforceService.js b/src/services/salesforceService.js index 8b0693e3..9842edae 100644 --- a/src/services/salesforceService.js +++ b/src/services/salesforceService.js @@ -102,7 +102,7 @@ class SalesforceService { null, // fallback to null if cannot parse ), markup: _.get(o, config.get('sfdcBillingAccountMarkupField')), - active: _.get(o, config.get('sfdcBillingAccountActiveField')), + active: _.get(o, config.get('sfdcBillingAccountActiveField')), startDate: _.get(o, 'Topcoder_Billing_Account__r.Start_Date__c'), endDate: _.get(o, 'Topcoder_Billing_Account__r.End_Date__c'), })); From 7000c2a407f449a4a8374218c5de3e9328e17a41 Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Fri, 22 Jul 2022 14:42:05 +1000 Subject: [PATCH 3/3] Add the required fields to the initial SQL query --- src/routes/billingAccounts/get.js | 2 +- src/services/salesforceService.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/billingAccounts/get.js b/src/routes/billingAccounts/get.js index f5171f5e..76b75c4b 100644 --- a/src/routes/billingAccounts/get.js +++ b/src/routes/billingAccounts/get.js @@ -42,7 +42,7 @@ module.exports = [ } const { accessToken, instanceUrl } = await SalesforceService.authenticate(); // eslint-disable-next-line - const sql = `SELECT TopCoder_Billing_Account_Id__c, Mark_Up__c, Active__c from Topcoder_Billing_Account__c tba where TopCoder_Billing_Account_Id__c='${billingAccountId}'`; + const sql = `SELECT TopCoder_Billing_Account_Id__c, Mark_Up__c, Active__c, Start_Date__c, End_Date__c from Topcoder_Billing_Account__c tba where TopCoder_Billing_Account_Id__c='${billingAccountId}'`; req.log.debug(sql); const billingAccount = await SalesforceService.queryBillingAccount(sql, accessToken, instanceUrl, req.log); const isMachineToken = _.get(req, 'authUser.isMachine', false); diff --git a/src/services/salesforceService.js b/src/services/salesforceService.js index 9842edae..92890ad7 100644 --- a/src/services/salesforceService.js +++ b/src/services/salesforceService.js @@ -103,8 +103,8 @@ class SalesforceService { ), markup: _.get(o, config.get('sfdcBillingAccountMarkupField')), active: _.get(o, config.get('sfdcBillingAccountActiveField')), - startDate: _.get(o, 'Topcoder_Billing_Account__r.Start_Date__c'), - endDate: _.get(o, 'Topcoder_Billing_Account__r.End_Date__c'), + startDate: _.get(o, 'Start_Date__c'), + endDate: _.get(o, 'End_Date__c'), })); return billingAccounts.length > 0 ? billingAccounts[0] : {}; });