♻️ SteadyService 필터링 조회 로직 분기 수정

Team-Blitz-Steady · Jan 16, 2024 · 1d40c41 · 1d40c41
1 parent 1cacc19
commit 1d40c41
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 65 deletions.
diff --git a/src/main/java/dev/steady/steady/dto/response/PageResponse.java b/src/main/java/dev/steady/steady/dto/response/PageResponse.java
@@ -1,54 +1,17 @@
 package dev.steady.steady.dto.response;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Objects;
 
 public record PageResponse<T>(
         List<T> content,
         long numberOfElements,
-        long page,
-        String prevCursor,
-        String nextCursor
+        CursorResponse cursor
 ) {
 
-    public static <T> PageResponse<T> promotedAtResponse(List<T> list, long page, LocalDateTime prevCursor, LocalDateTime nextCursor) {
-        if (Objects.isNull(prevCursor)) {
-            return new PageResponse<>(
-                    list,
-                    list.size(),
-                    page,
-                    null,
-                    String.valueOf(nextCursor)
-            );
-        }
-        return new PageResponse<>(
-                list,
+    public static <T> PageResponse<T> of(List<T> list, CursorResponse cursorResponse) {
+        return new PageResponse<>(list,
                 list.size(),
-                page,
-                String.valueOf(prevCursor),
-                String.valueOf(nextCursor)
-        );
-
-    }
-
-    public static <T> PageResponse<T> deadlineResponse(List<T> list, long page, LocalDate prevCursor, LocalDate nextCursor) {
-        if (Objects.isNull(prevCursor)) {
-            return new PageResponse<>(
-                    list,
-                    list.size(),
-                    page,
-                    null,
-                    String.valueOf(nextCursor)
-            );
-        }
-        return new PageResponse<>(
-                list,
-                list.size(),
-                page,
-                String.valueOf(prevCursor),
-                String.valueOf(nextCursor)
+                cursorResponse
         );
     }
 

diff --git a/src/main/java/dev/steady/steady/service/SteadyService.java b/src/main/java/dev/steady/steady/service/SteadyService.java
@@ -22,6 +22,7 @@
 import dev.steady.steady.dto.request.SteadyCreateRequest;
 import dev.steady.steady.dto.request.SteadyQuestionUpdateRequest;
 import dev.steady.steady.dto.request.SteadyUpdateRequest;
+import dev.steady.steady.dto.response.CursorResponse;
 import dev.steady.steady.dto.response.MySteadyQueryResponse;
 import dev.steady.steady.dto.response.MySteadyResponse;
 import dev.steady.steady.dto.response.PageResponse;
@@ -31,7 +32,7 @@
 import dev.steady.steady.dto.response.SteadyQueryResponse;
 import dev.steady.steady.dto.response.SteadyQuestionsResponse;
 import dev.steady.steady.dto.response.SteadyRankResponse;
-import dev.steady.steady.uitl.PrevCursor;
+import dev.steady.steady.uitl.Cursor;
 import dev.steady.user.domain.Position;
 import dev.steady.user.domain.Stack;
 import dev.steady.user.domain.User;
@@ -47,7 +48,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.IntStream;
 
@@ -88,32 +88,26 @@ public Long create(SteadyCreateRequest request, UserInfo userinfo) {
     }
 
     @Transactional(readOnly = true)
-    @Cacheable(cacheNames = "steadies", key = "#pageable.pageNumber",
+    @Cacheable(cacheNames = "steadies", key = "#condition.status()",
             condition = "#condition.cacheable() == true")
     public PageResponse<SteadyQueryResponse> getSteadies(UserInfo userInfo, FilterConditionDto condition, Pageable pageable) {
         SteadyFilterResponse filterResponse = steadyRepository.findAllByFilterCondition(userInfo, condition, pageable);
         List<SteadyQueryResponse> searchResponses = filterResponse.result()
                 .stream()
-                .map(SteadyQueryResponse::from).toList();
-
-        PrevCursor prevCursor = PrevCursor.from(filterResponse.prevCursor());
-        SteadyQueryResponse nextCursor = searchResponses.get(searchResponses.size() - 1);
-
-        if (Objects.isNull(condition.cursor().getPromotedAt())) {
-            return PageResponse.deadlineResponse(
-                    searchResponses,
-                    pageable.getPageNumber(),
-                    prevCursor.getDeadline(),
-                    nextCursor.deadline()
-            );
+                .map(SteadyQueryResponse::from)
+                .toList();
+
+        Cursor prevCursor = Cursor.cursorFromSteady(filterResponse.prevCursorSteady());
+        Cursor nextCursor = Cursor.cursorFromSteady(filterResponse.nextCursorSteady());
+
+        CursorResponse cursorResponse;
+        if (condition.cursor().isPromotedAtCursor()) {
+            cursorResponse = new CursorResponse<>(prevCursor.getPromotedAt(), nextCursor.getPromotedAt());
+            return PageResponse.of(searchResponses, cursorResponse);
         }
 
-        return PageResponse.promotedAtResponse(
-                searchResponses,
-                pageable.getPageNumber(),
-                prevCursor.getPromotedAt(),
-                nextCursor.promotedAt()
-        );
+        cursorResponse = new CursorResponse<>(prevCursor.getDeadline(), nextCursor.getDeadline());
+        return PageResponse.of(searchResponses, cursorResponse);
     }
 
     @Transactional(readOnly = true)

diff --git a/src/main/java/dev/steady/steady/uitl/Cursor.java b/src/main/java/dev/steady/steady/uitl/Cursor.java
@@ -1,11 +1,13 @@
 package dev.steady.steady.uitl;
 
+import dev.steady.steady.domain.Steady;
 import io.jsonwebtoken.lang.Strings;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 @Getter
 @AllArgsConstructor
@@ -14,19 +16,29 @@ public class Cursor {
     private LocalDateTime promotedAt;
     private LocalDate deadline;
 
-    public static Cursor promotedAtCursor(String cursor) {
+    public static Cursor promotedAtCursorFrom(String cursor) {
         if (Strings.hasText(cursor)) {
             return new Cursor(CursorFormatter.getLocalDateTime(cursor), null);
         }
         return new Cursor(LocalDateTime.now(), null);
-
     }
 
-    public static Cursor deadlineCursor(String cursor) {
+    public static Cursor deadlineCursorFrom(String cursor) {
         if (Strings.hasText(cursor)) {
             return new Cursor(null, CursorFormatter.getLocalDate(cursor));
         }
         return new Cursor(null, LocalDate.now());
     }
 
+    public static Cursor cursorFromSteady(Steady prevCursor) {
+        if (Objects.isNull(prevCursor)) {
+            return new Cursor(null, null);
+        }
+        return new Cursor(prevCursor.getPromotedAt(), prevCursor.getDeadline());
+    }
+
+    public boolean isPromotedAtCursor() {
+        return Objects.nonNull(promotedAt);
+    }
+
 }