Merge pull request #669 from Onlineberatung/OB-5247-extended-data-export

fix: extend session user datamodel
Onlineberatung · Sep 5, 2023 · f8625b0 · f8625b0
2 parents e7b3b0b + 063794f
commit f8625b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/api/userservice.yaml b/api/userservice.yaml
@@ -2368,6 +2368,9 @@ components:
     SessionUserDTO:
       type: object
       properties:
+        id:
+          type: string
+          example: 926b9777-4eef-443d-925a-4aa534797bd7
         username:
           type: string
           example: max94

diff --git a/src/main/java/de/caritas/cob/userservice/api/adapters/web/dto/SessionUserDTO.java b/src/main/java/de/caritas/cob/userservice/api/adapters/web/dto/SessionUserDTO.java
@@ -15,10 +15,13 @@
 @ApiModel(value = "SessionUser")
 public class SessionUserDTO {
 
-  @ApiModelProperty(example = "Username", position = 0)
+  @ApiModelProperty(example = "id", position = 0)
+  private String id;
+
+  @ApiModelProperty(example = "Username", position = 1)
   private String username;
 
-  @ApiModelProperty(example = "isDeleted", position = 1)
+  @ApiModelProperty(example = "isDeleted", position = 2)
   private boolean isDeleted;
 
   private Map<String, Object> sessionData;

diff --git a/src/main/java/de/caritas/cob/userservice/api/service/session/SessionMapper.java b/src/main/java/de/caritas/cob/userservice/api/service/session/SessionMapper.java
@@ -77,6 +77,7 @@ public SessionDTO convertToSessionDTO(Session session) {
   private SessionUserDTO convertToSessionUserDTO(Session session) {
     if (nonNull(session.getUser()) && nonNull(session.getSessionData())) {
       var sessionUserDto = new SessionUserDTO();
+      sessionUserDto.setId(session.getUser().getUserId());
       sessionUserDto.setUsername(
           new UsernameTranscoder().decodeUsername(session.getUser().getUsername()));
       sessionUserDto.setSessionData(buildSessionDataMapFromSession(session));

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -3,6 +3,7 @@ server.port=8082
 logging.level.root=INFO
 logging.level.org.springframework.web=DEBUG
 logging.level.org.hibernate=ERROR
+logging.level.org.springframework.web.servlet.mvc.method.annotation=DEBUG
 
 # Keycloak
 keycloak.auth-server-url=http://onlineberatung.local/auth