From 98eb22cc6a88faa0c4199bb551a36ab9b106ac75 Mon Sep 17 00:00:00 2001 From: JSoi Date: Fri, 29 Jul 2022 05:57:29 +0900 Subject: [PATCH] =?UTF-8?q?#39=20[Update]=20=EC=97=85=EC=9E=A5=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C(=EC=A7=80=EB=8F=84)=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/controller/StoreController.java | 2 +- .../repository/StoreQueryRepository.java | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java b/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java index 254560a..b311453 100644 --- a/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java +++ b/src/main/java/com/mpnp/baechelin/store/controller/StoreController.java @@ -52,7 +52,7 @@ public StorePagedResponseDto getStoreInRange(@RequestParam(required = false) Big @RequestParam(required = false) List facility, @PageableDefault Pageable pageable, @AuthenticationPrincipal User user) { - return storeService.getStoreInTwoPointsRange(latStart, latEnd, lngStart, lngEnd, category, facility, pageable, user == null ? null : user.getUsername()); + return storeService.getStoreInRange(latStart, latEnd, lngStart, lngEnd, category, facility, pageable, user == null ? null : user.getUsername()); } @GetMapping("/point") 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 a9f2b2d..5d037a0 100644 --- a/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java +++ b/src/main/java/com/mpnp/baechelin/store/repository/StoreQueryRepository.java @@ -62,25 +62,6 @@ public Page findBetweenOnePointOrder(BigDecimal latStart, return new PageImpl<>(storeList, pageable, fetchCount); } - public Page findBetweenTwoPoint(BigDecimal latStart, - BigDecimal latEnd, - BigDecimal lngStart, - BigDecimal lngEnd, - String category, - List facility, - Pageable pageable) { - BooleanBuilder builder = QuerydslLocation.locAndConditions(latStart, latEnd, lngStart, lngEnd, category, facility); - List storeList = - queryFactory - .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); - } - //TODO 별점순 - 쿼리 결과로 산출된 리스트의 평균 구하기, 정렬, 페이징 public Page findStoreOrderByPoint(BigDecimal lat, BigDecimal lng,