Merge branch 'develop' into develop

src/main/java/com/jangburich/domain/menu/domain/controller/MenuController.java → src/main/java/com/jangburich/domain/menu/controller/MenuController.java

@@ -1,22 +1,24 @@
-package com.jangburich.domain.menu.domain.controller;
+package com.jangburich.domain.menu.controller;
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 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.domain.service.MenuService;
+import com.jangburich.domain.menu.service.MenuService;
 import com.jangburich.global.payload.Message;
 import com.jangburich.global.payload.ResponseCustom;
 import com.jangburich.utils.parser.AuthenticationParser;
@@ -56,9 +58,9 @@ public ResponseCustom<Message> deleteMenu(
 	}
 
 	@GetMapping("")
-	public ResponseCustom<List<MenuGetResponseDTO>> getMenu(
-		Authentication authentication) {
-		List<MenuGetResponseDTO> menu = menuService.getMenu(AuthenticationParser.parseUserId(authentication));
+	public ResponseCustom<Page<MenuResponse>> getMenu(
+		Authentication authentication, Pageable pageable) {
+		Page<MenuResponse> menu = menuService.getMenu(AuthenticationParser.parseUserId(authentication), pageable);
 		return ResponseCustom.OK(menu);
 	}
 }

src/main/java/com/jangburich/domain/menu/domain/MenuResponse.java

@@ -0,0 +1,22 @@
+package com.jangburich.domain.menu.domain;
+
+import com.querydsl.core.annotations.QueryProjection;
+
+public record MenuResponse(
+	Long id,
+	Long storeId,
+	String name,
+	String description,
+	String imageUrl,
+	Integer price
+) {
+	@QueryProjection
+	public MenuResponse(Long id, Long storeId, String name, String description, String imageUrl, Integer price) {
+		this.id = id;
+		this.storeId = storeId;
+		this.name = name;
+		this.description = description;
+		this.imageUrl = imageUrl;
+		this.price = price;
+	}
+}

src/main/java/com/jangburich/domain/menu/repository/MenuRepository.java

@@ -0,0 +1,13 @@
+package com.jangburich.domain.menu.repository;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.jangburich.domain.menu.domain.Menu;
+import com.jangburich.domain.menu.domain.MenuResponse;
+import com.jangburich.domain.store.domain.Store;
+
+public interface MenuRepository extends JpaRepository<Menu, Long> {
+	Page<MenuResponse> findAllByStore(Store store, Pageable pageable);
+}

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

@@ -1,19 +1,19 @@
-package com.jangburich.domain.menu.domain.service;
-
-import java.util.List;
+package com.jangburich.domain.menu.service;
 
+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.domain.repository.MenuRepository;
+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;
@@ -72,7 +72,7 @@ public void deleteMenu(String customOAuthUser, Long id) {
 		menuRepository.delete(menu);
 	}
 
-	public List<MenuGetResponseDTO> getMenu(String customOAuthUser) {
+	public Page<MenuResponse> getMenu(String customOAuthUser, Pageable pageable) {
 		User user = userRepository.findByProviderId(customOAuthUser)
 			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_AUTHENTICATION));
 
@@ -82,10 +82,6 @@ public List<MenuGetResponseDTO> getMenu(String customOAuthUser) {
 		Store store = storeRepository.findByOwner(owner)
 			.orElseThrow(() -> new DefaultNullPointerException(ErrorCode.INVALID_STORE_ID));
 
-		return menuRepository.findAllByStore(store)
-			.stream()
-			.map(menu -> new MenuGetResponseDTO(menu.getId(), menu.getName(), menu.getDescription(), menu.getImageUrl(),
-				menu.getPrice(), menu.getStore().getId()))
-			.toList();
+		return menuRepository.findAllByStore(store,pageable);
 	}
 }

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,11 +1,33 @@
 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.querydsl.jpa.impl.JPAQueryFactory;
-import lombok.RequiredArgsConstructor;
+
 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>, OrdersQueryDslRepository {
+    @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;