Merge pull request #22 from WonderWoman-Team/delivery/yeni-choi

[REFACTOR] 무한 스크롤 기능에 sort 정보 확인 추가
WonderWoman-Team · Aug 18, 2023 · d90d49d · d90d49d
2 parents 51e5f9d + a321b57
commit d90d49d
Showing 1 changed file with 37 additions and 33 deletions.
diff --git a/src/main/java/com/example/wonderwoman/delivery/repository/DeliveryRepositoryImpl.java b/src/main/java/com/example/wonderwoman/delivery/repository/DeliveryRepositoryImpl.java
@@ -33,41 +33,45 @@
 public class DeliveryRepositoryImpl {
     private final JPAQueryFactory queryFactory;
 
-    public Slice<DeliveryResponseDto> getSliceOfDelivery(Member member,
-                                                         final String reqType,
-                                                         final String school,
-                                                         final List<Building> building,
-                                                         final List<SanitarySize> sanitarySize,
-                                                         Pageable pageable) {
-        JPAQuery<DeliveryPost> results = queryFactory.selectFrom(deliveryPost)
-                .where(
-                        reqTypeLike(reqType),
-                        schoolLike(school),
-                        buildingLike(building),
-                        sanitarySizeEq(sanitarySize)
-                )
-                .offset(pageable.getOffset())
-                .limit(pageable.getPageSize() + 1);
-
-        for (Sort.Order o : pageable.getSort()) {
-            PathBuilder pathBuilder = new PathBuilder(deliveryPost.getType(), deliveryPost.getMetadata());
-            results.orderBy(new OrderSpecifier(o.isAscending() ? Order.ASC :
-                    Order.DESC, pathBuilder.get(o.getProperty())));
+        public Slice<DeliveryResponseDto> getSliceOfDelivery(Member member,
+                                                             final String reqType,
+                                                             final String school,
+                                                             final List<Building> building,
+                                                             final List<SanitarySize> sanitarySize,
+                                                             Pageable pageable) {
+            JPAQuery<DeliveryPost> results = queryFactory.selectFrom(deliveryPost)
+                    .where(
+                            reqTypeLike(reqType),
+                            schoolLike(school),
+                            buildingLike(building),
+                            sanitarySizeEq(sanitarySize)
+                    )
+                    .offset(pageable.getOffset()) // 기존 offset 설정 유지
+                    .limit(pageable.getPageSize() + 1);
+
+            // 정렬 정보가 있을 경우 정렬 적용
+            if (pageable.getSort().isSorted()) {
+                PathBuilder pathBuilder = new PathBuilder(deliveryPost.getType(), deliveryPost.getMetadata());
+                for (Sort.Order order : pageable.getSort()) {
+                    results.orderBy(new OrderSpecifier<>(order.isAscending() ? Order.ASC : Order.DESC, pathBuilder.get(order.getProperty())));
+                }
+            }
+
+            List<DeliveryResponseDto> contents = results.fetch()
+                    .stream()
+                    .map(o -> DeliveryResponseDto.of(o, o.isWrittenPost(member)))
+                    .collect(Collectors.toList());
+
+            boolean hasNext = false;
+
+            if (contents.size() > pageable.getPageSize()) {
+                contents.remove(pageable.getPageSize());
+                hasNext = true;
+            }
+
+            return new SliceImpl<>(contents, pageable, hasNext);
         }
 
-        List<DeliveryResponseDto> contents = results.fetch()
-                .stream()
-                .map(o -> DeliveryResponseDto.of(o, o.isWrittenPost(member)))
-                .collect(Collectors.toList());
-
-        boolean hasNext = false;
-
-        if (contents.size() > pageable.getPageSize()) {
-            contents.remove(pageable.getPageSize());
-            hasNext = true;
-        }
-        return new SliceImpl<>(contents, pageable, hasNext);
-    }
 
     public BooleanExpression reqTypeLike(final String reqType) {
         return StringUtils.hasText(reqType) ? deliveryPost.postReqType.eq(ReqType.resolve(reqType)) : null;