Added role names to user-group list

Change-Id: I49cc002072f564179253f8f7eacbfedad4e0d49d

Changes

@@ -22,7 +22,7 @@
 - Disallow scope all for non super clients.
 - Changed memberUsername to member in the new member-role-addition web-service.
 - Removed user-privileges from user-group list response.
-- 
+- Added role names to user-group list
 
 
 # version 0.74.1-SNAPSHOT

src/main/java/de/ids_mannheim/korap/dto/UserGroupMemberDto.java

@@ -1,6 +1,7 @@
 package de.ids_mannheim.korap.dto;
 
 import java.util.List;
+import java.util.Set;
 
 import de.ids_mannheim.korap.constant.PrivilegeType;
 import lombok.Getter;
@@ -17,5 +18,6 @@
 @Getter
 public class UserGroupMemberDto {
     private String userId;
+    private Set<String> roles;
     private List<PrivilegeType> privileges;
 }

src/main/java/de/ids_mannheim/korap/dto/converter/UserGroupConverter.java

@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -43,6 +44,7 @@ public UserGroupDto createUserGroupDto (UserGroup group,
 
                 UserGroupMemberDto memberDto = new UserGroupMemberDto();
                 memberDto.setUserId(member.getUserId());
+                memberDto.setRoles(createUniqueRoles(member.getRoles()));
                 memberDto.setPrivileges(createPrivilegeList(member.getRoles()));
                 memberDtos.add(memberDto);
             }
@@ -55,6 +57,14 @@ public UserGroupDto createUserGroupDto (UserGroup group,
         return dto;
     }
 
+    private Set<String> createUniqueRoles (Set<Role> roles) {
+        Set<String> uniqueRoles = new HashSet<String>();
+        for (Role r : roles) {
+            uniqueRoles.add(r.getName().name());
+        }
+        return uniqueRoles;
+    }
+
     private List<PrivilegeType> createPrivilegeList (Set<Role> roles) {
         List<PrivilegeType> privileges = new ArrayList<>(roles.size());
         for (Role r : roles) {

src/test/java/de/ids_mannheim/korap/web/controller/usergroup/UserGroupListTest.java

@@ -28,6 +28,15 @@ public void testListDoryGroups () throws KustvaktException {
         assertEquals(group.at("/owner").asText(), "dory");
         assertEquals(3, group.at("/members").size());
 
+        assertEquals(group.at("/members/0/userId").asText(), "dory");
+        assertEquals(group.at("/members/0/roles").size(), 1);
+        assertEquals(group.at("/members/0/roles/0").asText(), "GROUP_ADMIN");
+        assertEquals(group.at("/members/0/privileges").size(), 5);
+
+        assertEquals(group.at("/members/1/userId").asText(), "marlin");
+        assertEquals(group.at("/members/1/roles").size(), 1);
+        assertEquals(group.at("/members/1/roles/0").asText(), "GROUP_MEMBER");
+
         testListNemoGroups();
         testListMarlinGroups();