return resource booking id and user id for the taas-teams endpoints

Author: imcaizheng

docs/swagger.yaml

@@ -2038,7 +2038,7 @@ components:
           type: array
           description: "The rosources that are assigned"
           items:
-            $ref: '#/components/schemas/User'
+            $ref: '#/components/schemas/ResourceUserInfo'
     User:
       properties:
         id:
@@ -2062,6 +2062,33 @@ components:
           type: string
           example: 'J'
           description: 'The last name of user'
+    ResourceUserInfo:
+      properties:
+        id:
+          type: string
+          format: uuid
+          description: "The resource booking id."
+        userId:
+          type: string
+          format: uuid
+          description: "The user id."
+        handle:
+          type: string
+          example: "Tony"
+          description: "The project id."
+        photo_url:
+          type: string
+          format: url
+          example: "https://topcoder-dev-media.s3.amazonaws.com/member/profile/TonyJ-1604301092491.jpeg"
+          description: "The user avatar."
+        firstName:
+                type: string
+                example: 'Tony'
+                description: 'The first name of user'
+        lastName:
+          type: string
+          example: 'J'
+          description: 'The last name of user'
     TeamDetail:
       properties:
         id:
@@ -2092,7 +2119,7 @@ components:
           description: "The rosources that are assigned"
           items:
             allOf: 
-             - $ref: '#/components/schemas/User'
+             - $ref: '#/components/schemas/ResourceUserInfo'
             type: object
             properties:
               customerRate:

src/services/TeamService.js

@@ -139,27 +139,29 @@ async function getTeamDetail (currentUser, projects, isSearch = true) {
         }
       }
 
-      const usersPromises = []
-      _.map(rbs, (rb) => {
-        usersPromises.push(
-          helper.getUserById(rb.userId, true)
+      const resourceInfos = await Promise.all(
+        _.map(rbs, (rb) => {
+          return helper.getUserById(rb.userId, true)
             .then(user => {
+              const resource = {
+                id: rb.id,
+                userId: user.id,
+                ..._.pick(user, ['handle', 'firstName', 'lastName'])
+              }
               // If call function is not search, add jobId field
               if (!isSearch) {
-                user.jobId = rb.jobId
-                user.customerRate = rb.customerRate
-                user.startDate = rb.startDate
-                user.endDate = rb.endDate
+                resource.jobId = rb.jobId
+                resource.customerRate = rb.customerRate
+                resource.startDate = rb.startDate
+                resource.endDate = rb.endDate
               }
-              return user
+              return resource
             })
-        )
-      })
-      const userInfos = await Promise.all(usersPromises)
-      if (userInfos && userInfos.length > 0) {
-        res.resources = userInfos
+        }))
+      if (resourceInfos && resourceInfos.length > 0) {
+        res.resources = resourceInfos
 
-        const userHandles = _.map(userInfos, 'handle')
+        const userHandles = _.map(resourceInfos, 'handle')
         // Get user photo from /v5/members
         const members = await helper.getMembers(userHandles)