refactor: UserTalkRoomSearchCondition 추가로 인한 리팩토링 (#124)

jisung-in · Jul 4, 2024 · b61b5c2 · b61b5c2
1 parent 717507b
commit b61b5c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/com/jisungin/api/talkroom/TalkRoomController.java b/src/main/java/com/jisungin/api/talkroom/TalkRoomController.java
@@ -9,6 +9,7 @@
 import com.jisungin.application.SliceResponse;
 import com.jisungin.application.talkroom.TalkRoomService;
 import com.jisungin.application.talkroom.request.TalkRoomSearchCondition;
+import com.jisungin.application.talkroom.request.UserTalkRoomSearchCondition;
 import com.jisungin.application.talkroom.response.TalkRoomFindAllResponse;
 import com.jisungin.application.talkroom.response.TalkRoomFindOneResponse;
 import com.jisungin.application.talkroom.response.TalkRoomRelatedBookResponse;
@@ -99,9 +100,8 @@ public ApiResponse<PageResponse<TalkRoomFindAllResponse>> findUserTalkRoom(
             @RequestParam(value = "likedFilter", required = false) boolean likedFilter,
             @Auth Long userId
     ) {
-        return ApiResponse.ok(
-                talkRoomService.findUserTalkRoom(OffsetLimit.of(page, size), userTalkRoomsFilter, commentedFilter,
-                        likedFilter, userId));
+        return ApiResponse.ok(talkRoomService.findUserTalkRoom(OffsetLimit.of(page, size),
+                UserTalkRoomSearchCondition.of(userTalkRoomsFilter, commentedFilter, likedFilter), userId));
     }
 
 }
diff --git a/src/main/java/com/jisungin/application/talkroom/TalkRoomService.java b/src/main/java/com/jisungin/application/talkroom/TalkRoomService.java
@@ -6,6 +6,7 @@
 import com.jisungin.application.talkroom.request.TalkRoomCreateServiceRequest;
 import com.jisungin.application.talkroom.request.TalkRoomEditServiceRequest;
 import com.jisungin.application.talkroom.request.TalkRoomSearchCondition;
+import com.jisungin.application.talkroom.request.UserTalkRoomSearchCondition;
 import com.jisungin.application.talkroom.response.TalkRoomFindAllResponse;
 import com.jisungin.application.talkroom.response.TalkRoomFindOneResponse;
 import com.jisungin.application.talkroom.response.TalkRoomQueryEntity;
@@ -88,7 +89,8 @@ public TalkRoomFindOneResponse createTalkRoom(TalkRoomCreateServiceRequest reque
         return TalkRoomFindOneResponse.of(talkRoom, book, user, imageUrls, readingStatus);
     }
 
-    public SliceResponse<TalkRoomFindAllResponse> findAllTalkRoom(OffsetLimit offsetLimit, TalkRoomSearchCondition condition,
+    public SliceResponse<TalkRoomFindAllResponse> findAllTalkRoom(OffsetLimit offsetLimit,
+                                                                  TalkRoomSearchCondition condition,
                                                                   LocalDateTime now
     ) {
         List<TalkRoomQueryEntity> talkRooms = talkRoomRepository.findAllTalkRoom(offsetLimit.getOffset(),
@@ -169,24 +171,21 @@ public void deleteTalkRoom(Long talkRoomId, Long userId) {
         talkRoomRepository.delete(talkRoom);
     }
 
-    public PageResponse<TalkRoomFindAllResponse> findUserTalkRoom(OffsetLimit offsetLimit, boolean userTalkRoomsFilter,
-                                                                  boolean commentedFilter, boolean likedFilter,
-                                                                  Long userId
+    public PageResponse<TalkRoomFindAllResponse> findUserTalkRoom(OffsetLimit offsetLimit,
+                                                                  UserTalkRoomSearchCondition condition, Long userId
     ) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
 
         List<TalkRoomQueryEntity> findTalkRoom = talkRoomRepository.findByTalkRoomOwner(offsetLimit.getOffset(),
-                offsetLimit.getLimit(),
-                userTalkRoomsFilter, commentedFilter,
-                likedFilter,
-                user.getId());
+                offsetLimit.getLimit(), condition.isUserTalkRoomFilter(), condition.isCommentedFilter(),
+                condition.isLikedFilter(), user.getId());
 
         Map<Long, List<ReadingStatus>> talkRoomRoleMap = talkRoomRoleRepository.findTalkRoomRoleByIds(
                 findTalkRoom.stream().map(TalkRoomQueryEntity::getId).toList());
 
-        Long totalCount = talkRoomRepository.countTalkRoomsByUserId(user.getId(), userTalkRoomsFilter, commentedFilter,
-                likedFilter);
+        Long totalCount = talkRoomRepository.countTalkRoomsByUserId(user.getId(), condition.isUserTalkRoomFilter(),
+                condition.isCommentedFilter(), condition.isLikedFilter());
 
         return PageResponse.of(findTalkRoom.size(), totalCount,
                 TalkRoomFindAllResponse.toList(findTalkRoom, talkRoomRoleMap));