Merge pull request #639 from topcoder-platform/develop

[PROD] Prod Release Draft

Author: vikasrohit

config/default.json

@@ -82,5 +82,6 @@
     "CLIENT_AUDIENCE": "",
     "SUBJECT": "",
     "CLIENT_ID": ""
-  }
+  },
+  "sfdcBillingAccountNameField": "Billing_Account_Name__c"
 }

config/development.json

@@ -7,5 +7,6 @@
   "connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
   "memberServiceEndpoint": "https://api.topcoder-dev.com/v3/members",
   "identityServiceEndpoint": "https://api.topcoder-dev.com/v3/",
-  "taasJobApiUrl": "https://api.topcoder-dev.com/v5/jobs"
+  "taasJobApiUrl": "https://api.topcoder-dev.com/v5/jobs",
+  "sfdcBillingAccountNameField": "Billing_Account_Name__c"
 }

config/production.json

@@ -1,4 +1,5 @@
 {
   "authDomain": "topcoder.com",
-  "connectProjectsUrl": "https://connect.topcoder.com/projects/"
+  "connectProjectsUrl": "https://connect.topcoder.com/projects/",
+  "sfdcBillingAccountNameField": "Billing_Account_name__c"
 }

src/routes/projects/create.js

@@ -29,7 +29,7 @@ const createProjectValidations = {
   body: Joi.object().keys({
     name: Joi.string().required(),
     description: Joi.string().allow(null).allow('').optional(),
-    billingAccountId: Joi.number().positive(),
+    billingAccountId: Joi.number().positive().allow(null),
     utm: Joi.object().keys({
       source: Joi.string().allow(null),
       medium: Joi.string().allow(null),

src/routes/projects/update.js

@@ -41,7 +41,7 @@ const updateProjectValdiations = {
     id: Joi.number().valid(Joi.ref('$params.id')),
     name: Joi.string(),
     description: Joi.string().allow(null).allow('').optional(),
-    billingAccountId: Joi.number().positive(),
+    billingAccountId: Joi.number().positive().allow(null),
     directProjectId: Joi.number().positive().allow(null),
     status: Joi.any().valid(_.values(PROJECT_STATUS)),
     estimatedPrice: Joi.number().precision(2).positive().allow(null),

src/services/salesforceService.js

@@ -70,7 +70,7 @@ class SalesforceService {
           10,
           null, // fallback to null if cannot parse
         ),
-        name: _.get(o, 'Topcoder_Billing_Account__r.Billing_Account_name__c'),
+        name: _.get(o, `Topcoder_Billing_Account__r.${config.get('sfdcBillingAccountNameField')}`),
         startDate: _.get(o, 'Topcoder_Billing_Account__r.Start_Date__c'),
         endDate: _.get(o, 'Topcoder_Billing_Account__r.End_Date__c'),
       }));