delete roles, move to domainRole field

src/main/java/net/geant/nmaas/portal/api/domain/UserListEntry.java

@@ -30,9 +30,9 @@ public class UserListEntry extends UserBase implements Serializable {
     protected OffsetDateTime lastSuccessfulLoginDate;
     protected OffsetDateTime firstLoginDate;
 
-    protected Set<UserRoleView> roles = new HashSet<>();
     protected String globalRole;
     protected Set<String> domainsName;
+    protected Role domainRole;
 
     public UserListEntry(User user) {
         this.id = user.getId();
@@ -56,7 +56,6 @@ public class UserListEntry extends UserBase implements Serializable {
         this.globalRole = globalRole.map(Enum::name).orElse("");
 
         this.enabled = user.isEnabled();
-        this.roles = user.getRoles().stream().map(r -> new UserRoleView(r.getRole(), r.getDomain().getId(), r.getDomain().getName())).collect(Collectors.toSet());
     }
 
 }

src/main/java/net/geant/nmaas/portal/api/user/UsersController.java

@@ -68,6 +68,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -177,10 +178,7 @@ public class UsersController {
                                             @RequestParam(required = false) String searchValue,
                                             Principal principal) {
 
-
         return userService.findAllListEntry(pageable, searchValue);
-
-
     }
 
     @GetMapping("/domains/{domainId}/users/list")
@@ -206,6 +204,10 @@ public class UsersController {
             pageContent = new ArrayList<>();
         } else {
             pageContent = allUserInDomain.subList(startItem, endItem);
+            pageContent.forEach( userListEntry ->  {
+                Optional<Role> domainRole = userService.getUserRoleInDomain(userListEntry.getId(), domainId);
+                userListEntry.setDomainRole(domainRole.orElse(null));
+            });
         }
 
         return new PageImpl<>(pageContent, pageable, allUserInDomain.size());

src/main/java/net/geant/nmaas/portal/service/UserService.java

@@ -78,6 +78,8 @@ public interface UserService {
 
     List<UserListEntry> findAllListEntry();
 
+    Optional<Role> getUserRoleInDomain(Long userId, Long domainId);
+
 
 
 }

src/main/java/net/geant/nmaas/portal/service/impl/UserServiceImpl.java

@@ -348,7 +348,7 @@ public class UserServiceImpl implements UserService {
             Page<User> all = userRepository.findAll(searchSpec, pageable);
             return all.map(this::toListView).map(u -> mapUser(u, userLoginDateMap));
         } else {
-            return userRepository.findAllListEntry(pageable);
+            return userRepository.findAllListEntry(pageable).map(u -> mapUser(u, userLoginDateMap));
         }
     }
 
@@ -362,6 +362,11 @@ public class UserServiceImpl implements UserService {
         return userRepository.findAllListEntry();
     }
 
+    @Override
+    public Optional<Role> getUserRoleInDomain(Long userId, Long domainId) {
+        return this.userRoleRepository.findRolesByDomainAndUser(domainId, userId).stream().findFirst();
+    }
+
     private void sendMail(User user, MailType mailType) {
         ImmutableMap<String, Object> map;
         if (mailType == MailType.NEW_BULK_LOGIN) {