Merge pull request #140 from imcaizheng/team-service-include-members-and-invites

Return invites and members property for teams

Author: maxceem

docs/swagger.yaml

@@ -2094,6 +2094,18 @@ components:
           type: string
           example: "1212"
           description: "The team name."
+        invites:
+          type: array
+          items:
+            type: object
+          description: "The invites of the project"
+          example: [{"createdAt": "2021-02-08T09:21:00.885Z", "createdBy": 40159127, "deletedBy": null, "email": null, "id": 3008, "projectId": 16819, "role": "customer", "status": "pending", "updatedAt": "2021-02-08T09:21:00.885Z", "updatedBy": 40159127, "userId": 40153913}]
+        members:
+          type: array
+          items:
+            type: object
+          description: "The members of the project"
+          example: [{"lastName": "L_NAME", "role": "customer", "updatedBy": 21926562, "handle": "Tester123", "userId": 21926562, "deletedBy": null, "createdAt": "2021-01-12T10:58:26.237Z", "firstName": "F_NAME", "createdBy": 21926562, "isPrimary": false, "id": 13833, "projectId": 16893, "email": "[email protected]", "updatedAt": "2021-01-12T10:58:26.237Z"}]
         startDate:
           type: string
           format: date-time
@@ -2177,6 +2189,18 @@ components:
           type: string
           example: "1212"
           description: "The team name."
+        invites:
+          type: array
+          items:
+            type: object
+          description: "The invites of the project"
+          example: [{"createdAt": "2021-02-08T09:21:00.885Z", "createdBy": 40159127, "deletedBy": null, "email": null, "id": 3008, "projectId": 16819, "role": "customer", "status": "pending", "updatedAt": "2021-02-08T09:21:00.885Z", "updatedBy": 40159127, "userId": 40153913}]
+        members:
+          type: array
+          items:
+            type: object
+          description: "The members of the project"
+          example: [{"lastName": "L_NAME", "role": "customer", "updatedBy": 21926562, "handle": "Tester123", "userId": 21926562, "deletedBy": null, "createdAt": "2021-01-12T10:58:26.237Z", "firstName": "F_NAME", "createdBy": 21926562, "isPrimary": false, "id": 13833, "projectId": 16893, "email": "[email protected]", "updatedAt": "2021-01-12T10:58:26.237Z"}]
         startDate:
           type: string
           format: date-time

src/common/helper.js

@@ -686,7 +686,7 @@ async function getProjects (currentUser, criteria = {}) {
     .set('Accept', 'application/json')
   localLogger.debug({ context: 'getProjects', message: `response body: ${JSON.stringify(res.body)}` })
   const result = _.map(res.body, item => {
-    return _.pick(item, ['id', 'name'])
+    return _.pick(item, ['id', 'name', 'invites', 'members'])
   })
   return {
     total: Number(_.get(res.headers, 'x-total')),
@@ -816,7 +816,7 @@ async function getProjectById (currentUser, id) {
       .set('Content-Type', 'application/json')
       .set('Accept', 'application/json')
     localLogger.debug({ context: 'getProjectById', message: `response body: ${JSON.stringify(res.body)}` })
-    return _.pick(res.body, ['id', 'name'])
+    return _.pick(res.body, ['id', 'name', 'invites', 'members'])
   } catch (err) {
     if (err.status === HttpStatus.FORBIDDEN) {
       throw new errors.ForbiddenError(`You are not allowed to access the project with id ${id}`)