fix: return billing account id as interger

ref issue #620

Author: maxceem

docs/permissions.html

@@ -375,6 +375,43 @@ <h2 class="anchor-container">
               </div>
             </div>
           </div>
+        <div class="row">
+          <div class="col pt-5 pb-2">
+            <h2 class="anchor-container">
+              <a href="#section-project-billing accounts" name="section-project-billing accounts" class="anchor"></a>Project Billing Accounts
+            </h2>
+          </div>
+        </div>
+          <div class="row border-top">
+            <div class="col py-2">
+              <div class="permission-title anchor-container">
+                <a href="#READ_AVL_PROJECT_BILLING_ACCOUNTS" name="READ_AVL_PROJECT_BILLING_ACCOUNTS" class="anchor"></a>Read Available Project Billing Accounts
+              </div>
+              <div class="permission-variable"><small><code>READ_AVL_PROJECT_BILLING_ACCOUNTS</code></small></div>
+              <div class="text-black-50 small-text">Who can view the Billing Accounts available for the project</div>
+            </div>
+            <div class="col-9 py-2">
+              <div>
+                    <span class="badge badge-primary" title="Allowed Project Role">manager</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">account_manager</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">program_manager</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">account_executive</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">solution_architect</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">project_manager</span>
+                    <span class="badge badge-primary" title="Allowed Project Role">copilot</span>
+              </div>
+
+              <div>
+                    <span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
+                    <span class="badge badge-success" title="Allowed Topcoder Role">administrator</span>
+              </div>
+
+              <div>
+                  <span class="badge badge-dark" title="Allowed Topcoder Role">all:connect_project</span>
+                  <span class="badge badge-dark" title="Allowed Topcoder Role"></span>
+              </div>
+            </div>
+          </div>
         <div class="row">
           <div class="col pt-5 pb-2">
             <h2 class="anchor-container">

src/routes/billingAccounts/list.spec.js

@@ -13,13 +13,13 @@ chai.should();
 // demo data which might be returned by the `SalesforceService.query`
 const billingAccountsData = [
   {
-    sfBillingAccountId: 123,
+    sfBillingAccountId: '123',
     tcBillingAccountId: 123123,
     name: 'Billing Account 1',
     startDate: '2021-02-10T18:51:27Z',
     endDate: '2021-03-10T18:51:27Z',
   }, {
-    sfBillingAccountId: 456,
+    sfBillingAccountId: '456',
     tcBillingAccountId: 456456,
     name: 'Billing Account 2',
     startDate: '2011-02-10T18:51:27Z',

src/services/salesforceService.js

@@ -4,6 +4,7 @@
 import _ from 'lodash';
 import config from 'config';
 import jwt from 'jsonwebtoken';
+import util from '../util';
 
 const axios = require('axios');
 
@@ -64,7 +65,11 @@ class SalesforceService {
       }
       const billingAccounts = _.get(res, 'data.records', []).map(o => ({
         sfBillingAccountId: _.get(o, 'Topcoder_Billing_Account__r.Id'),
-        tcBillingAccountId: _.get(o, 'Topcoder_Billing_Account__r.TopCoder_Billing_Account_Id__c'),
+        tcBillingAccountId: util.parseIntStrinctly(
+          _.get(o, 'Topcoder_Billing_Account__r.TopCoder_Billing_Account_Id__c'),
+          10,
+          null, // fallback to null if cannot parse
+        ),
         name: _.get(o, 'Topcoder_Billing_Account__r.Billing_Account_Name__c'),
         startDate: _.get(o, 'Topcoder_Billing_Account__r.Start_Date__c'),
         endDate: _.get(o, 'Topcoder_Billing_Account__r.End_Date__c'),

src/util.js

@@ -1473,6 +1473,34 @@ const projectServiceUtils = {
     });
   },
 
+  /**
+   * Parse integer value inside string or return fallback value.
+   * Unlike original parseInt, this method parses the whole string
+   * and fails if there are non-integer characters inside the string.
+   *
+   * @param {String} str           number to parse
+   * @param {Number} radix       radix of the number to parse
+   * @param {Any}    fallbackValue value to return if we cannot parse successfully
+   *
+   * @returns {Number} parsed number
+   */
+  parseIntStrictly: (str, radix, fallbackValue) => {
+    const int = parseInt(str, radix);
+
+    if (_.isNaN(int)) {
+      return fallbackValue;
+    }
+
+    // if we parsed only the part of value and it's not the same as intial value
+    // example: "12x" => 12 which is not the same as initial value "12x", which means
+    // we cannot parse the full value sucessfully and treat it like we cannot parse at all
+    if (int.toString() !== str) {
+      return fallbackValue;
+    }
+
+    return int;
+  },
+
 };
 
 _.assignIn(util, projectServiceUtils);

src/util.spec.js

@@ -1,12 +1,38 @@
 /**
  * Tests for util.js
  */
-import chai from 'chai';
+import chai, { expect } from 'chai';
 import util from './util';
 
 chai.should();
 
 describe('Util method', () => {
+  describe('parseIntStrictly', () => {
+    it('should parse a good integer value sucessfully', () => {
+      util.parseIntStrictly('1234567890', 10, null).should.equal(1234567890);
+    });
+
+    it('should return fallback value if the initial value is a float number', () => {
+      expect(util.parseIntStrictly('1.1', 10, null)).be.equal(null);
+    });
+
+    it('should return fallback value if string can be parsed partially only', () => {
+      expect(util.parseIntStrictly('123XXX', 10, null)).be.equal(null);
+    });
+
+    it('should return fallback value if the initial value is `null`', () => {
+      util.parseIntStrictly(null, 10, 0).should.equal(0);
+    });
+
+    it('should return fallback value if the initial value is `undefined`', () => {
+      expect(util.parseIntStrictly(undefined, 10, null)).be.equal(null);
+    });
+
+    it('should return fallback value if the initial value is `""` (emtpy string)', () => {
+      expect(util.parseIntStrictly('', 10, null)).be.equal(null);
+    });
+  });
+
   describe('maskEmail', () => {
     it('should return the original value if the email is non-string', () => {
       chai.should().not.exist(util.maskEmail(null));