Merge pull request #71 from topcoder-platform/feature/integration-test-fix

Feature/integration test fix

Author: maxceem

docs/Topcoder-bookings-api.postman_collection.json

@@ -4130,6 +4130,54 @@
 					},
 					"response": []
 				},
+				{
+					"name": "GET /taas-teams with booking manager",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Bearer {{token_bookingManager}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{URL}}/taas-teams?perPage=10&page=1&name=*taas*&sortBy=lastActivityAt&sortOrder=desc",
+							"host": [
+								"{{URL}}"
+							],
+							"path": [
+								"taas-teams"
+							],
+							"query": [
+								{
+									"key": "perPage",
+									"value": "10"
+								},
+								{
+									"key": "page",
+									"value": "1"
+								},
+								{
+									"key": "name",
+									"value": "*taas*",
+									"description": "case-insensitive; support wildcard match"
+								},
+								{
+									"key": "sortBy",
+									"value": "lastActivityAt",
+									"description": "allows: createdAt, updatedAt, lastActivityAt, id, status, name, type, best match"
+								},
+								{
+									"key": "sortOrder",
+									"value": "desc",
+									"description": "allows: asc, desc"
+								}
+							]
+						}
+					},
+					"response": []
+				},
 				{
 					"name": "GET /taas-teams with m2m read",
 					"request": {
@@ -4177,6 +4225,36 @@
 					},
 					"response": []
 				},
+				{
+					"name": "GET /taas-teams/:id with booking manager",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Bearer {{token_bookingManager}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{URL}}/taas-teams/:projectId",
+							"host": [
+								"{{URL}}"
+							],
+							"path": [
+								"taas-teams",
+								":projectId"
+							],
+							"variable": [
+								{
+									"key": "projectId",
+									"value": "16705"
+								}
+							]
+						}
+					},
+					"response": []
+				},
 				{
 					"name": "GET /taas-teams/:id with m2m read",
 					"request": {
@@ -4227,6 +4305,42 @@
 					},
 					"response": []
 				},
+				{
+					"name": "GET /taas-teams/:id/jobs/:jobId with booking manager",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Bearer {{token_bookingManager}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{URL}}/taas-teams/:projectId/jobs/:jobId",
+							"host": [
+								"{{URL}}"
+							],
+							"path": [
+								"taas-teams",
+								":projectId",
+								"jobs",
+								":jobId"
+							],
+							"variable": [
+								{
+									"key": "projectId",
+									"value": "16705"
+								},
+								{
+									"key": "jobId",
+									"value": "948a25a6-086f-4a96-aad5-9ccd2d3e87b2"
+								}
+							]
+						}
+					},
+					"response": []
+				},
 				{
 					"name": "GET /taas-teams/:id/jobs/:jobId with m2m read",
 					"request": {
@@ -6972,4 +7086,4 @@
 		}
 	],
 	"protocolProfileBehavior": {}
-}
+}

src/services/TeamService.js

@@ -38,7 +38,7 @@ async function _getJobsByProjectIds (projectIds) {
  * @returns {Object} the search result, contain total/page/perPage and result array
  */
 async function searchTeams (currentUser, criteria) {
-  if (currentUser.isMachine) {
+  if (currentUser.isBookingManager || currentUser.isMachine) {
     const m2mToken = await helper.getM2Mtoken()
     currentUser.jwtToken = `Bearer ${m2mToken}`
   }
@@ -196,7 +196,7 @@ async function getTeamDetail (currentUser, projects, isSearch = true) {
  * @returns {Object} the team
  */
 async function getTeam (currentUser, id) {
-  if (currentUser.isMachine) {
+  if (currentUser.isBookingManager || currentUser.isMachine) {
     const m2mToken = await helper.getM2Mtoken()
     currentUser.jwtToken = `Bearer ${m2mToken}`
   }
@@ -252,7 +252,7 @@ getTeam.schema = Joi.object().keys({
  * @returns the team job
  */
 async function getTeamJob (currentUser, id, jobId) {
-  if (currentUser.isMachine) {
+  if (currentUser.isBookingManager || currentUser.isMachine) {
     const m2mToken = await helper.getM2Mtoken()
     currentUser.jwtToken = `Bearer ${m2mToken}`
   }
@@ -285,13 +285,7 @@ async function getTeamJob (currentUser, id, jobId) {
     const userHandles = _.map(candidates, 'handle')
     if (userHandles && userHandles.length > 0) {
       // Get user photo from /v5/members
-      let members
-      if (currentUser.isMachine) {
-        const m2mToken = await helper.getTopcoderM2MToken()
-        members = await helper.getMembers(`Bearer ${m2mToken}`, userHandles)
-      } else {
-        members = await helper.getMembers(currentUser.jwtToken, userHandles)
-      }
+      const members = await helper.getMembers(currentUser.jwtToken, userHandles)
 
       for (const item of candidates) {
         item.resumeLink = null