Merge pull request 9oormthon-univ#71 from 9oormthon-univ/feat/orders

Feat/orders

src/main/java/com/jangburich/domain/menu/service/MenuService.java

@@ -1,22 +1,19 @@
 package com.jangburich.domain.menu.service;
 
-import java.util.List;
-
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.jangburich.domain.menu.domain.Menu;
 import com.jangburich.domain.menu.domain.MenuCreateRequestDTO;
-import com.jangburich.domain.menu.domain.MenuGetResponseDTO;
 import com.jangburich.domain.menu.domain.MenuResponse;
 import com.jangburich.domain.menu.domain.MenuUpdateRequestDTO;
 import com.jangburich.domain.menu.repository.MenuRepository;
 import com.jangburich.domain.owner.domain.Owner;
 import com.jangburich.domain.owner.domain.repository.OwnerRepository;
 import com.jangburich.domain.store.domain.Store;
-import com.jangburich.domain.store.domain.repository.StoreRepository;
+import com.jangburich.domain.store.repository.StoreRepository;
 import com.jangburich.domain.user.domain.User;
 import com.jangburich.domain.user.repository.UserRepository;
 import com.jangburich.global.error.DefaultNullPointerException;

src/main/java/com/jangburich/domain/order/application/OrderService.java

@@ -14,8 +14,8 @@
 import com.jangburich.domain.order.dto.response.CartResponse;
 import com.jangburich.domain.order.dto.response.GetCartItemsResponse;
 import com.jangburich.domain.store.domain.Store;
-import com.jangburich.domain.store.domain.repository.StoreRepository;
-import com.jangburich.domain.store.domain.repository.StoreTeamRepository;
+import com.jangburich.domain.store.repository.StoreRepository;
+import com.jangburich.domain.store.repository.StoreTeamRepository;
 import com.jangburich.domain.team.domain.Team;
 import com.jangburich.domain.team.domain.repository.TeamRepository;
 import com.jangburich.domain.user.domain.User;

src/main/java/com/jangburich/domain/order/domain/repository/CartRepository.java

@@ -2,6 +2,7 @@
 
 import com.jangburich.domain.common.Status;
 import com.jangburich.domain.order.domain.Cart;
+import com.jangburich.domain.order.domain.Orders;
 import com.jangburich.domain.store.domain.Store;
 import com.jangburich.domain.user.domain.User;
 import java.util.List;
@@ -19,4 +20,6 @@ public interface CartRepository extends JpaRepository<Cart, Long> {
     List<Cart> findAllByUserAndStatus(User user, Status status);
 
     List<Cart> findAllByUserAndStoreAndStatus(User user, Store store, Status status);
+
+    List<Cart> findAllByOrders(Orders orders);
 }

src/main/java/com/jangburich/domain/order/domain/repository/OrdersRepository.java

@@ -1,9 +1,38 @@
 package com.jangburich.domain.order.domain.repository;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
+import com.jangburich.domain.order.domain.OrderStatus;
 import com.jangburich.domain.order.domain.Orders;
+import com.jangburich.domain.store.domain.Store;
+
+import org.aspectj.weaver.ast.Or;
+import org.hibernate.query.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface OrdersRepository extends JpaRepository<Orders, Long> {
+	@Query(value = "SELECT * FROM orders WHERE store_id = :storeId AND updated_at < :updatedAt AND order_status = :orderStatus",
+		nativeQuery = true)
+	List<Orders> findOrdersByStoreAndDateAndStatusNative(
+		@Param("storeId") Long storeId,
+		@Param("updatedAt") LocalDateTime updatedAt,
+		@Param("orderStatus") String orderStatus);
+
+	@Query("SELECT o FROM Orders o " +
+		"WHERE o.store.id = :storeId " +
+		"AND o.updatedAt >= :startOfDay " +
+		"AND o.updatedAt < :endOfDay " +
+		"AND o.orderStatus = :orderStatus")
+	List<Orders> findOrdersByStoreAndTodayDateAndStatus(
+		@Param("storeId") Long storeId,
+		@Param("startOfDay") LocalDateTime startOfDay,
+		@Param("endOfDay") LocalDateTime endOfDay,
+		@Param("orderStatus") OrderStatus orderStatus);
+
+
 }

