[MERGE] Merge pull request #192 from Team-WSS/feat/#191

[FEAT] 앱 최초 진입 시 정보 조회 API
Team-WSS · Sep 25, 2024 · 7590960 · 7590960
2 parents a8c4224 + 90a8712
commit 7590960
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/org/websoso/WSSServer/controller/UserController.java b/src/main/java/org/websoso/WSSServer/controller/UserController.java
@@ -22,14 +22,15 @@
 import org.websoso.WSSServer.dto.feed.UserFeedsGetResponse;
 import org.websoso.WSSServer.dto.user.EditMyInfoRequest;
 import org.websoso.WSSServer.dto.user.EditProfileStatusRequest;
-import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
 import org.websoso.WSSServer.dto.user.LoginResponse;
 import org.websoso.WSSServer.dto.user.MyProfileResponse;
 import org.websoso.WSSServer.dto.user.NicknameValidation;
 import org.websoso.WSSServer.dto.user.ProfileGetResponse;
 import org.websoso.WSSServer.dto.user.ProfileStatusResponse;
 import org.websoso.WSSServer.dto.user.RegisterUserInfoRequest;
 import org.websoso.WSSServer.dto.user.UpdateMyProfileRequest;
+import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
+import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
 import org.websoso.WSSServer.dto.user.UserNovelCountGetResponse;
 import org.websoso.WSSServer.dto.userNovel.UserGenrePreferencesGetResponse;
 import org.websoso.WSSServer.dto.userNovel.UserNovelAndNovelsGetResponse;
@@ -191,7 +192,7 @@ public ResponseEntity<UserGenrePreferencesGetResponse> getUserGenrePreferences(P
  .status(OK)
  .body(userNovelService.getUserAttractivePointsAndKeywords(visitor, ownerId));
  }
- 
+
  @PutMapping("/info")
  public ResponseEntity<Void> editMyInfo(Principal principal,
  @Valid @RequestBody EditMyInfoRequest editMyInfoRequest) {
@@ -201,4 +202,12 @@ public ResponseEntity<Void> editMyInfo(Principal principal,
  .status(NO_CONTENT)
  .build();
  }
+
+ @GetMapping("/me")
+ public ResponseEntity<UserIdAndNicknameResponse> getUserIdAndNickname(Principal principal) {
+ User user = userService.getUserOrException(Long.valueOf(principal.getName()));
+ return ResponseEntity
+ .status(OK)
+ .body(userService.getUserIdAndNickname(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
@@ -0,0 +1,16 @@
+package org.websoso.WSSServer.dto.user;
+
+import org.websoso.WSSServer.domain.User;
+
+public record UserIdAndNicknameResponse(
+ Long userId,
+ String nickname
+) {
+
+ public static UserIdAndNicknameResponse of(User user) {
+ return new UserIdAndNicknameResponse(
+ user.getUserId(),
+ user.getNickname()
+ );
+ }
+}
diff --git a/src/main/java/org/websoso/WSSServer/service/UserService.java b/src/main/java/org/websoso/WSSServer/service/UserService.java
@@ -21,6 +21,7 @@
 import org.websoso.WSSServer.domain.User;
 import org.websoso.WSSServer.dto.user.EditMyInfoRequest;
 import org.websoso.WSSServer.dto.user.EditProfileStatusRequest;
+import org.websoso.WSSServer.dto.user.UserIdAndNicknameResponse;
 import org.websoso.WSSServer.dto.user.UserInfoGetResponse;
 import org.websoso.WSSServer.dto.user.LoginResponse;
 import org.websoso.WSSServer.dto.user.MyProfileResponse;
@@ -174,4 +175,9 @@ private Genre findByGenreNameOrThrow(String genreName) {
  public void editMyInfo(User user, EditMyInfoRequest editMyInfoRequest) {
  user.editMyInfo(editMyInfoRequest);
  }
+
+ @Transactional(readOnly = true)
+ public UserIdAndNicknameResponse getUserIdAndNickname(User user) {
+ return UserIdAndNicknameResponse.of(user);
+ }
 }