added load users and groups query

GMOD · Jul 6, 2019 · e412c53 · e412c53
1 parent dabd4af
commit e412c53
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/grails-app/controllers/org/bbop/apollo/GroupController.groovy b/grails-app/controllers/org/bbop/apollo/GroupController.groovy
@@ -95,13 +95,28 @@ class GroupController {
                 }
             }
 
+            def groupTrackPermissions = GroupTrackPermission.findAllByGroupInList(filteredGroups)
+            def groupTrackPermissionMap = [:]
+            groupTrackPermissions.each {
+                if(!groupTrackPermissionMap.containsKey(it.group.id)){
+                    groupTrackPermissionMap.put(it.group.id,[])
+                }
+                List trackMap = groupTrackPermissionMap.get(it.group.id)
+                trackMap.add(it.trackVisibilities)
+            }
+
+
             filteredGroups.each {
                 def groupObject = new JSONObject()
                 groupObject.id = it.id
                 groupObject.name = it.name
                 groupObject.public = it.isPublicGroup()
                 groupObject.numberOfUsers = it.users?.size()
 
+                if(groupTrackPermissionMap.containsKey(groupObject.id)){
+                    groupObject.trackPermissions = groupTrackPermissionMap.get(groupObject.id).toString()
+                }
+
                 JSONArray userArray = new JSONArray()
                 it.users.each { user ->
                     JSONObject userObject = new JSONObject()

diff --git a/grails-app/controllers/org/bbop/apollo/UserController.groovy b/grails-app/controllers/org/bbop/apollo/UserController.groovy
@@ -136,6 +136,16 @@ class UserController {
                 a.id <=> b.id
             }.size()
 
+            def userTrackPermissions = UserTrackPermission.findAllByUserInList(users)
+            def userTrackPermissionMap = [:]
+            userTrackPermissions.each {
+                if(!userTrackPermissionMap.containsKey(it.user.id)){
+                    userTrackPermissionMap.put(it.user.id,[])
+                }
+                List trackMap = userTrackPermissionMap.get(it.user.id)
+                trackMap.add(it.trackVisibilities)
+            }
+
             users.each {
                 def userObject = new JSONObject()
 
@@ -146,7 +156,9 @@ class UserController {
                 userObject.inactive = it.inactive ?: false
                 Role role = userService.getHighestRole(it)
                 userObject.role = role?.name
-
+                if(userTrackPermissionMap.containsKey(userObject.userId)){
+                    userObject.trackPermissions = userTrackPermissionMap.get(userObject.userId).toString()
+                }
 
                 JSONArray groupsArray = new JSONArray()
                 List<String> groupsForUser = new ArrayList<>()