Merge branch 'dev' into issue-431

Author: maxceem

README.md

@@ -215,6 +215,7 @@ To be able to change and test `taas-es-processor` locally you can follow the nex
 | `npm run services:up`                                                                                                     | Start services via docker-compose for local development.                                                                                           |
 | `npm run services:down`                                                                                                   | Stop services via docker-compose for local development.                                                                                            |
 | `npm run services:logs -- -f <service_name>`                                                                              | View logs of some service inside docker-compose.                                                                                                   |
+| `npm run services:rebuild -- -f <service_name>`                                                                           | Rebuild service container ignoring cache (useful when pushed something to the Git repository of service)                                           |
 | `npm run local:init`                                                                                                      | Recreate Database and Elasticsearch indexes and populate demo data for local development (removes any existent data).                              |
 | `npm run local:reset`                                                                                                     | Recreate Database and Elasticsearch indexes (removes any existent data).                                                                           |
 | `npm run cov`                                                                                                             | Code Coverage Report.                                                                                                                              |
@@ -337,6 +338,6 @@ When we add, update or delete models and/or endpoints we have to make sure that
   - Test, that when we migrate DB from the previous state using `npm run migrate`, we get exactly the same DB schema as if we create DB from scratch using command `npm run init-db force`.
 
 ## EMSI mapping
-mapping EMSI tags to topcoder skills    
-Run `npm run emsi-mapping` to create the mapping file    
+mapping EMSI tags to topcoder skills
+Run `npm run emsi-mapping` to create the mapping file
 It will take about 15 minutes to create the mapping file `script/emsi-mapping/emsi-skils-mapping.js`

docs/Topcoder-bookings-api.postman_collection.json

@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "9d8bfd2b-8864-49fd-8c6e-4cff10095cc3",
+		"_postman_id": "8ead1433-9679-46de-9baa-d27d59106673"
 		"name": "Topcoder-bookings-api",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -15486,7 +15486,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.daysWorked\\\" must be less than or equal to 5\")\r",
+									"    pm.expect(response.message).to.eq(\"\\\"data.daysWorked\\\" must be less than or equal to 10\")\r",
 									"});"
 								],
 								"type": "text/javascript"
