Merge pull request #385 from topcoder-platform/dev

urwithat · web-flow · commit 49acb15623e0 · 2021-06-24T14:09:47.000+05:30
TaaS Intake - v2.02
diff --git a/app-routes.js b/app-routes.js
@@ -59,6 +59,36 @@ module.exports = (app) => {
             next()
           }
         })
+      } else {
+        // public API, but still try to authenticate token if provided, but allow missing/invalid token
+        actions.push((req, res, next) => {
+          const interceptRes = {}
+          interceptRes.status = () => interceptRes
+          interceptRes.json = () => interceptRes
+          interceptRes.send = () => next()
+          authenticator(_.pick(config, ['AUTH_SECRET', 'VALID_ISSUERS']))(req, interceptRes, next)
+        })
+
+        actions.push((req, res, next) => {
+          if (!req.authUser) {
+            next()
+          } else if (req.authUser.isMachine) {
+            if (!def.scopes || !req.authUser.scopes || !helper.checkIfExists(def.scopes, req.authUser.scopes)) {
+              req.authUser = undefined
+            }
+            next()
+          } else {
+            req.authUser.jwtToken = req.headers.authorization
+            // check if user has full manage permission
+            if (_.intersection(req.authUser.roles, constants.FullManagePermissionRoles).length) {
+              req.authUser.hasManagePermission = true
+            }
+            if (_.includes(req.authUser.roles, constants.UserRoles.ConnectManager)) {
+              req.authUser.isConnectManager = true
+            }
+            next()
+          }
+        })
       }
 
       actions.push(method)
