Changed configuration variables approach by including the base url in each service's url.

Author: architectt1

README.md

@@ -19,12 +19,11 @@ To override default settings please add them to a file `./config/local.js`:
 - `RABBITMQ.DELAY_DURATION`: Amount of delay before reposting unclaimed project
 - `RABBITMQ.NOTIFICATIONS_EXCHANGE_NAME`: the notification RabbitMQ's topic exchange name
 - `LOGENTRIES_TOKEN`: the Logentries token generated from https://logentries.com/
-- `API_BASE_URL`: the base url to the API server to get project/user info
-- `API_URL_PROJECTS`: `API_BASE_URL` path accessed by this project
-- `API_URL_MEMBERS`: `API_BASE_URL` path accessed by this project
-- `API_URL_USERS`: `API_BASE_URL` path accessed by this project
-- `API_URL_AUTHORIZATIONS`: `API_BASE_URL` path accessed by this project
-- `API_URL_TOPICS`: `API_BASE_URL` path accessed by this project
+- `API_URL_PROJECTS`: the projects service url
+- `API_URL_MEMBERS`: `API_BASE_URL` the members service url
+- `API_URL_USERS`: `API_BASE_URL` the users service url
+- `API_URL_AUTHORIZATIONS`: `API_BASE_URL` the authorizations service url
+- `API_URL_TOPICS`: `API_BASE_URL` the topics service url
 - `DISABLE_DELAY_EXCHANGE`: Disable exchage type delay and use 'direct' instead(Note: after changing this delete existing delay exchange )
 - `TC_SLACK_WEBHOOK_URL`: slack webhook url
 - `SLACK_ICON_URL`: slack webhook icon url

config/default.js

@@ -31,15 +31,12 @@ module.exports = {
   // Token is generated from https://logentries.com/
   LOGENTRIES_TOKEN: '',
 
-  // The base url to the project/user API server
-  API_BASE_URL: 'http://localhost:3001',
-
-  // The different paths of API_BASE_URL accessed by this project
-  API_URL_PROJECTS: '/v4/projects',
-  API_URL_MEMBERS: '/v3/members',
-  API_URL_USERS: '/v3/users',
-  API_URL_AUTHORIZATIONS: '/v3/authorizations',
-  API_URL_TOPICS: '/v5/topics',
+  // The different services used by this project
+  API_URL_PROJECTS: 'http://localhost:3001/v4/projects',
+  API_URL_MEMBERS: 'http://localhost:3001/v3/members',
+  API_URL_USERS: 'http://localhost:3001/v3/users',
+  API_URL_AUTHORIZATIONS: 'http://localhost:3001/v3/authorizations',
+  API_URL_TOPICS: 'http://localhost:3001/v5/topics',
 
   // Disable delay exchange and use direct instead ( delete existing delay exchnge after changing)
   DISABLE_DELAY_EXCHANGE: false,

config/development.json

@@ -8,5 +8,9 @@
     "DELAYED_NOTIFICATIONS_EXCHANGE_NAME": "dev.connect-notifications-reminders"
   },
 
-  "API_BASE_URL": "http://api.topcoder-dev.com"
+  "API_URL_PROJECTS": "http://api.topcoder-dev.com/v4/projects",
+  "API_URL_MEMBERS": "http://api.topcoder-dev.com/v3/members",
+  "API_URL_USERS": "http://api.topcoder-dev.com/v3/users",
+  "API_URL_AUTHORIZATIONS": "http://api.topcoder-dev.com/v3/authorizations",
+  "API_URL_TOPICS": "http://api.topcoder-dev.com/v5/topics"
 }

config/production.json

@@ -11,5 +11,9 @@
   "SLACK_CHANNEL_COPILOTS": "#connect-copilots",
   "SLACK_CHANNEL_NPS": "#customer-experience",
 
-  "API_BASE_URL": "http://api.topcoder.com"
+  "API_URL_PROJECTS": "http://api.topcoder.com/v4/projects",
+  "API_URL_MEMBERS": "http://api.topcoder.com/v3/members",
+  "API_URL_USERS": "http://api.topcoder.com/v3/users",
+  "API_URL_AUTHORIZATIONS": "http://api.topcoder.com/v3/authorizations",
+  "API_URL_TOPICS": "http://api.topcoder.com/v5/topics"
 }

config/test.js

@@ -22,7 +22,11 @@ module.exports = {
     DELAY_DURATION: 0,
   },
   TC_SLACK_WEBHOOK_URL: 'http://localhost:3001/slack',
-  API_BASE_URL: 'http://localhost:3001',
+  API_URL_PROJECTS: 'http://localhost:3001/v4/projects',
+  API_URL_MEMBERS: 'http://localhost:3001/v3/members',
+  API_URL_USERS: 'http://localhost:3001/v3/users',
+  API_URL_AUTHORIZATIONS: 'http://localhost:3001/v3/authorizations',
+  API_URL_TOPICS: 'http://localhost:3001/v5/topics',
   AUTH0_URL: process.env.DEV_AUTH0_URL || '',
   AUTH0_AUDIENCE: process.env.DEV_AUTH0_AUDIENCE || '',
   TOKEN_CACHE_TIME: process.env.DEV_TOKEN_CACHE_TIME || 86400000,

src/handlers/util.js