@@ -15504,55 +15504,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"daysWorked\": 6\r\n}",
-							"options": {
-								"raw": {
-									"language": "json"
-								}
-							}
-						},
-						"url": {
-							"raw": "{{URL}}/work-periods/{{workPeriodId-1}}",
-							"host": [
-								"{{URL}}"
-							],
-							"path": [
-								"work-periods",
-								"{{workPeriodId-1}}"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "patch work period with invalid parameter 4",
-					"event": [
-						{
-							"listen": "test",
-							"script": {
-								"exec": [
-									"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(\"Maximum allowed daysWorked is (4)\")\r",
-									"});"
-								],
-								"type": "text/javascript"
-							}
-						}
-					],
-					"request": {
-						"method": "PATCH",
-						"header": [
-							{
-								"key": "Authorization",
-								"type": "text",
-								"value": "Bearer {{token_bookingManager}}"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\r\n    \"daysWorked\": 5\r\n}",
+							"raw": "{\r\n    \"daysWorked\": 11\r\n}",
 							"options": {
 								"raw": {
 									"language": "json"
@@ -16508,7 +16460,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(\"\\\"workPeriodPayment.days\\\" must be less than or equal to 5\")\r",
+									"    pm.expect(response.message).to.eq(\"\\\"workPeriodPayment.days\\\" must be less than or equal to 10\")\r",
 									"});"
 								],
 								"type": "text/javascript"
@@ -16526,7 +16478,7 @@
 						],
 						"body": {
 							"mode": "raw",
-							"raw": "{\r\n    \"workPeriodId\": \"{{workPeriodId-3}}\",\r\n    \"days\": 6\r\n}",
+							"raw": "{\r\n    \"workPeriodId\": \"{{workPeriodId-3}}\",\r\n    \"days\": 11\r\n}",
 							"options": {
 								"raw": {
 									"language": "json"

docs/swagger.yaml

@@ -3947,7 +3947,7 @@ components:
               "job-closed",
               "offered",
               "withdrawn",
-              "withdrawn-prescreen"
+              "withdrawn-prescreen",
             ]
           description: "The job candidate status."
         externalId:
@@ -4049,7 +4049,26 @@ components:
           type: array
           items:
             type: string
-            enum: ["open", "placed", "selected", "client rejected - screening", "client rejected - interview", "rejected - other", "cancelled", "interview", "topcoder-rejected", "applied", "rejected-pre-screen", "skills-test", "phone-screen", "job-closed", "offered", "withdrawn", "withdrawn-prescreen"]
+            enum:
+              [
+                "open",
+                "placed",
+                "selected",
+                "client rejected - screening",
+                "client rejected - interview",
+                "rejected - other",
+                "cancelled",
+                "interview",
+                "topcoder-rejected",
+                "applied",
+                "rejected-pre-screen",
+                "skills-test",
+                "phone-screen",
+                "job-closed",
+                "offered",
+                "withdrawn",
+                "withdrawn-prescreen",
+              ]
             description: "The array of job Candidates status"
     JobCandidateRequestBody:
       required:
@@ -4085,7 +4104,7 @@ components:
               "job-closed",
               "offered",
               "withdrawn",
-              "withdrawn-prescreen"
+              "withdrawn-prescreen",
             ]
           description: "The job candidate status."
           default: open
@@ -4123,7 +4142,7 @@ components:
               "job-closed",
               "offered",
               "withdrawn",
-              "withdrawn-prescreen"
+              "withdrawn-prescreen",
             ]
         externalId:
           type: string
@@ -4644,7 +4663,7 @@ components:
         daysWorked:
           type: integer
           minimum: 0
-          maximum: 5
+          maximum: 10
           example: 2
           description: "The count of the days worked for that work period."
         daysPaid:
@@ -4696,6 +4715,8 @@ components:
       properties:
         daysWorked:
           type: integer
+          minimum: 0
+          maximum: 10
           example: 2
           description: "The count of the days worked for that work period."
     WorkPeriodPayment:
@@ -5299,7 +5320,7 @@ components:
                     "job-closed",
                     "offered",
                     "withdrawn",
-                    "withdrawn-prescreen"
+                    "withdrawn-prescreen",
                   ]
                 description: "The job candidate status."
               skills:
@@ -5896,5 +5917,3 @@ components:
       properties:
         message:
           type: string
-
-

package.json

@@ -25,6 +25,7 @@
     "services:up": "docker-compose -f ./local/docker-compose.yml --env-file .env up -d",
     "services:down": "docker-compose -f ./local/docker-compose.yml down",
     "services:logs": "docker-compose -f ./local/docker-compose.yml logs",
+    "services:rebuild": "docker-compose -f ./local/docker-compose.yml build --no-cache",
     "local:init": "npm run local:reset && npm run data:import -- --force",
     "local:reset": "npm run delete-index -- --force || true && npm run create-index -- --force && npm run init-db force",
     "cov": "nyc --reporter=html --reporter=text npm run test",

scripts/recruit-crm-job-import/README.md

@@ -16,6 +16,7 @@ By default the script creates jobs and resource bookings via `TC_API`.
 Follow the README for Taas API to deploy Taas API locally and then point the script to the local API by running:
 
 ``` bash
+export RCRM_IMPORT_CONFIG_NAMESAPCE=RCRM_IMPORT_
 export RCRM_IMPORT_TAAS_API_URL=http://localhost:3000/api/v5
 node scripts/recruit-crm-job-import scripts/recruit-crm-job-import/example_data.csv | tee /tmp/report.txt
 ```
@@ -27,38 +28,42 @@ DEBUG: processing line #1 - {"directProjectId":"24568","projectId":"(dynamic loa
 WARN: #1 - externalId is missing
 DEBUG: processed line #1
 DEBUG: processing line #2 - {"directProjectId":"24568","projectId":"(dynamic load)","externalId":"0","title":"taas-demo-job5","startDate":"10/26/2020","endDate":"01/29/2021","numPositions":"2","userHandle":"not_found_handle","jobid":"(dynamic load)","customerRate":"20","memberRate":"10","_lnum":2}
-ERROR: #2 - handle: not_found_handle user not found
+ERROR: #2 - id: 51ce2216-0dee-4dcf-bf7d-79f862e8d63c job created; handle: not_found_handle user not found
 DEBUG: processed line #2
 DEBUG: processing line #3 - {"directProjectId":"24568","projectId":"(dynamic load)","externalId":"0","title":"taas-demo-job5","startDate":"10/26/2020","endDate":"01/29/2021","numPositions":"2","userHandle":"nkumartest","jobid":"(dynamic load)","customerRate":"20","memberRate":"10","_lnum":3}
 DEBUG: userHandle: nkumartest userId: 57646ff9-1cd3-4d3c-88ba-eb09a395366c
-DEBUG: resourceBookingId: dc8b23d4-9987-4a7d-a587-2056283223de status: assigned
-INFO: #3 - id: 7c8ed989-35bf-4899-9c93-708630a7c63b job already exists; id: dc8b23d4-9987-4a7d-a587-2056283223de resource booking created; id: dc8b23d4-9987-4a7d-a587-2056283223de status: assigned resource booking updated
+INFO: #3 - id: 51ce2216-0dee-4dcf-bf7d-79f862e8d63c externalId: 0 job already exists; id: d49d2fbd-ba11-49dc-8eaa-5afafa7e993f resource booking created
 DEBUG: processed line #3
 DEBUG: processing line #4 - {"directProjectId":"24567","projectId":"(dynamic load)","externalId":"1212","title":"Dummy Description","startDate":"10/20/2020","endDate":"01/29/2021","numPositions":"2","userHandle":"pshah_manager","jobid":"(dynamic load)","customerRate":"150","memberRate":"100","_lnum":4}
 DEBUG: userHandle: pshah_manager userId: a55fe1bc-1754-45fa-9adc-cf3d6d7c377a
-DEBUG: resourceBookingId: 708469fb-ead0-4fc3-bef7-1ef4dd041428 status: assigned
-INFO: #4 - id: f61da880-5295-40c2-b6db-21e6cdef93f9 job created; id: 708469fb-ead0-4fc3-bef7-1ef4dd041428 resource booking created; id: 708469fb-ead0-4fc3-bef7-1ef4dd041428 status: assigned resource booking updated
+INFO: #4 - id: e0267551-24fe-48b5-9605-719852901de2 job created; id: f6285f03-056d-446f-a69b-6d275a97d68a resource booking created
 DEBUG: processed line #4
 DEBUG: processing line #5 - {"directProjectId":"24566","projectId":"(dynamic load)","externalId":"23850272","title":"33fromzaps330","startDate":"02/21/2021","endDate":"03/15/2021","numPositions":"7","userHandle":"nkumar2","jobid":"(dynamic load)","customerRate":"50","memberRate":"30","_lnum":5}
 DEBUG: userHandle: nkumar2 userId: 4b00d029-c87b-47b2-bfe2-0ab80d8b5774
-DEBUG: resourceBookingId: 7870c30b-e511-48f2-8687-499ab116174f status: assigned
-INFO: #5 - id: 72dc0399-5e4b-4783-9a27-ea07a4ce99a7 job created; id: 7870c30b-e511-48f2-8687-499ab116174f resource booking created; id: 7870c30b-e511-48f2-8687-499ab116174f status: assigned resource booking updated
+INFO: #5 - id: cd94784c-432d-4c46-b860-04a89e7b1099 job created; id: 98604c13-c6f3-4203-b74f-db376e9f02e4 resource booking created
 DEBUG: processed line #5
 DEBUG: processing line #6 - {"directProjectId":"24565","projectId":"(dynamic load)","externalId":"23843365","title":"Designer","startDate":"02/24/2021","endDate":"03/30/2021","numPositions":"1","userHandle":"GunaK-TopCoder","jobid":"(dynamic load)","customerRate":"70","memberRate":"70","_lnum":6}
 DEBUG: userHandle: GunaK-TopCoder userId: 2bba34d5-20e4-46d6-bfc1-05736b17afbb
-DEBUG: resourceBookingId: b2e705d3-6864-4697-96bb-dc2a288755bc status: assigned
-INFO: #6 - id: 7ff0737e-958c-494e-8a5a-592ac1c5d4ff job created; id: b2e705d3-6864-4697-96bb-dc2a288755bc resource booking created; id: b2e705d3-6864-4697-96bb-dc2a288755bc status: assigned resource booking updated
+INFO: #6 - id: 49883150-59c2-4e5b-b5c3-aaf6d11d0da2 job created; id: 5505b6b5-050c-421c-893f-b862b1a08092 resource booking created
 DEBUG: processed line #6
 DEBUG: processing line #7 - {"directProjectId":"24564","projectId":"(dynamic load)","externalId":"23836459","title":"demo-dev-19janV4","startDate":"01/20/2021","endDate":"01/30/2021","numPositions":"1","userHandle":"nkumar1","jobid":"(dynamic load)","customerRate":"400","memberRate":"200","_lnum":7}
 DEBUG: userHandle: nkumar1 userId: ab19a53b-0607-4a99-8bdd-f3b0cb552293
-DEBUG: resourceBookingId: 04299b4c-3f6e-4b3e-ae57-bf8232408cf9 status: assigned
-INFO: #7 - id: 73301ade-40ff-4103-bd50-37b8d2a98183 job created; id: 04299b4c-3f6e-4b3e-ae57-bf8232408cf9 resource booking created; id: 04299b4c-3f6e-4b3e-ae57-bf8232408cf9 status: assigned resource booking updated
+INFO: #7 - id: b03dc641-d6be-4a15-9c86-ef38f0e20c28 job created; id: 8e332107-453b-4ec5-b934-902c829e73a2 resource booking created
 DEBUG: processed line #7
 INFO: === summary ===
 INFO: total: 7
 INFO: success: 5
 INFO: failure: 1
 INFO: skips: 1
+INFO: jobs created: 5
+INFO: resource bookings created: 5
+INFO: jobs already exist: 1
+INFO: resource bookings already exist: 0
+INFO: validation errors: 0
+INFO: user not found: 1
+INFO: external id missing: 1
+INFO: request error: 0
+INFO: internal error: 0
 INFO: === summary ===
 INFO: done!
 ```

scripts/recruit-crm-job-import/helper.js

@@ -54,15 +54,15 @@ async function getJobByExternalId (externalId) {
  * Update the status of a resource booking.
  *
  * @param {String} resourceBookingId the resource booking id
- * @param {String} status the status for the resource booking
+ * @param {Object} data the data to update
  * @returns {Object} the result
  */
-async function updateResourceBookingStatus (resourceBookingId, status) {
+async function updateResourceBooking (resourceBookingId, data) {
   const token = await getM2MToken()
   const { body: resourceBooking } = await request.patch(`${config.TAAS_API_URL}/resourceBookings/${resourceBookingId}`)
     .set('Authorization', `Bearer ${token}`)
     .set('Content-Type', 'application/json')
-    .send({ status })
+    .send(data)
   return resourceBooking
 }
 
@@ -139,7 +139,7 @@ module.exports = {
   getPathnameFromCommandline: commonHelper.getPathnameFromCommandline,
   createJob,
   getJobByExternalId,
-  updateResourceBookingStatus,
+  updateResourceBooking,
   getResourceBookingByJobIdAndUserId,
   createResourceBooking,
   getUserByHandle,