This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1571 by this push:
     new 89e6df4  send full list of roles
89e6df4 is described below

commit 89e6df454e6d4aaa96bf8707ee36f06aaa5c1890
Author: Oleh Fuks <[email protected]>
AuthorDate: Wed Apr 15 13:25:34 2020 +0300

    send full list of roles
---
 .../dlab/backendapi/resources/UserRoleResource.java   |  2 +-
 .../epam/dlab/backendapi/service/UserRoleService.java |  3 +--
 .../dlab/backendapi/service/UserRoleServiceImpl.java  | 19 ++-----------------
 .../backendapi/resources/UserRoleResourceTest.java    |  4 ++--
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserRoleResource.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserRoleResource.java
index b74ef1c..52ad739 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserRoleResource.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserRoleResource.java
@@ -51,7 +51,7 @@ public class UserRoleResource {
        @GET
        public Response getRoles(@Auth UserInfo userInfo) {
                log.debug("Getting all roles for admin {}...", 
userInfo.getName());
-               return 
Response.ok(userRoleService.getUserRoles(userInfo)).build();
+               return Response.ok(userRoleService.getUserRoles()).build();
        }
 
        @POST
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleService.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleService.java
index a010684..0b22b1d 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleService.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleService.java
@@ -18,14 +18,13 @@
  */
 package com.epam.dlab.backendapi.service;
 
-import com.epam.dlab.auth.UserInfo;
 import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
 
 import java.util.List;
 
 public interface UserRoleService {
 
-       List<UserRoleDto> getUserRoles(UserInfo userInfo);
+       List<UserRoleDto> getUserRoles();
 
        void createRole(UserRoleDto dto);
 
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
index 6940533..92e0afb 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/UserRoleServiceImpl.java
@@ -18,11 +18,8 @@
  */
 package com.epam.dlab.backendapi.service;
 
-import com.epam.dlab.auth.UserInfo;
 import com.epam.dlab.backendapi.dao.UserRoleDao;
 import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
-import com.epam.dlab.backendapi.roles.UserRoles;
-import com.epam.dlab.exceptions.DlabException;
 import com.epam.dlab.exceptions.ResourceNotFoundException;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -30,29 +27,17 @@ import com.google.inject.Singleton;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Singleton
 public class UserRoleServiceImpl implements UserRoleService {
        private static final String ROLE_NOT_FOUND_MSG = "Any of role : %s were 
not found";
-       private static final String ADMIN = "admin";
 
        @Inject
        private UserRoleDao userRoleDao;
 
        @Override
-       public List<UserRoleDto> getUserRoles(UserInfo user) {
-               List<UserRoleDto> all = userRoleDao.findAll();
-               if (UserRoles.isAdmin(user)) {
-                       return all;
-               } else if (UserRoles.isProjectAdmin(user)) {
-                       return all
-                                       .stream()
-                                       .filter(role -> 
!role.getId().equalsIgnoreCase(ADMIN))
-                                       .collect(Collectors.toList());
-               } else {
-                       throw new DlabException(String.format("User %s doesn't 
have appropriate permission", user));
-               }
+       public List<UserRoleDto> getUserRoles() {
+               return userRoleDao.findAll();
        }
 
        @Override
diff --git 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserRoleResourceTest.java
 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserRoleResourceTest.java
index c335db7..c4e2bd6 100644
--- 
a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserRoleResourceTest.java
+++ 
b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserRoleResourceTest.java
@@ -62,7 +62,7 @@ public class UserRoleResourceTest extends TestBase {
 
        @Test
        public void getRoles() {
-               
when(rolesService.getUserRoles(getUserInfo())).thenReturn(Collections.singletonList(getUserRole()));
+               
when(rolesService.getUserRoles()).thenReturn(Collections.singletonList(getUserRole()));
 
                final Response response = resources.getJerseyTest()
                                .target("/role")
@@ -77,7 +77,7 @@ public class UserRoleResourceTest extends TestBase {
                assertEquals(ROLE_ID, actualRoles.get(0).getId());
                assertEquals(MediaType.APPLICATION_JSON, 
response.getHeaderString(HttpHeaders.CONTENT_TYPE));
 
-               verify(rolesService).getUserRoles(getUserInfo());
+               verify(rolesService).getUserRoles();
                verifyNoMoreInteractions(rolesService);
        }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to