@@ -60,7 +60,7 @@ const createProjectDiscourseNotification = Promise.coroutine(
         return Promise.reject(new Error('Error retrieving system token'));
       }
       const options = {
-        url: `${config.get('API_BASE_URL')}${config.get('API_URL_TOPICS')}/create`,
+        url: `${config.get('API_URL_TOPICS')}/create`,
         method: 'POST',
         headers: {
           Authorization: `Bearer ${token}`,
@@ -138,7 +138,7 @@ function* getProjectById(id) {
     return Promise.reject(new Error('Error retrieving system token'));
   }
   return yield requestPromise({
-    url: `${config.get('API_BASE_URL')}${config.get('API_URL_PROJECTS')}/${id}`,
+    url: `${config.get('API_URL_PROJECTS')}/${id}`,
     headers: {
       Authorization: `Bearer ${token}`,
     },
@@ -159,7 +159,7 @@ function* getUserById(id) { // eslint-disable-line require-yield
     }
     return reject(new Error('user not found'));
   };
-  return requestPromise({ url: `${config.get('API_BASE_URL')}${config.get('API_URL_MEMBERS')}/_search/?query=userId:${id}` }, cb);
+  return requestPromise({ url: `${config.get('API_URL_MEMBERS')}/_search/?query=userId:${id}` }, cb);
 }
 
 

src/test/app.test.js

@@ -172,33 +172,33 @@ describe('app', () => {
     // Stub the calls to API server
     stub = sinon.stub(request, 'get');
     const stubArgs = {
-      url: `${config.API_BASE_URL}${config.API_URL_PROJECTS}/1`,
+      url: `${config.API_URL_PROJECTS}/1`,
     };
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 200 }, sampleProjects.project1);
 
-    stubArgs.url = `${config.API_BASE_URL}${config.API_URL_PROJECTS}/1000`;
+    stubArgs.url = `${config.API_URL_PROJECTS}/1000`;
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 404 });
 
-    stubArgs.url = `${config.API_BASE_URL}${config.API_URL_MEMBERS}/_search/?query=userId:1`;
+    stubArgs.url = `${config.API_URL_MEMBERS}/_search/?query=userId:1`;
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 200 }, sampleUsers.user1);
 
-    stubArgs.url = `${config.API_BASE_URL}${config.API_URL_USERS}/1000`;
+    stubArgs.url = `${config.API_URL_USERS}/1000`;
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 404 });
 
-    stubArgs.url = `${config.API_BASE_URL}${config.API_URL_MEMBERS}/_search/?query=userId:40051331`;
+    stubArgs.url = `${config.API_URL_MEMBERS}/_search/?query=userId:40051331`;
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 200 }, sampleUsers.user1);
 
-    stubArgs.url = `${config.API_BASE_URL}${config.API_URL_MEMBERS}/_search/?query=userId:50051333`;
+    stubArgs.url = `${config.API_URL_MEMBERS}/_search/?query=userId:50051333`;
     stub.withArgs(sinon.match.has('url', stubArgs.url))
       .yields(null, { statusCode: 200 }, sampleUsers.user1);
 
     postStub = sinon.stub(request, 'post');
-    postStub.withArgs(sinon.match.has('url', `${config.API_BASE_URL}${config.API_URL_AUTHORIZATIONS}/`))
+    postStub.withArgs(sinon.match.has('url', `${config.API_URL_AUTHORIZATIONS}/`))
       .yields(null, { statusCode: 200 }, sampleAuth);
 
     postStub.withArgs(sinon.match.has('url', config.TC_SLACK_WEBHOOK_URL))
@@ -256,7 +256,7 @@ describe('app', () => {
       const callbackCount = 1;
       request.get.restore();
       stub = sinon.stub(request, 'get');
-      stub.withArgs(sinon.match.has('url', `${config.API_BASE_URL}${config.API_URL_MEMBERS}/_search/?query=userId:8547900`))
+      stub.withArgs(sinon.match.has('url', `${config.API_URL_MEMBERS}/_search/?query=userId:8547900`))
         .yields(null, { statusCode: 200 }, sampleUsers.user1);
 
       sendTestEvent(sampleEvents.updatedInReview, 'project.updated');
@@ -285,7 +285,7 @@ describe('app', () => {
     it('should create `Project.Reviewed` and `Project.AvailableToClaim` and copilot slack notifications and repost after delay till TTL', (done) => {
       request.get.restore();
       stub = sinon.stub(request, 'get');
-      stub.withArgs(sinon.match.has('url', `${config.API_BASE_URL}${config.API_URL_PROJECTS}/1`))
+      stub.withArgs(sinon.match.has('url', `${config.API_URL_PROJECTS}/1`))
         .yields(null, { statusCode: 200 }, sampleProjects.projectTest);
 
       let assertCount = 0;
@@ -372,9 +372,9 @@ describe('app', () => {
     it('should create `Project.Member.CopilotJoined` notification and slack copilot joined notification', (done) => {
       request.get.restore();
       stub = sinon.stub(request, 'get');
-      stub.withArgs(sinon.match.has('url', `${config.API_BASE_URL}${config.API_URL_PROJECTS}/1`))
+      stub.withArgs(sinon.match.has('url', `${config.API_URL_PROJECTS}/1`))
         .yields(null, { statusCode: 200 }, sampleProjects.projectTest);
-      stub.withArgs(sinon.match.has('url', `${config.API_BASE_URL}${config.API_URL_MEMBERS}/_search/?query=userId:40051331`))
+      stub.withArgs(sinon.match.has('url', `${config.API_URL_MEMBERS}/_search/?query=userId:40051331`))
         .yields(null, { statusCode: 200 }, sampleUsers.user1);
 
       sendTestEvent(sampleEvents.memberAddedCopilot, 'project.member.added');