From f14f9b0e451cc962a1f4dcd814ad8d963349e838 Mon Sep 17 00:00:00 2001
From: tuannn2 <tuan2.nguyennhu@toshiba.co.jp>
Date: Fri, 9 Jun 2023 17:07:04 +0700
Subject: [PATCH] feat(rest): update response API Listing users

Signed-off-by: tuannn2 <tuan2.nguyennhu@toshiba.co.jp>
---
 .../resourceserver/core/RestControllerHelper.java    | 12 ++++++++++++
 .../rest/resourceserver/user/UserController.java     |  2 +-
 .../rest/resourceserver/restdocs/UserSpecTest.java   |  5 +++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
index 0c7e89a047..2398ca3565 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -603,6 +603,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/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
index db915ac1bb..67506307f0 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
+++ b/rest/resource-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/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
index 31095d9cbf..532106084e 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
+++ b/rest/resource-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")
                         )));