Merge branch 'dev' of https://github.com/appirio-tech/tc-project-service into dev

Author: Parth Shah

.ebextensions/01-environment-variables.config

@@ -53,3 +53,27 @@ option_settings:
   - namespace: aws:elasticbeanstalk:application:environment
     option_name: AWS_SECRET_ACCESS_KEY
     value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_WEB_TO_LEAD_URL
+    value: https://www.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_ORG_ID
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_LEAD_PROJECT_NAME
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_LEAD_PROJECT_DESC
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_LEAD_PROJECT_LINK
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: SALESFORCE_LEAD_PROJECT_ID
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: CONNECT_PROJECTS_URL
+    value: TBD
+  - namespace: aws:elasticbeanstalk:application:environment
+    option_name: USER_SERVICE_URL
+    value: TBD

.gitignore

@@ -6,6 +6,7 @@ config/local.js
 logs
 *.log
 npm-debug.log*
+.DS_Store
 
 dist/
 
@@ -42,3 +43,4 @@ jspm_packages
 !.elasticbeanstalk/config.yml
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
+.DS_Store

.nvmrc

@@ -1 +1 @@
-5.9
+v6.9.4

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:5.10.1
+FROM node:6.9.4
 LABEL version="1.0"
 LABEL description="Projects microservice"
 
@@ -9,6 +9,7 @@ RUN apt-get update && \
 RUN apt-get install -y \
     ssh \
     python \
+    python-dev \
     python-pip
 
 RUN pip install awscli
@@ -23,7 +24,6 @@ COPY . /usr/src/app
 # Install app dependencies
 RUN npm install
 
-
 EXPOSE 3000
 
 CMD ["npm", "start"]

config/custom-environment-variables.json

@@ -14,6 +14,16 @@
   "topicServiceEndpoint": "TOPIC_SERVICE_ENDPOINT",
   "systemUserClientId": "SYSTEM_USER_CLIENT_ID",
   "systemUserClientSecret": "SYSTEM_USER_CLIENT_SECRET",