src/main/java/com/jangburich/domain/payment/application/KakaopayService.java

@@ -20,8 +20,8 @@
 import com.jangburich.domain.payment.exception.TeamNotFoundException;
 import com.jangburich.domain.store.domain.Store;
 import com.jangburich.domain.store.domain.StoreTeam;
-import com.jangburich.domain.store.domain.repository.StoreRepository;
-import com.jangburich.domain.store.domain.repository.StoreTeamRepository;
+import com.jangburich.domain.store.repository.StoreRepository;
+import com.jangburich.domain.store.repository.StoreTeamRepository;
 import com.jangburich.domain.store.exception.StoreNotFoundException;
 import com.jangburich.domain.team.domain.Team;
 import com.jangburich.domain.team.domain.repository.TeamRepository;

src/main/java/com/jangburich/domain/store/domain/controller/StoreController.java → src/main/java/com/jangburich/domain/store/controller/StoreController.java

@@ -1,4 +1,6 @@
-package com.jangburich.domain.store.domain.controller;
+package com.jangburich.domain.store.controller;
+
+import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -22,11 +24,14 @@
 import com.jangburich.domain.store.domain.StoreGetResponseDTO;
 import com.jangburich.domain.store.domain.StoreTeamResponseDTO;
 import com.jangburich.domain.store.domain.StoreUpdateRequestDTO;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchCondition;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchConditionWithType;
-import com.jangburich.domain.store.domain.dto.response.PaymentGroupDetailResponse;
-import com.jangburich.domain.store.domain.dto.response.SearchStoresResponse;
-import com.jangburich.domain.store.domain.service.StoreService;
+import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
+import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
+import com.jangburich.domain.store.dto.response.OrdersDetailResponse;
+import com.jangburich.domain.store.dto.response.OrdersGetResponse;
+import com.jangburich.domain.store.dto.response.OrdersTodayResponse;
+import com.jangburich.domain.store.dto.response.PaymentGroupDetailResponse;
+import com.jangburich.domain.store.dto.response.SearchStoresResponse;
+import com.jangburich.domain.store.service.StoreService;
 import com.jangburich.global.payload.Message;
 import com.jangburich.global.payload.ResponseCustom;
 import com.jangburich.utils.parser.AuthenticationParser;
