From c7eea0ce26d63e230e1c7a13e6a0a5498396ca41 Mon Sep 17 00:00:00 2001 From: JSoi Date: Sun, 31 Jul 2022 05:37:56 +0900 Subject: [PATCH] =?UTF-8?q?#23=20[Update]=20=EC=9C=84=EC=B9=98=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EA=B0=80=20=EC=A1=B4=EC=9E=AC=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=84=20=EC=8B=9C=20=EB=A6=AC=ED=84=B4=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mpnp/baechelin/review/domain/Review.java | 4 ---- .../com/mpnp/baechelin/store/domain/Store.java | 1 - .../store/repository/StoreQueryRepository.java | 14 +++----------- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/mpnp/baechelin/review/domain/Review.java b/src/main/java/com/mpnp/baechelin/review/domain/Review.java index 3e042e6..8c39a37 100644 --- a/src/main/java/com/mpnp/baechelin/review/domain/Review.java +++ b/src/main/java/com/mpnp/baechelin/review/domain/Review.java @@ -59,10 +59,6 @@ public Review(ReviewRequestDto reviewRequestDto, Store store, User user) throws public void setImage(List reviewImageList){ this.reviewImageList = reviewImageList; } - public void addSingleTag(Tag tag){ - tag.setReview(this); - this.tagList.add(tag); - } public void update(ReviewRequestDto reviewRequestDto){ this.point = reviewRequestDto.getPoint(); diff --git a/src/main/java/com/mpnp/baechelin/store/domain/Store.java b/src/main/java/com/mpnp/baechelin/store/domain/Store.java index ded4d36..69b1c45 100644 --- a/src/main/java/com/mpnp/baechelin/store/domain/Store.java +++ b/src/main/java/com/mpnp/baechelin/store/domain/Store.java @@ -105,7 +105,6 @@ public Store updateBookmarkCount() { return this; } - // TODO 리뷰가 삭제될 때도 고려하기 - 삭제 후 적용되어야 함 public Store updatePointAvg() { this.reviewCount = reviewList.size(); double totalPoint = 0.0; diff --git a/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java b/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java index 8187493..bd4dec6 100644 --- a/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java +++ b/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java @@ -70,10 +70,8 @@ private Page findBetweenOnePointOrderNullCase(BooleanBuilder builder, .selectFrom(store) .where(builder) .limit(pageable.getPageSize()) - .offset(pageable.getOffset()) .fetch(); - int fetchCount = queryFactory.selectFrom(store).where(builder).fetch().size(); - return new PageImpl<>(storeList, pageable, fetchCount); + return new PageImpl<>(storeList, pageable, storeList.size()); } private OrderSpecifier orderDistance(BigDecimal nowLat, BigDecimal nowLng) { @@ -107,10 +105,8 @@ private Page findStoreOrderByPointNullCase(BooleanBuilder builder, .where(builder) .orderBy(store.pointAvg.desc()) .limit(pageable.getPageSize()) - .offset(pageable.getOffset()) .fetch(); - int fetchCount = queryFactory.selectFrom(store).where(builder).fetch().size(); - return new PageImpl<>(storeList, pageable, fetchCount); + return new PageImpl<>(storeList, pageable, storeList.size()); } public Page findStoreOrderByBookmark(BigDecimal lat, @@ -122,8 +118,6 @@ public Page findStoreOrderByBookmark(BigDecimal lat, if (lat == null || lng == null) return findStoreOrderByBookmarkNullCase(builder, pageable); List storeList = queryFactory.selectFrom(store) .where(builder) - .orderBy(store.bookMarkCount.desc()) - .orderBy(orderDistance(lat, lng)) .limit(pageable.getPageSize()) .offset(pageable.getOffset()) .fetch(); @@ -138,10 +132,8 @@ public Page findStoreOrderByBookmarkNullCase(BooleanBuilder builder, .where(builder) .orderBy(store.bookMarkCount.desc()) .limit(pageable.getPageSize()) - .offset(pageable.getOffset()) .fetch(); - int fetchCount = queryFactory.selectFrom(store).where(builder).fetch().size(); - return new PageImpl<>(storeList, pageable, fetchCount); + return new PageImpl<>(storeList, pageable, storeList.size()); } // 주소로 검색, 검색어로 검색