+  "userServiceUrl": "USER_SERVICE_URL",
+  "connectProjectsUrl": "CONNECT_PROJECTS_URL",
+  "salesforceLead" : {
+    "webToLeadUrl": "SALESFORCE_WEB_TO_LEAD_URL",
+    "orgId" : "SALESFORCE_ORG_ID",
+    "projectNameFieldId": "SALESFORCE_LEAD_PROJECT_NAME",
+    "projectDescFieldId": "SALESFORCE_LEAD_PROJECT_DESC",
+    "projectLinkFieldId": "SALESFORCE_LEAD_PROJECT_LINK",
+    "projectIdFieldId"  : "SALESFORCE_LEAD_PROJECT_ID"
+  },
   "dbConfig": {
     "masterUrl": "DB_MASTER_URL",
     "maxPoolSize": "DB_MAX_POOL_SIZE",

config/default.json

@@ -18,6 +18,16 @@
   "projectAttachmentPathSuffix": "attachments",
   "systemUserClientId": "",
   "systemUserClientSecret": "",
+  "userServiceUrl": "",
+  "connectProjectUrl":"",
+  "salesforceLead" : {
+    "webToLeadUrl": "https://www.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8",
+    "orgId": "",
+    "projectNameFieldId": "",
+    "projectDescFieldId": "",
+    "projectLinkFieldId": "",
+    "projectIdFieldId"  : ""
+  },
   "dbConfig": {
     "masterUrl": "",
     "maxPoolSize": 50,

config/sample.local.js

@@ -13,6 +13,16 @@ if (process.env.NODE_ENV === 'test') {
       "fileServiceEndpoint": "https://api.topcoder-dev.com/v3/files/",
       "topicServiceEndpoint": "https://api.topcoder-dev.com/v4/topics/",
       "directProjectServiceEndpoint": "https://api.topcoder-dev.com/v3/direct",
+      "userServiceUrl": "https://api.topcoder-dev.com/v3/users",
+      "connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
+      "salesforceLead" : {
+        "webToLeadUrl": 'https://www.salesforce.com/servlet/servlet.WebToLead?encoding=UTF-8',
+        "orgId": "00D2C0000000dO6",
+        "projectNameFieldId": "title",
+        "projectDescFieldId": "description",
+        "projectLinkFieldId": "URL",
+        "projectIdFieldId"  : "00N2C000000Vxxx"
+      },
       "dbConfig": {
           "masterUrl": "postgres://coder:mysecretpassword@dockerhost:5432/projectsdb",
           "maxPoolSize": 50,

local/docker-compose.yml

@@ -5,12 +5,12 @@ postgres:
   environment:
     - POSTGRES_PASSWORD=mysecretpassword
     - POSTGRES_USER=coder
-    - POSTGRES_DB=tagsdb
-elasticsearch:
-  image: "elasticsearch:1.5.2"
-  ports:
-    - "9200:9200"
-    - "9300:9300"
+    - POSTGRES_DB=projectsdb
+#elasticsearch:
+#  image: "elasticsearch:2"
+#  ports:
+#    - "9200:9200"
+#    - "9300:9300"
 redis:
   image: redis:2.8
   ports:

package.json

@@ -3,8 +3,11 @@
   "version": "1.1.2",
   "description": "Projects microservice",
   "main": "index.js",
+  "engines": {
+    "node": ">=6.9"
+  },
   "scripts": {
-    "test": "NODE_ENV=test ./node_modules/.bin/mocha --compilers js:babel-core/register $(find src -path '*spec.js*')",
+    "test": "NODE_ENV=test ./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha -- --compilers js:babel-core/register $(find src -path '*spec.js*')",
     "live-test": "NODE_ENV=test ./node_modules/.bin/mocha -w --compilers js:babel-core/register $(find src -path '*spec.js*')",
     "dev": "NODE_ENV=local PORT=8001 nodemon -w src --exec \"babel-node src --presets es2015\" | ./node_modules/.bin/bunyan",
     "build": "babel src -d dist --presets es2015",

src/events/projects/index.js

@@ -3,6 +3,8 @@ import {
   EVENT
 } from '../../constants'
 import util from '../../util'
+import config from 'config'
+import querystring from 'querystring'
 import topicService from '../../services/topicService'
 
 const _addProjectStatus = (req, logger, project) => {
@@ -29,6 +31,41 @@ const _addProjectStatus = (req, logger, project) => {
       return true
     })
 }
+
+/**
+ * Creates a lead in salesforce for the connect project.
+ *
+ * @param token JWT token of the admin user which would be used to fetch user info
+ * @param logger logger to be used for logging
+ * @param project connect project for which lead is to be created
+ *
+ * @return promise which resolves to the HTML content where salesforce web to lead form redirects
+ */
+const _addSalesforceLead = (token, logger, project) => {
+  logger.debug('Getting topcoder user with userId: ', project.createdBy)
+  return util.getTopcoderUser(project.createdBy, token, logger)
+  .then((userInfo) => {
+    var httpClient = util.getHttpClient({id: 2,log : logger})
+    httpClient.defaults.timeout = 3000
+    httpClient.defaults.headers.common['Content-Type'] = 'application/x-www-form-urlencoded'
+    var data = {
+      oid: config.get('salesforceLead.orgId'),
+      first_name: userInfo.firstName,
+      last_name: userInfo.lastName,
+      email: userInfo.email
+    }
+    data[config.get('salesforceLead.projectIdFieldId')] = project.id
+    data[config.get('salesforceLead.projectNameFieldId')] = project.name
+    data[config.get('salesforceLead.projectDescFieldId')] = project.description
+    data[config.get('salesforceLead.projectLinkFieldId')] = config.get('connectProjectsUrl') + project.id
+    var body =  querystring.stringify(data)
+    var webToLeadUrl = config.get('salesforceLead.webToLeadUrl')
+    logger.debug('initiaiting salesforce web to lead call for project: ', project.id)
+    return httpClient.post(webToLeadUrl, body)
+  })
+}
+
+
 /**
  * Handler for project creation event
  * @param  {[type]} logger  logger to log along with trace id
@@ -46,10 +83,13 @@ const projectCreatedHandler = (logger, msg, channel) => {
           authorization: `Bearer ${token}`
         }
       }
-      return _addProjectStatus(req, logger, project)
+      return Promise.all([
+        _addProjectStatus(req, logger, project),
+        _addSalesforceLead(token, logger, project).then((resp)=> logger.debug('web to lead response:', resp.status))
+      ]);
     })
     .then(() => {
-      channel.ack(msg, true)
+      channel.ack(msg)
     })
     .catch(err => {
       // don't requeue for now

src/routes/projectMembers/create.spec.js

@@ -115,6 +115,7 @@ describe('Project Members create', () => {
             resJson.isPrimary.should.be.truthy
             resJson.projectId.should.equal(project2.id)
             resJson.userId.should.equal(1)
+            server.services.pubsub.publish.calledWith('project.member.added').should.be.true
             done()
           })
     })
@@ -138,6 +139,7 @@ describe('Project Members create', () => {
             resJson.isPrimary.should.be.truthy
             resJson.projectId.should.equal(project1.id)
             resJson.userId.should.equal(1)
+            server.services.pubsub.publish.calledWith('project.member.added').should.be.true
             done()
           })
     })
@@ -189,6 +191,7 @@ describe('Project Members create', () => {
         })
       })
       var postSpy = sinon.spy(mockHttpClient, 'post')
+      // var amqPubSpy = sinon.spy(server.services.pubsub, 'publish')
       sandbox.stub(util, 'getHttpClient', () => mockHttpClient )
       request(server)
           .post('/v4/projects/' + project1.id + '/members/')
@@ -209,6 +212,7 @@ describe('Project Members create', () => {
             resJson.projectId.should.equal(project1.id)
             resJson.userId.should.equal(3)
             postSpy.should.have.been.calledOnce
+            server.services.pubsub.publish.calledWith('project.member.added').should.be.true
             done()
           })
     })

src/routes/projectMembers/delete.spec.js

@@ -98,6 +98,13 @@ describe('Project members delete', () => {
             if (err) {
               return done(err)
             }
+            var removedMember = {
+              projectId: project1.id,
+              userId: 40051332,
+              role: 'copilot',
+              isPrimary: true
+            }
+            server.services.pubsub.publish.calledWith('project.member.removed', sinon.match(removedMember)).should.be.true
             done()
             // models.ProjectMember
             //     .count({where: { projectId: project1.id, deletedAt: { $eq: null } }})

src/routes/projectMembers/update.spec.js

@@ -155,7 +155,7 @@ describe('Project members update', () => {
                 })
                 .send({
                     param: {
-                        "role": "copilot"
+                        "role": "customer"
                     }
                 })
                 .expect('Content-Type', /json/)
@@ -166,10 +166,11 @@ describe('Project members update', () => {
                     }
                     const resJson = res.body.result.content
                     should.exist(resJson)
-                    resJson.role.should.equal('copilot')
+                    resJson.role.should.equal('customer')
                     resJson.isPrimary.should.be.true
                     new Date(resJson.updatedAt).valueOf().should.be.equal(new Date(member2.updatedAt).valueOf())
-                    resJson.updatedBy.should.equal(1)
+                    resJson.updatedBy.should.equal(40051332)
+                    server.services.pubsub.publish.calledWith('project.member.updated').should.be.true
                     done()
                 })
 
@@ -195,6 +196,7 @@ describe('Project members update', () => {
                             resJson.role.should.equal(body.param.role)
                             resJson.isPrimary.should.be.false
                             resJson.updatedBy.should.equal(40051332)
+                            server.services.pubsub.publish.calledWith('project.member.updated').should.be.true
                             done()
                         })
                     }
@@ -237,6 +239,7 @@ describe('Project members update', () => {
                     resJson.isPrimary.should.be.false
                     resJson.updatedBy.should.equal(40051332)
                     deleteSpy.should.have.been.calledOnce
+                    server.services.pubsub.publish.calledWith('project.member.removed').should.be.true
                     done()
                 })
         })

src/routes/projects/create.spec.js

@@ -88,6 +88,7 @@ describe('Project create', () => {
           const result = res.body.result
           result.success.should.be.truthy
           result.status.should.equal(201)
+          server.services.pubsub.publish.calledWith('project.draft-created').should.be.true
           done()
         })
     })
@@ -137,6 +138,7 @@ describe('Project create', () => {
           resJson.bookmarks.should.have.lengthOf(1)
           resJson.bookmarks[0].title.should.be.eql('title1')
           resJson.bookmarks[0].address.should.be.eql('address1')
+          server.services.pubsub.publish.calledWith('project.draft-created').should.be.true
           done()
         })
     })

src/routes/projects/delete.spec.js

@@ -93,13 +93,20 @@ describe('Project delete test', () => {
         .expect(403, done)
     })
 
-    it('should return 204 if attachment was successfully removed', done =>  {
+    it('should return 204 if project was successfully removed', done =>  {
       request(server)
         .delete('/v4/projects/' + project1.id)
         .set({
           'Authorization': 'Bearer ' + testUtil.jwts.member
         })
-        .expect(204, done())
+        .expect(204)
+        .end(function(err, resp) {
+          if (err) {
+            return done(err)
+          }
+          server.services.pubsub.publish.calledWith('project.deleted').should.be.true
+          done()
+        })
     })
   })
 })

src/routes/projects/update.spec.js

@@ -161,6 +161,7 @@ describe('Project', () => {
             result.success.should.be.true
             result.status.should.equal(200)
             result.content.status.should.equal('active')
+            server.services.pubsub.publish.calledWith('project.updated').should.be.true
             done()
           })
     })
@@ -181,6 +182,7 @@ describe('Project', () => {
             resJson.name.should.equal('updatedProject name')
             resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
             resJson.updatedBy.should.equal(40051332)
+            server.services.pubsub.publish.calledWith('project.updated').should.be.true
             done()
           })
     })
@@ -251,6 +253,7 @@ describe('Project', () => {
             resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
             resJson.updatedBy.should.equal(40051332)
             postSpy.should.have.been.calledOnce
+            server.services.pubsub.publish.calledWith('project.updated').should.be.true
             done()
           })
     })
@@ -274,6 +277,7 @@ describe('Project', () => {
             should.exist(resJson)
             resJson.billingAccountId.should.equal(1)
             resJson.billingAccountId.should.equal(1)
+            server.services.pubsub.publish.calledWith('project.updated').should.be.true
             done()
           })
     })
@@ -298,6 +302,7 @@ describe('Project', () => {
             resJson.billingAccountId.should.equal(1)
             resJson.updatedAt.should.not.equal("2016-06-30 00:33:07+00")
             resJson.updatedBy.should.equal(40051333)
+            server.services.pubsub.publish.calledWith('project.updated').should.be.true
             done()
           })
     })
@@ -342,6 +347,7 @@ describe('Project', () => {
                       resJson = res.body.result.content
                       should.exist(resJson)
                       should.not.exist(resJson.bookmarks);
+                      server.services.pubsub.publish.calledWith('project.updated').should.be.true
                       done()
                   })
 

src/tests/serviceMocks.js

@@ -13,6 +13,6 @@ module.exports = (app) => {
       index: () => {}
     }
   })
-  sinon.stub(app.services.pubsub, 'publish', ()=>{ return Promise.resolve(true) })
-  sinon.stub(app.services.es, 'index', ()=>{ return Promise.resolve(true) })
+  sinon.stub(app.services.pubsub, 'publish', ()=> Promise.resolve(true) )
+  sinon.stub(app.services.es, 'index', ()=> Promise.resolve(true) )
 }