diff --git a/data/demo-data.json b/data/demo-data.json
@@ -7646,10 +7646,10 @@
             "name": "Angular Developer",
             "description": "* Writes tested and documented JavaScript, HTML and CSS\n* Makes design and technical decisions for AngularJS projects\n* Develops application code and unit test in the AngularJS, Rest Web Services and Java technologies",
             "listOfSkills": [
-                "database",
-                "winforms",
-                "user interface (ui)",
-                "photoshop"
+                "Database",
+                "Winforms",
+                "User Interface (Ui)",
+                "Photoshop"
             ],
             "rates": [
                 {
@@ -7678,10 +7678,10 @@
             "name": "Dev Ops Engineer",
             "description": "* Introduces processes, tools, and methodologies\n* Balances needs throughout the software development life cycle\n* Configures server images, optimizes task performance in correspondence with engineers",
             "listOfSkills": [
-                "dropwizard",
-                "nginx",
-                "machine learning",
-                "force.com"
+                "Dropwizard",
+                "NGINX",
+                "Machine Learning",
+                "Force.com"
             ],
             "rates": [
                 {
@@ -7722,10 +7722,10 @@
             "name": "Salesforce Developer",
             "description": "* Meets with project managers to determine CRM needs\n* Develops customized solutions within the Salesforce platform\n* Designs, codes, and implements Salesforce applications\n* Creates timelines and development goals\n* Tests the stability and functionality of the application\n* Troubleshoots and fixes bugs\n* Writes documents and provides technical training for Salesforce Staff\n* Maintains the security and integrity of the application software",
             "listOfSkills": [
-                "docker",
-                ".net",
+                "Docker",
+                ".NET",
                 "appcelerator",
-                "flux"
+                "Flux"
             ],
             "rates": [
                 {
diff --git a/docs/Topcoder-bookings-api.postman_collection.json b/docs/Topcoder-bookings-api.postman_collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "6f274c86-24a5-412e-95e6-fafa34e2a936",
+		"_postman_id": "15f10b58-dda5-4aaf-96e5-061a5c901717",
 		"name": "Topcoder-bookings-api",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -18153,16 +18153,14 @@
 							"response": []
 						},
 						{
-							"name": "send request with invalid token",
+							"name": "send request with public",
 							"event": [
 								{
 									"listen": "test",
 									"script": {
 										"exec": [
-											"pm.test('Status code is 401', function () {\r",
-											"    pm.response.to.have.status(401);\r",
-											"    const response = pm.response.json()\r",
-											"    pm.expect(response.message).to.eq(\"Invalid Token.\")\r",
+											"pm.test('Status code is 200', function () {\r",
+											"    pm.response.to.have.status(200);\r",
 											"});"
 										],
 										"type": "text/javascript"
@@ -18171,16 +18169,10 @@
 							],
 							"request": {
 								"method": "POST",
-								"header": [
-									{
-										"key": "Authorization",
-										"value": "Bearer invalid_token",
-										"type": "text"
-									}
-								],
+								"header": [],
 								"body": {
 									"mode": "raw",
-									"raw": "{\r\n    \"jobDescription\": \"Should have these skills: Machine Learning, Dropwizard, NGINX, appcelerator\"\r\n}",
+									"raw": "{\r\n    \"jobDescription\": \"Should have these skills: Machine Learning, Dropwizard, NGINX, appcelerator, C#\"\r\n}",
 									"options": {
 										"raw": {
 											"language": "json"
@@ -18210,7 +18202,7 @@
 											"pm.test('Status code is 400', function () {\r",
 											"    pm.response.to.have.status(400);\r",
 											"    const response = pm.response.json()\r",
-											"    pm.expect(response.message).to.eq(\"\\\"data\\\" must have at least 1 key\")\r",
+											"    pm.expect(response.message).to.eq(\"\\\"data\\\" must contain at least one of [roleId, jobDescription, skills]\")\r",
 											"});"
 										],
 										"type": "text/javascript"
@@ -19211,71 +19203,7 @@
 							],
 							"request": {
 								"method": "POST",
-								"header": [
-									{
-										"key": "Authorization",
-										"type": "text",
-										"value": "Bearer {{token_administrator}}"
-									},
-									{
-										"key": "Content-Type",
-										"type": "text",
-										"value": "application/json"
-									}
-								],
-								"body": {
-									"mode": "raw",
-									"raw": "{   \"description\": \"Description  A global leading healthcare company is seeking a strong Databricks Engineer to join their development team as they build their new Databricks workspace. Development efforts will contribute to the migration of data from Hadoop to Databricks to prepare data for visualization. Candidate must be well-versed in Databricks components and best practices, be an excellent problem solver and be comfortable working in a fast-moving, rapidly changing, and dynamic environment via Agile, SCRUM, and DevOps.  PREFERRED QUALIFICATIONS:      2+ years of Azure Data Stack experience: Azure Data Services using ADF, ADLS, Databricks with PySpark, Azure DevOps & Azure Key Vault.     Strong knowledge of various data warehousing methodologies and data modeling concepts.     Hands-on experience using Azure, Azure data lake, Azure functions & Databricks      Minimum 2-3+ years of Python experience (PySpark)     Design & Develop Azure native solutions for Data Platform     Minimum 3+ years of experience using Big Data ecosystem (Cloudera/Hortonworks) using Oozie, Hive, Impala, and Spark     Expert in SQL and performance tuning\" }",
-									"options": {
-										"raw": {
-											"language": "json"
-										}
-									}
-								},
-								"url": {
-									"raw": "{{URL}}/taas-teams/getSkillsByJobDescription",
-									"host": [
-										"{{URL}}"
-									],
-									"path": [
-										"taas-teams",
-										"getSkillsByJobDescription"
-									]
-								}
-							},
-							"response": []
-						},
-						{
-							"name": "get skills by invalid token",
-							"event": [
-								{
-									"listen": "test",
-									"script": {
-										"exec": [
-											"pm.test('Status code is 401', function () {\r",
-											"    pm.response.to.have.status(401);\r",
-											"    const response = pm.response.json()\r",
-											"    pm.expect(response.message).to.eq(\"Invalid Token.\")\r",
-											"});"
-										],
-										"type": "text/javascript"
-									}
-								}
-							],
-							"request": {
-								"method": "POST",
-								"header": [
-									{
-										"key": "Authorization",
-										"type": "text",
-										"value": "Bearer invalid_token"
-									},
-									{
-										"key": "Content-Type",
-										"type": "text",
-										"value": "application/json"
-									}
-								],
+								"header": [],
 								"body": {
 									"mode": "raw",
 									"raw": "{   \"description\": \"Description  A global leading healthcare company is seeking a strong Databricks Engineer to join their development team as they build their new Databricks workspace. Development efforts will contribute to the migration of data from Hadoop to Databricks to prepare data for visualization. Candidate must be well-versed in Databricks components and best practices, be an excellent problem solver and be comfortable working in a fast-moving, rapidly changing, and dynamic environment via Agile, SCRUM, and DevOps.  PREFERRED QUALIFICATIONS:      2+ years of Azure Data Stack experience: Azure Data Services using ADF, ADLS, Databricks with PySpark, Azure DevOps & Azure Key Vault.     Strong knowledge of various data warehousing methodologies and data modeling concepts.     Hands-on experience using Azure, Azure data lake, Azure functions & Databricks      Minimum 2-3+ years of Python experience (PySpark)     Design & Develop Azure native solutions for Data Platform     Minimum 3+ years of experience using Big Data ecosystem (Cloudera/Hortonworks) using Oozie, Hive, Impala, and Spark     Expert in SQL and performance tuning\" }",
@@ -19317,18 +19245,7 @@
 							],
 							"request": {
 								"method": "POST",
-								"header": [
-									{
-										"key": "Authorization",
-										"type": "text",
-										"value": "Bearer {{token_administrator}}"
-									},
-									{
-										"key": "Content-Type",
-										"type": "text",
-										"value": "application/json"
-									}
-								],
+								"header": [],
 								"body": {
 									"mode": "raw",
 									"raw": "{   \"description\": \"\" }",
@@ -19370,18 +19287,7 @@
 							],
 							"request": {
 								"method": "POST",
-								"header": [
-									{
-										"key": "Authorization",
-										"type": "text",
-										"value": "Bearer {{token_administrator}}"
-									},
-									{
-										"key": "Content-Type",
-										"type": "text",
-										"value": "application/json"
-									}
-								],
+								"header": [],
 								"body": {
 									"mode": "raw",
 									"raw": "{}",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -5249,6 +5249,9 @@ components:
             jobDescription:
               type: string
               description: "The description of the job."
+            jobTitle:
+              type: string
+              description: "An optional job title."
         - type: object
           required:
             - skills
@@ -5281,6 +5284,10 @@ components:
               format: float
               description: "Rate at which searched skills match the given role"
               example: 0.75
+            jobTitle:
+              type: string
+              description: "Optional job title."
+              example: "Lead Application Developer"
     SubmitTeamRequestBody:
       properties:
         teamName:
diff --git a/migrations/2021-06-22-role-search-request-add-job-title.js b/migrations/2021-06-22-role-search-request-add-job-title.js
@@ -0,0 +1,18 @@
+const config = require('config')
+
+/**
+ * Add jobTitle field to the RoleSearchRequest model.
+ */
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn({ tableName: 'role_search_requests', schema: config.DB_SCHEMA_NAME }, 'job_title',
+    {
+      type: Sequelize.STRING(100),
+      allowNull: true
+    })
+  },
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn({ tableName: 'role_search_requests', schema: config.DB_SCHEMA_NAME}, 'job_title')
+  }
+}
diff --git a/src/common/helper.js b/src/common/helper.js
@@ -1960,8 +1960,8 @@ function removeTextFormatting (text) {
   // Remove footnotes
   text = _.replace(text, /\[\^.+?\](: .*?$)?/g, ' ')
   text = _.replace(text, /\s{0,2}\[.*?\]: .*?$/g, ' ')
-  // Remove images
-  text = _.replace(text, /!\[(.*?)\][[(].*?[\])]/g, ' $1 ')
+  // Remove images and keep description unless it is default description "image"
+  text = _.replace(text, /!(\[((?!image).*?)\]|\[.*?\])[[(].*?[\])]/g, ' $2 ')
   // Remove inline links
   text = _.replace(text, /\[(.*?)\][[(].*?[\])]/g, ' $1 ')
   // Remove blockquotes
diff --git a/src/controllers/TeamController.js b/src/controllers/TeamController.js
@@ -114,7 +114,7 @@ async function getMe (req, res) {
  * @param res the response
  */
 async function getSkillsByJobDescription (req, res) {
-  res.send(await service.getSkillsByJobDescription(req.authUser, req.body))
+  res.send(await service.getSkillsByJobDescription(req.body))
 }
 
 /**
diff --git a/src/models/RoleSearchRequest.js b/src/models/RoleSearchRequest.js
@@ -62,6 +62,11 @@ module.exports = (sequelize) => {
           type: Sequelize.UUID
         })
       },
+      jobTitle: {
+        field: 'job_title',
+        type: Sequelize.STRING(100),
+        allowNull: true
+      },
       createdBy: {
         field: 'created_by',
         type: Sequelize.UUID,
diff --git a/src/routes/TeamRoutes.js b/src/routes/TeamRoutes.js
@@ -23,7 +23,7 @@ module.exports = {
   '/taas-teams/skills': {
     get: {
       controller: 'TeamController',
-      method: 'searchSkills',
+      method: 'searchSkills'
     }
   },
   '/taas-teams/me': {
@@ -37,9 +37,7 @@ module.exports = {
   '/taas-teams/getSkillsByJobDescription': {
     post: {
       controller: 'TeamController',
-      method: 'getSkillsByJobDescription',
-      auth: 'jwt',
-      scopes: [constants.Scopes.READ_TAAS_TEAM]
+      method: 'getSkillsByJobDescription'
     }
   },
   '/taas-teams/:id': {
@@ -91,7 +89,7 @@ module.exports = {
   '/taas-teams/sendRoleSearchRequest': {
     post: {
       controller: 'TeamController',
-      method: 'roleSearchRequest',
+      method: 'roleSearchRequest'
     }
   },
   '/taas-teams/submitTeamRequest': {
diff --git a/src/services/PaymentSchedulerService.js b/src/services/PaymentSchedulerService.js
@@ -90,7 +90,7 @@ async function processPayment (workPeriodPayment) {
     const oldValue = workPeriodPayment.toJSON()
     const updated = await workPeriodPayment.update({ status: 'in-progress' })
     // Update the modified status to es
-    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue })
+    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue, key: `workPeriodPayment.billingAccountId:${updated.billingAccountId}` })
   }
   // Check whether the number of processed records per minute exceeds the specified number, if it exceeds, wait for the next minute before processing
   await checkWait(PaymentSchedulerStatus.START_PROCESS)
@@ -115,7 +115,7 @@ async function processPayment (workPeriodPayment) {
     // 5. update wp and save  it should only update already existent Work Period Payment record with created "challengeId" and "status=completed".
     const updated = await workPeriodPayment.update({ challengeId: paymentScheduler.challengeId, status: 'completed' })
     // Update the modified status to es
-    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue })
+    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue, key: `workPeriodPayment.billingAccountId:${updated.billingAccountId}` })
 
     await paymentScheduler.update({ step: PaymentSchedulerStatus.CLOSE_CHALLENGE, userId: paymentScheduler.userId, status: 'completed' })
 
@@ -128,7 +128,7 @@ async function processPayment (workPeriodPayment) {
     // If payment processing failed Work Periods Payment "status" should be changed to "failed" and populate "statusDetails" field with error details in JSON format.
     const updated = await workPeriodPayment.update({ statusDetails, status: 'failed' })
     // Update the modified status to es
-    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue })
+    await postEvent(config.TAAS_WORK_PERIOD_PAYMENT_UPDATE_TOPIC, updated.toJSON(), { oldValue, key: `workPeriodPayment.billingAccountId:${updated.billingAccountId}` })
 
     if (paymentScheduler) {
       await paymentScheduler.update({ step: _.get(err, 'step'), userId: paymentScheduler.userId, status: 'failed' })
diff --git a/src/services/TeamService.js b/src/services/TeamService.js

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ async function getMe (req, res) {`
`114`	`114`	`* @param res the response`
`115`	`115`	`*/`
`116`	`116`	`async function getSkillsByJobDescription (req, res) {`
`117`		`- res.send(await service.getSkillsByJobDescription(req.authUser, req.body))`
	`117`	`+ res.send(await service.getSkillsByJobDescription(req.body))`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/**`