You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/07/08 15:14:14 UTC
[incubator-dlab] branch develop updated: [DLAB-1921] Fixed creation
Group defect (#813)
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 1d9fc97 [DLAB-1921] Fixed creation Group defect (#813)
1d9fc97 is described below
commit 1d9fc97eda9109b176c4a8fb7f03d3073b3b6b64
Author: Pavel Papou <pp...@gmail.com>
AuthorDate: Wed Jul 8 11:14:07 2020 -0400
[DLAB-1921] Fixed creation Group defect (#813)
[DLAB-1921] Fixed creation Group defect
---
.../com/epam/dlab/backendapi/resources/UserGroupResource.java | 2 +-
.../java/com/epam/dlab/backendapi/resources/dto/GroupDTO.java | 3 ++-
.../com/epam/dlab/backendapi/resources/UserGroupResourceTest.java | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserGroupResource.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserGroupResource.java
index acc7a80..06a4a77 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserGroupResource.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/UserGroupResource.java
@@ -57,7 +57,7 @@ public class UserGroupResource {
@RolesAllowed("/roleManagement/create")
public Response createGroup(@Auth UserInfo userInfo, @Valid GroupDTO dto) {
log.debug("Creating new group {}", dto.getName());
- userGroupService.createGroup(userInfo, dto.getName(), dto.getRoleIds(), dto.getUsers());
+ userGroupService.createGroup(userInfo, dto.getName(), dto.getRoleIds().keySet(), dto.getUsers());
return Response.ok().build();
}
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/GroupDTO.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/GroupDTO.java
index 577d9f7..ffce74b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/GroupDTO.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/resources/dto/GroupDTO.java
@@ -23,6 +23,7 @@ import lombok.Setter;
import org.hibernate.validator.constraints.NotEmpty;
import java.util.Collections;
+import java.util.Map;
import java.util.Set;
@Getter
@@ -31,6 +32,6 @@ public class GroupDTO {
@NotEmpty
private String name;
@NotEmpty
- private Set<String> roleIds;
+ private Map<String,String> roleIds;
private Set<String> users = Collections.emptySet();
}
diff --git a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java
index af54641..6e32ec0 100644
--- a/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java
+++ b/services/self-service/src/test/java/com/epam/dlab/backendapi/resources/UserGroupResourceTest.java
@@ -76,7 +76,7 @@ public class UserGroupResourceTest extends TestBase {
.target("/group")
.request()
.header("Authorization", "Bearer " + TOKEN)
- .post(Entity.json(getCreateGroupDto(GROUP, Collections.singleton(ROLE_ID))));
+ .post(Entity.json(getCreateGroupDto(GROUP, Collections.singletonMap(ROLE_ID, ROLE_DESCRIPTION))));
assertEquals(HttpStatus.SC_OK, response.getStatus());
@@ -91,7 +91,7 @@ public class UserGroupResourceTest extends TestBase {
.target("/group")
.request()
.header("Authorization", "Bearer " + TOKEN)
- .post(Entity.json(getCreateGroupDto("", Collections.singleton(ROLE_ID))));
+ .post(Entity.json(getCreateGroupDto("", Collections.singletonMap(ROLE_ID, ROLE_DESCRIPTION))));
assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, response.getStatus());
@@ -105,7 +105,7 @@ public class UserGroupResourceTest extends TestBase {
.target("/group")
.request()
.header("Authorization", "Bearer " + TOKEN)
- .post(Entity.json(getCreateGroupDto(GROUP, Collections.emptySet())));
+ .post(Entity.json(getCreateGroupDto(GROUP, Collections.emptyMap())));
assertEquals(HttpStatus.SC_UNPROCESSABLE_ENTITY, response.getStatus());
@@ -168,7 +168,7 @@ public class UserGroupResourceTest extends TestBase {
return new UserGroupDto(GROUP, Collections.emptyList(), Collections.emptySet());
}
- private GroupDTO getCreateGroupDto(String group, Set<String> roleIds) {
+ private GroupDTO getCreateGroupDto(String group, Map<String, String> roleIds) {
final GroupDTO dto = new GroupDTO();
dto.setName(group);
dto.setRoleIds(roleIds);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org