[MERGE] Merge pull request #200 from Team-WSS/fix/#198

[FIX] 앱 최초 진입 시 정보 조회 응답 수정
Team-WSS · Sep 27, 2024 · 96f885b · 96f885b
2 parents 4e24df1 + 23f5700
commit 96f885b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/websoso/WSSServer/controller/UserController.java b/src/main/java/org/websoso/WSSServer/controller/UserController.java
@@ -204,10 +204,10 @@ public ResponseEntity<Void> editMyInfo(Principal principal,
  }
 
  @GetMapping("/me")
- public ResponseEntity<UserIdAndNicknameResponse> getUserIdAndNickname(Principal principal) {
+ public ResponseEntity<UserIdAndNicknameResponse> getUserIdAndNicknameAndGender(Principal principal) {
  User user = userService.getUserOrException(Long.valueOf(principal.getName()));
  return ResponseEntity
  .status(OK)
- .body(userService.getUserIdAndNickname(user));
+ .body(userService.getUserIdAndNicknameAndGender(user));
  }
 }
diff --git a/src/main/java/org/websoso/WSSServer/dto/user/UserIdAndNicknameResponse.java b/src/main/java/org/websoso/WSSServer/dto/user/UserIdAndNicknameResponse.java
@@ -4,13 +4,15 @@
 
 public record UserIdAndNicknameResponse(
  Long userId,
- String nickname
+ String nickname,
+ String gender
 ) {
 
  public static UserIdAndNicknameResponse of(User user) {
  return new UserIdAndNicknameResponse(
  user.getUserId(),
- user.getNickname()
+ user.getNickname(),
+ user.getGender().name()
  );
  }
 }
diff --git a/src/main/java/org/websoso/WSSServer/service/UserService.java b/src/main/java/org/websoso/WSSServer/service/UserService.java
@@ -177,7 +177,7 @@ public void editMyInfo(User user, EditMyInfoRequest editMyInfoRequest) {
  }
 
  @Transactional(readOnly = true)
- public UserIdAndNicknameResponse getUserIdAndNickname(User user) {
+ public UserIdAndNicknameResponse getUserIdAndNicknameAndGender(User user) {
  return UserIdAndNicknameResponse.of(user);
  }
 }