Merge pull request #1996 from toshiba/release/update_response_api_lis…

…ting_users feat(rest): update response API Listing users Reviewed by: rudra.chopra@siemens.com Tested by: kumar.nikesh@siemens.com
eclipse-sw360 · Jun 15, 2023 · ec28fa1 · ec28fa1
2 parents 5f88496 + f14f9b0
commit ec28fa1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/...server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -610,6 +610,18 @@ public User convertToEmbeddedUser(User user) {
         return embeddedUser;
     }
 
+    public User convertToEmbeddedGetUsers(User user) {
+        User embeddedUser = new User();
+        embeddedUser.setId(user.getId());
+        embeddedUser.setFullname(user.getFullname());
+        embeddedUser.setEmail(user.getEmail());
+        embeddedUser.setGivenname(user.getGivenname());
+        embeddedUser.setLastname(user.getLastname());
+        embeddedUser.setDepartment(user.getDepartment());
+        embeddedUser.setType(null);
+        return embeddedUser;
+    }
+
     public void addEmbeddedObligations(HalResource<License> halLicense, List<Obligation> obligations) {
         for (Obligation obligation : obligations) {
             HalResource<Obligation> obligationHalResource = addEmbeddedObligation(obligation);

diff --git a/...ource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java b/...ource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
@@ -68,7 +68,7 @@ public ResponseEntity<CollectionModel<EntityModel<User>>> getUsers() {
 
         List<EntityModel<User>> userResources = new ArrayList<>();
         for (User sw360User : sw360Users) {
-            User embeddedUser = restControllerHelper.convertToEmbeddedUser(sw360User);
+            User embeddedUser = restControllerHelper.convertToEmbeddedGetUsers(sw360User);
             EntityModel<User> userResource = EntityModel.of(embeddedUser);
             userResources.add(userResource);
         }

diff --git a/...rce-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java b/...rce-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
@@ -117,6 +117,11 @@ public void should_document_get_users() throws Exception {
                         ),
                         responseFields(
                                 subsectionWithPath("_embedded.sw360:users[]email").description("The user's email"),
+                                subsectionWithPath("_embedded.sw360:users[]department").description("The user's department"),
+                                subsectionWithPath("_embedded.sw360:users[]deactivated").description("The user's deactivated"),
+                                subsectionWithPath("_embedded.sw360:users[]fullName").description("The user's full name"),
+                                subsectionWithPath("_embedded.sw360:users[]givenName").description("The user's given name"),
+                                subsectionWithPath("_embedded.sw360:users[]lastName").description("The user's last name"),
                                 subsectionWithPath("_embedded.sw360:users").description("An array of <<resources-users, User resources>>"),
                                 subsectionWithPath("_links").description("<<resources-index-links,Links>> to other resources")
                         )));