refactor: TalkRooms 조회 슬라이싱으로 변경 (#124)

jisung-in · Jun 28, 2024 · c578b5e · c578b5e
1 parent 1e1e141
commit c578b5e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/src/main/java/com/jisungin/api/talkroom/TalkRoomController.java b/src/main/java/com/jisungin/api/talkroom/TalkRoomController.java
@@ -6,6 +6,7 @@
 import com.jisungin.api.talkroom.request.TalkRoomEditRequest;
 import com.jisungin.application.OffsetLimit;
 import com.jisungin.application.PageResponse;
+import com.jisungin.application.SliceResponse;
 import com.jisungin.application.talkroom.TalkRoomService;
 import com.jisungin.application.talkroom.response.TalkRoomFindAllResponse;
 import com.jisungin.application.talkroom.response.TalkRoomFindOneResponse;
@@ -49,7 +50,7 @@ public ApiResponse<TalkRoomFindOneResponse> createTalkRoom(@Valid @RequestBody T
     }
 
     @GetMapping("/talk-rooms")
-    public ApiResponse<PageResponse<TalkRoomFindAllResponse>> findAllTalkRoom(
+    public ApiResponse<SliceResponse<TalkRoomFindAllResponse>> findAllTalkRoom(
             @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
             @RequestParam(value = "size", required = false, defaultValue = "10") Integer size,
             @RequestParam(value = "order", required = false, defaultValue = "recent") String order,
@@ -58,9 +59,7 @@ public ApiResponse<PageResponse<TalkRoomFindAllResponse>> findAllTalkRoom(
     ) {
         LocalDateTime now = LocalDateTime.now();
 
-        return ApiResponse.ok(
-                talkRoomService.findAllTalkRoom(OffsetLimit.of(page, size, order), search, day,
-                        now));
+        return ApiResponse.ok(talkRoomService.findAllTalkRoom(OffsetLimit.of(page, size, order), search, day, now));
     }
 
     @GetMapping("/talk-rooms/{talkRoomId}")

diff --git a/src/main/java/com/jisungin/application/SliceResponse.java b/src/main/java/com/jisungin/application/SliceResponse.java
@@ -1,6 +1,7 @@
 package com.jisungin.application;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,6 +34,27 @@ private SliceResponse(List<T> content, boolean hasContent, boolean first, boolea
         this.size = size;
     }
 
+    public static <T> SliceResponse<T> of(List<T> content, Integer offset, Integer limit) {
+        List<T> response = validateContent(content, limit);
+
+        boolean hasContent = !response.isEmpty();
+        boolean first = (offset == 0);
+        boolean last = isLast(content, limit);
+
+        Integer number = (offset / limit) + 1;
+        Integer size = response.size();
+
+        return SliceResponse.<T>builder()
+                .content(response)
+                .hasContent(hasContent)
+                .first(first)
+                .last(last)
+                .number(number)
+                .size(size)
+                .build();
+    }
+
+
     public static <T> SliceResponse<T> of(List<T> content, Integer offset, Integer limit, boolean hasNext) {
         boolean hasContent = !content.isEmpty();
         boolean first = (offset == 0);
@@ -51,4 +73,12 @@ public static <T> SliceResponse<T> of(List<T> content, Integer offset, Integer l
                 .build();
     }
 
+    private static <T> List<T> validateContent(List<T> content, Integer limit) {
+        return content.size() > limit ? content.subList(0, limit) : content;
+    }
+
+    private static <T> boolean isLast(List<T> content, Integer limit) {
+        return content.size() <= limit;
+    }
+
 }
diff --git a/src/main/java/com/jisungin/application/talkroom/TalkRoomService.java b/src/main/java/com/jisungin/application/talkroom/TalkRoomService.java
@@ -2,6 +2,7 @@
 
 import com.jisungin.application.OffsetLimit;
 import com.jisungin.application.PageResponse;
+import com.jisungin.application.SliceResponse;
 import com.jisungin.application.talkroom.request.TalkRoomCreateServiceRequest;
 import com.jisungin.application.talkroom.request.TalkRoomEditServiceRequest;
 import com.jisungin.application.talkroom.response.TalkRoomFindAllResponse;
@@ -86,20 +87,17 @@ public TalkRoomFindOneResponse createTalkRoom(TalkRoomCreateServiceRequest reque
         return TalkRoomFindOneResponse.of(talkRoom, book, user, imageUrls, readingStatus);
     }
 
-    public PageResponse<TalkRoomFindAllResponse> findAllTalkRoom(OffsetLimit offsetLimit, String search, String day,
-                                                                 LocalDateTime now
+    public SliceResponse<TalkRoomFindAllResponse> findAllTalkRoom(OffsetLimit offsetLimit, String search, String day,
+                                                                  LocalDateTime now
     ) {
         List<TalkRoomQueryEntity> talkRooms = talkRoomRepository.findAllTalkRoom(offsetLimit.getOffset(),
                 offsetLimit.getLimit(), offsetLimit.getOrder(), search, day, now);
 
         List<Long> talkRoomIds = talkRooms.stream().map(TalkRoomQueryEntity::getId).toList();
-
         Map<Long, List<ReadingStatus>> talkRoomRoleMap = talkRoomRoleRepository.findTalkRoomRoleByIds(talkRoomIds);
 
-        Long totalCount = talkRoomRepository.countTalkRooms(search, day, now);
-
-        return PageResponse.of(talkRooms.size(), totalCount,
-                TalkRoomFindAllResponse.toList(talkRooms, talkRoomRoleMap));
+        return SliceResponse.of(TalkRoomFindAllResponse.toList(talkRooms, talkRoomRoleMap), offsetLimit.getOffset(),
+                offsetLimit.getLimit());
     }
 
     public TalkRoomFindOneResponse findOneTalkRoom(Long talkRoomId) {