From a07d0554574f1c0db88bf108e97a9d223c20692f Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:12:27 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=A3=BC=EC=86=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nowait/applicationuser/config/security/CorsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/CorsConfig.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/CorsConfig.java index f70beb4c..b89e7b7c 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/CorsConfig.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/config/security/CorsConfig.java @@ -15,7 +15,7 @@ public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); // 쿠키나 인증헤더 자격증명 허용 - config.setAllowedOrigins(List.of("http://localhost:5173", "http://localhost:63342", "https://nowait-user.vercel.app", "https://nowait.co.kr", "https://www.nowait.co.kr")); // 허용할 출처 설정 + config.setAllowedOrigins(List.of("http://localhost:5173", "http://localhost:63342", "https://nowait-user.vercel.app", "https://nowait.co.kr")); // 허용할 출처 설정 config.setAllowedMethods(List.of("GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS")); // 메서드 허용 config.setAllowedHeaders(List.of("*")); //클라이언트가 보낼 수 있는 헤더 config.setExposedHeaders(List.of("Authorization")); //클라이언트(브라우저)가 접근할 수 있는 헤더 지정 From 11053b5ba7791e10e12526ddd71828983ea02d91 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:24:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EA=B0=84?= =?UTF-8?q?=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statistic/repository/StatisticCustomRepository.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/nowait-domain/domain-admin-rdb/src/main/java/com/nowait/domainadminrdb/statistic/repository/StatisticCustomRepository.java b/nowait-domain/domain-admin-rdb/src/main/java/com/nowait/domainadminrdb/statistic/repository/StatisticCustomRepository.java index fcdeeaf7..4bb96013 100644 --- a/nowait-domain/domain-admin-rdb/src/main/java/com/nowait/domainadminrdb/statistic/repository/StatisticCustomRepository.java +++ b/nowait-domain/domain-admin-rdb/src/main/java/com/nowait/domainadminrdb/statistic/repository/StatisticCustomRepository.java @@ -9,8 +9,6 @@ import com.nowait.domainadminrdb.statistic.dto.StoreSales; import com.nowait.domainadminrdb.statistic.dto.TopSalesStoresDetail; - - public interface StatisticCustomRepository { OrderSalesSumDetail findSalesSumByStoreId(Long storeId, LocalDate date); @@ -19,7 +17,6 @@ public interface StatisticCustomRepository { Map findOrderCountByStoreIds(List storeIds); - // redis 사용하는 부분 List findTotalSales(); From 3ef6ea58cba752a7ff4a7f74fcb7fb8069c387d7 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:24:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor(Order):=20=EB=8B=B9=EC=9D=BC=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A7=8C=20=EC=A1=B0=ED=9A=8C=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=ED=95=84=ED=84=B0=EB=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 2 +- .../applicationadmin/order/service/OrderService.java | 8 +++++++- .../domaincorerdb/order/repository/OrderRepository.java | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java index 7022486b..a45365ce 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/controller/OrderController.java @@ -35,7 +35,7 @@ public class OrderController { @GetMapping("/{storeId}") @Operation(summary = "주점별 주문리스트 조회", description = "특정 주점에 대한 예약리스트 조회") - @ApiResponse(responseCode = "200", description = "주리스트 조회") + @ApiResponse(responseCode = "200", description = "주문 리스트 조회") public ResponseEntity getOrderListByStoreId(@PathVariable Long storeId, @AuthenticationPrincipal MemberDetails memberDetails) { List response = orderService.findAllOrders(storeId, memberDetails); diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java index 105afbfe..dfc88532 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/order/service/OrderService.java @@ -1,6 +1,8 @@ package com.nowait.applicationadmin.order.service; import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.List; import java.util.stream.Collectors; @@ -46,7 +48,11 @@ public List findAllOrders(Long storeId, MemberDetails memberDe if (!Role.SUPER_ADMIN.equals(user.getRole()) && !user.getStoreId().equals(storeId)) { throw new OrderViewUnauthorizedException(); } - return orderRepository.findAllByStore_StoreId(storeId) + + LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul")); + LocalDateTime startDateTime = today.atStartOfDay(); + LocalDateTime endDateTime = today.plusDays(1).atStartOfDay(); + return orderRepository.findAllByStore_StoreIdAndCreatedAtBetween(storeId, startDateTime, endDateTime) .stream() .map(OrderResponseDto::fromEntity) .collect(Collectors.toList()); diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java index 01605efc..b1a38e8e 100644 --- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java +++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/order/repository/OrderRepository.java @@ -16,5 +16,5 @@ public interface OrderRepository extends JpaRepository { List findByStore_StoreIdAndTableIdAndSessionId(Long storeId, Long tableId, String sessionId); @EntityGraph(attributePaths = {"orderItems", "orderItems.menu"}) - List findAllByStore_StoreId(Long storeId); + List findAllByStore_StoreIdAndCreatedAtBetween(Long storeId, LocalDateTime startDateTime, LocalDateTime endDateTime); }