From 23f5700eda3a3c038b3332a741bf484ee1720986 Mon Sep 17 00:00:00 2001
From: Kim-TaeUk <xodnr0130@naver.com>
Date: Fri, 27 Sep 2024 15:56:34 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20=EC=95=B1=20=EC=B5=9C=EC=B4=88=20?=
 =?UTF-8?q?=EC=A7=84=EC=9E=85=20=EC=8B=9C=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=9D=91=EB=8B=B5=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

gender 추가
---
 .../org/websoso/WSSServer/controller/UserController.java    | 4 ++--
 .../WSSServer/dto/user/UserIdAndNicknameResponse.java       | 6 ++++--
 .../java/org/websoso/WSSServer/service/UserService.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/websoso/WSSServer/controller/UserController.java b/src/main/java/org/websoso/WSSServer/controller/UserController.java
index cfa745b4..4e510bef 100644
--- 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
index 3e9d373a..c61fae28 100644
--- 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
index 1873342f..9fc0f7de 100644
--- 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);
     }
 }