updated to add/remove universal member to groups

Author: Dushyant Bhalgami

src/controllers/GroupMembershipController.js

@@ -25,21 +25,12 @@ async function getGroupMembers(req, res) {
  * @param res the response
  */
 async function addGroupMember(req, res) {
-  if(req.body.universalUID) {
-    const result = await service.addUniversalMember(
-      req.authUser.isMachine ? 'M2M' : req.authUser,
-      req.params.groupId,
-      req.body
-    )
-    res.send(result)  
-  } else {
-    const result = await service.addGroupMember(
-      req.authUser.isMachine ? 'M2M' : req.authUser,
-      req.params.groupId,
-      req.body
-    )
-    res.send(result)
-  }
+  const result = await service.addGroupMember(
+    req.authUser.isMachine ? 'M2M' : req.authUser,
+    req.params.groupId,
+    req.body
+  )
+  res.send(result)
 }
 
 /**
@@ -65,7 +56,8 @@ async function deleteGroupMember(req, res) {
   const result = await service.deleteGroupMember(
     req.authUser.isMachine ? 'M2M' : req.authUser,
     req.params.groupId,
-    req.params.memberId
+    req.params.memberId ? req.params.memberId : null,
+    Object.keys(req.query).length !== 0 ? req.query : null
   )
   res.send(result)
 }
@@ -80,13 +72,36 @@ async function getGroupMembersCount(req, res) {
   res.send(result)
 }
 
+/**
+ * Get list of mapping of groups and members count
+ * @param req the request
+ * @param res the response
+ */
+async function listGroupsMemberCount(req, res) {
+  const result = await service.listGroupsMemberCount(req.query)
+  res.send(result)
+}
+
 /**
  * Get group members
  * @param req the request
  * @param res the response
  */
 async function getMemberGroups(req, res) {
-  const result = await service.getMemberGroups(req.authUser.isMachine ? 'M2M' : req.authUser, req.params.memberId)
+  const result = await service.getMemberGroups(req.authUser.isMachine ? 'M2M' : req.authUser, req.params.memberId, {})
+  helper.setResHeaders(req, res, result)
+  res.send(result)
+}
+
+/**
+ * Get group members
+ * @param req the request
+ * @param res the response
+ */
+async function searchMemberGroups(req, res) {
+  console.log('sssss')
+  console.log(JSON.stringify(req.query))
+  const result = await service.getMemberGroups(req.authUser.isMachine ? 'M2M' : req.authUser, {}, req.query)
   helper.setResHeaders(req, res, result)
   res.send(result)
 }
@@ -97,5 +112,7 @@ module.exports = {
   getGroupMember,
   deleteGroupMember,
   getGroupMembersCount,
-  getMemberGroups
+  listGroupsMemberCount,
+  getMemberGroups,
+  searchMemberGroups
 }

src/routes.js

@@ -73,6 +73,13 @@ module.exports = {
       auth: 'jwt',
       access: [constants.UserRoles.Admin, constants.UserRoles.User],
       scopes: ['write:groups', 'all:groups']
+    },
+    delete: {
+      controller: 'GroupMembershipController',
+      method: 'deleteGroupMember',
+      auth: 'jwt',
+      access: [constants.UserRoles.Admin],
+      scopes: ['write:groups', 'all:groups']
     }
   },
   '/groups/:groupId/members/:memberId': {
@@ -97,6 +104,12 @@ module.exports = {
       method: 'getGroupMembersCount'
     }
   },
+  '/groupsMemberCount': {
+    get: {
+      controller: 'GroupMembershipController',
+      method: 'listGroupsMemberCount'
+    }
+  },
   '/groups/memberGroups/:memberId': {
     get: {
       controller: 'GroupMembershipController',
@@ -106,6 +119,15 @@ module.exports = {
       scopes: ['read:groups']
     }
   },
+  '/groups/memberGroups/': {
+    get: {
+      controller: 'GroupMembershipController',
+      method: 'searchMemberGroups',
+      auth: 'jwt',
+      access: [constants.UserRoles.Admin, constants.UserRoles.User],
+      scopes: ['read:groups']
+    }
+  },
   '/health': {
     get: {
       controller: 'HealthController',