@@ -67,57 +72,71 @@ public ResponseCustom<Page<SearchStoresResponse>> searchStores(
 
 	@Operation(summary = "가게 등록", description = "신규 파트너 가게를 등록합니다.")
 	@PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-	public ResponseCustom<Message> createStore(
-		Authentication authentication,
-		@Parameter(name = "image", description = "업로드 사진 데이터")
-		@RequestPart(value = "image") MultipartFile image,
+	public ResponseCustom<Message> createStore(Authentication authentication,
+		@Parameter(name = "image", description = "업로드 사진 데이터") @RequestPart(value = "image") MultipartFile image,
 		@RequestPart(value = "store") StoreCreateRequestDTO storeCreateRequestDTO) {
 
 		storeService.createStore(AuthenticationParser.parseUserId(authentication), storeCreateRequestDTO, image);
 		return ResponseCustom.OK(Message.builder().message("success").build());
 	}
 
-
 	@Operation(summary = "가게 정보 수정", description = "가게 정보를 수정합니다.")
 	@PatchMapping("/update")
-	public ResponseCustom<Message> updateStore(
-		Authentication authentication,
+	public ResponseCustom<Message> updateStore(Authentication authentication,
 		@RequestBody StoreUpdateRequestDTO storeUpdateRequestDTO) {
 		storeService.updateStore(AuthenticationParser.parseUserId(authentication), storeUpdateRequestDTO);
 		return ResponseCustom.OK(Message.builder().message("success").build());
 	}
 
 	@Operation(summary = "가게 정보 조회", description = "가게 상세 정보를 조회합니다.")
 	@GetMapping("")
-	public ResponseCustom<StoreGetResponseDTO> getStoreInfo(
-		Authentication authentication) {
+	public ResponseCustom<StoreGetResponseDTO> getStoreInfo(Authentication authentication) {
 		return ResponseCustom.OK(storeService.getStoreInfo(AuthenticationParser.parseUserId(authentication)));
 	}
 
 	@Operation(summary = "결제 그룹 조회", description = "장부 결제 그룹을 조회합니다.")
 	@GetMapping("/payment_group")
-	public ResponseCustom<Page<StoreTeamResponseDTO>> getPaymentGroup(
-		Authentication authentication,
+	public ResponseCustom<Page<StoreTeamResponseDTO>> getPaymentGroup(Authentication authentication,
 		Pageable pageable) {
 		return ResponseCustom.OK(
 			storeService.getPaymentGroup(AuthenticationParser.parseUserId(authentication), pageable));
 	}
 
 	@Operation(summary = "결제 그룹 상세 조회", description = "장부 결제 그룹을 상세 조회합니다.")
 	@GetMapping("/payment_group/{teamId}")
-	public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(
-		Authentication authentication, @PathVariable Long teamId,
-		Pageable pageable) {
+	public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(Authentication authentication,
+		@PathVariable Long teamId, Pageable pageable) {
 		return ResponseCustom.OK(
 			storeService.getPaymentGroupDetail(AuthenticationParser.parseUserId(authentication), teamId, pageable));
 	}
 
 	@Operation(summary = "결제 내역 조회", description = "가게에서 일어난 결제 내역을 조회합니다.")
 	@GetMapping("/payment_history")
-	public ResponseCustom<?> getPaymentHistory(
-		Authentication authentication,
-		Pageable pageable) {
+	public ResponseCustom<?> getPaymentHistory(Authentication authentication, Pageable pageable) {
 		return ResponseCustom.OK(
 			storeService.getPaymentHistory(AuthenticationParser.parseUserId(authentication), pageable));
 	}
+
+	@Operation(summary = "지난 주문 조회", description = "가게에 있는 지난 주문을 조회합니다")
+	@GetMapping("/orders/last")
+	public ResponseCustom<List<OrdersGetResponse>> getLastOrders(Authentication authentication) {
+		List<OrdersGetResponse> ordersLast = storeService.getOrdersLast(
+			AuthenticationParser.parseUserId(authentication));
+		return ResponseCustom.OK(ordersLast);
+	}
+
+	@Operation(summary = "오늘 주문 조회", description = "가게에 있는 오늘 주문을 조회합니다")
+	@GetMapping("/orders/today")
+	public ResponseCustom<OrdersTodayResponse> getTodayOrders(Authentication authentication) {
+		return ResponseCustom.OK(storeService.getTodayOrders(
+			AuthenticationParser.parseUserId(authentication)));
+	}
+
+	@Operation(summary = "주문 상세 조회", description = "가게에 있는 주문을 상세 조회합니다")
+	@GetMapping("/orders/{ordersId}")
+	public ResponseCustom<OrdersDetailResponse> getOrders(Authentication authentication, @RequestParam Long orderId) {
+		return ResponseCustom.OK(
+			storeService.getOrderDetails(AuthenticationParser.parseUserId(authentication), orderId));
+	}
+
 }

src/main/java/com/jangburich/domain/store/domain/dto/condition/StoreSearchCondition.java → src/main/java/com/jangburich/domain/store/dto/condition/StoreSearchCondition.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.dto.condition;
+package com.jangburich.domain.store.dto.condition;
 
 public record StoreSearchCondition(
         Double lat,

src/main/java/com/jangburich/domain/store/domain/dto/condition/StoreSearchConditionWithType.java → src/main/java/com/jangburich/domain/store/dto/condition/StoreSearchConditionWithType.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.dto.condition;
+package com.jangburich.domain.store.dto.condition;
 
 import com.querydsl.core.annotations.QueryProjection;
 

src/main/java/com/jangburich/domain/store/dto/response/OrdersDetailResponse.java

@@ -0,0 +1,30 @@
+package com.jangburich.domain.store.dto.response;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class OrdersDetailResponse {
+	private Long id;
+	private String teamName;
+	private String teamUserName;
+	private List<Menu> menus;
+	private LocalDateTime dateTime;
+	private Integer amount;
+	private Integer totalPrice;
+	private Integer discountPrice;
+
+	@Getter
+	@Setter
+	public static class Menu {
+		private String menuName;
+		private Integer amount;
+	}
+}
+

src/main/java/com/jangburich/domain/store/dto/response/OrdersGetResponse.java

@@ -0,0 +1,18 @@
+package com.jangburich.domain.store.dto.response;
+
+import java.time.LocalDateTime;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@RequiredArgsConstructor
+public class OrdersGetResponse {
+	private Long id;
+	private String menuNames;
+	private LocalDateTime date;
+	private Integer count;
+	private Integer price;
+}

src/main/java/com/jangburich/domain/store/dto/response/OrdersTodayResponse.java

@@ -0,0 +1,13 @@
+package com.jangburich.domain.store.dto.response;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class OrdersTodayResponse {
+	private Integer totalPrice;
+	private List<OrdersGetResponse> ordersGetResponses;
+}

src/main/java/com/jangburich/domain/store/domain/dto/response/PaymentGroupDetailResponse.java → src/main/java/com/jangburich/domain/store/dto/response/PaymentGroupDetailResponse.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.dto.response;
+package com.jangburich.domain.store.dto.response;
 
 import org.springframework.data.domain.Page;
 

src/main/java/com/jangburich/domain/store/domain/dto/response/SearchStoresResponse.java → src/main/java/com/jangburich/domain/store/dto/response/SearchStoresResponse.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.dto.response;
+package com.jangburich.domain.store.dto.response;
 
 import com.jangburich.domain.store.domain.Category;
 import com.querydsl.core.annotations.QueryProjection;

src/main/java/com/jangburich/domain/store/exception/OrdersNotFoundException.java

@@ -0,0 +1,7 @@
+package com.jangburich.domain.store.exception;
+
+public class OrdersNotFoundException extends RuntimeException {
+	public OrdersNotFoundException() {
+		super("해당 가게를 찾을 수 없습니다.");
+	}
+}

src/main/java/com/jangburich/domain/store/domain/repository/StoreQueryDslRepository.java → src/main/java/com/jangburich/domain/store/repository/StoreQueryDslRepository.java

@@ -1,9 +1,9 @@
-package com.jangburich.domain.store.domain.repository;
+package com.jangburich.domain.store.repository;
 
 import com.jangburich.domain.store.domain.Category;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchCondition;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchConditionWithType;
-import com.jangburich.domain.store.domain.dto.response.SearchStoresResponse;
+import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
+import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
+import com.jangburich.domain.store.dto.response.SearchStoresResponse;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

src/main/java/com/jangburich/domain/store/domain/repository/StoreQueryDslRepositoryImpl.java → src/main/java/com/jangburich/domain/store/repository/StoreQueryDslRepositoryImpl.java

@@ -1,12 +1,12 @@
-package com.jangburich.domain.store.domain.repository;
+package com.jangburich.domain.store.repository;
 
 import static com.jangburich.domain.store.domain.QStore.store;
 
 import com.jangburich.domain.store.domain.Category;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchCondition;
-import com.jangburich.domain.store.domain.dto.condition.StoreSearchConditionWithType;
-import com.jangburich.domain.store.domain.dto.response.QSearchStoresResponse;
-import com.jangburich.domain.store.domain.dto.response.SearchStoresResponse;
+import com.jangburich.domain.store.dto.condition.StoreSearchCondition;
+import com.jangburich.domain.store.dto.condition.StoreSearchConditionWithType;
+import com.jangburich.domain.store.dto.response.QSearchStoresResponse;
+import com.jangburich.domain.store.dto.response.SearchStoresResponse;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.jpa.impl.JPAQuery;

src/main/java/com/jangburich/domain/store/domain/repository/StoreRepository.java → src/main/java/com/jangburich/domain/store/repository/StoreRepository.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.repository;
+package com.jangburich.domain.store.repository;
 
 import java.util.Optional;
 

src/main/java/com/jangburich/domain/store/domain/repository/StoreTeamRepository.java → src/main/java/com/jangburich/domain/store/repository/StoreTeamRepository.java

@@ -1,4 +1,4 @@
-package com.jangburich.domain.store.domain.repository;
+package com.jangburich.domain.store.repository;
 
 import java.util.Optional;