[MERGE] Merge pull request #203 from Team-WSS/fix/#202

[FIX] 유저 등록 작품 수 조회 기능 수정
Team-WSS · Sep 28, 2024 · 6c070e0 · 6c070e0
2 parents 96f885b + 043b24a
commit 6c070e0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/main/java/org/websoso/WSSServer/controller/UserController.java b/src/main/java/org/websoso/WSSServer/controller/UserController.java
@@ -133,12 +133,11 @@ public ResponseEntity<Void> registerUserInfo(Principal principal,
                 .build();
     }
 
-    @GetMapping("/user-novel-stats")
-    public ResponseEntity<UserNovelCountGetResponse> getUserNovelStatistics(Principal principal) {
-        User user = userService.getUserOrException(Long.valueOf(principal.getName()));
+    @GetMapping("/{userId}/user-novel-stats")
+    public ResponseEntity<UserNovelCountGetResponse> getUserNovelStatistics(@PathVariable("userId") Long userId) {
         return ResponseEntity
                 .status(OK)
-                .body(userNovelService.getUserNovelStatistics(user));
+                .body(userNovelService.getUserNovelStatistics(userId));
     }
 
     @GetMapping("/{userId}/novels")

diff --git a/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepository.java b/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepository.java
@@ -10,7 +10,7 @@
 
 public interface UserNovelCustomRepository {
 
-    UserNovelCountGetResponse findUserNovelStatistics(User user);
+    UserNovelCountGetResponse findUserNovelStatistics(Long userId);
 
     List<Long> findTodayPopularNovelsId(Pageable pageable);
 

diff --git a/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepositoryImpl.java
@@ -30,7 +30,7 @@ public class UserNovelCustomRepositoryImpl implements UserNovelCustomRepository
     private final JPAQueryFactory jpaQueryFactory;
 
     @Override
-    public UserNovelCountGetResponse findUserNovelStatistics(User user) {
+    public UserNovelCountGetResponse findUserNovelStatistics(Long userId) {
         return jpaQueryFactory
                 .select(Projections.constructor(UserNovelCountGetResponse.class,
                         userNovel.isInterest
@@ -59,7 +59,7 @@ public UserNovelCountGetResponse findUserNovelStatistics(User user) {
                                 .coalesce(0)
                 ))
                 .from(userNovel)
-                .where(userNovel.user.eq(user))
+                .where(userNovel.user.userId.eq(userId))
                 .fetchOne();
     }
 

diff --git a/src/main/java/org/websoso/WSSServer/service/UserNovelService.java b/src/main/java/org/websoso/WSSServer/service/UserNovelService.java
@@ -228,8 +228,8 @@ private List<KeywordGetResponse> getKeywordGetResponses(UserNovel userNovel) {
     }
 
     @Transactional(readOnly = true)
-    public UserNovelCountGetResponse getUserNovelStatistics(User user) {
-        return userNovelRepository.findUserNovelStatistics(user);
+    public UserNovelCountGetResponse getUserNovelStatistics(Long ownerId) {
+        return userNovelRepository.findUserNovelStatistics(ownerId);
     }
 
     @Transactional(readOnly = true)