Merge pull request #24 from LikeLion-Hackathon-T1/feat/customer

Feat/customer

.github/workflows/cd.yml

@@ -2,7 +2,7 @@ name: Backend CD # actions 이름
 
 on:
   push:
-    branches: [ feat/toss-payment ]
+    branches: [ feat/customer ]
 
 jobs:
   deploy:

api-module/src/main/java/com/likelion/apimodule/cart/application/CartSaveUseCase.java

@@ -39,16 +39,24 @@ public String saveMyCart(String accessToken, CartSaveReq saveReq) {
         if (findMyCartCount(user.getUserId(), menu.getId()) >= 1) {
 
             Cart cart = cartQueryService.findCartByUserIdAndMenuId(user.getUserId(), menu.getId());
-            cart.setCartQuantity(saveReq.quantity());
+            cart.setCartQuantity(saveReq.quantity() + cart.getQuantity());
+            cartQueryService.saveCart(cart);
 
             return "추가";
         } else {
-            final Cart cart = Cart.builder().user(user).menu(menu).quantity(saveReq.quantity()).build();
+
+            final Cart cart = Cart.builder()
+                    .user(user)
+                    .menu(menu)
+                    .quantity(saveReq.quantity())
+                    .build();
             cartQueryService.saveCart(cart);
+
             return "신규";
         }
     }
 
+
     public void updateMyCart(String accessToken, List<CartUpdateReq> updateReqs) {
 
         String email = jwtUtil.getEmail(accessToken);

api-module/src/main/java/com/likelion/apimodule/customer/application/CustomerFIndUseCase.java

@@ -0,0 +1,92 @@
+package com.likelion.apimodule.customer.application;
+
+import com.likelion.apimodule.customer.dto.TotalOrder;
+import com.likelion.apimodule.order.dto.MenuOrder;
+import com.likelion.coremodule.VisitList.domain.VisitList;
+import com.likelion.coremodule.VisitList.service.VisitListQueryService;
+import com.likelion.coremodule.customer.service.CustomerQueryService;
+import com.likelion.coremodule.menu.domain.Menu;
+import com.likelion.coremodule.menu.service.MenuQueryService;
+import com.likelion.coremodule.order.domain.Order;
+import com.likelion.coremodule.order.domain.OrderItem;
+import com.likelion.coremodule.order.service.OrderQueryService;
+import com.likelion.coremodule.user.application.UserQueryService;
+import com.likelion.coremodule.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class CustomerFIndUseCase {
+
+    private final CustomerQueryService customerQueryService;
+    private final MenuQueryService menuQueryService;
+    private final OrderQueryService orderQueryService;
+    private final UserQueryService userQueryService;
+    private final VisitListQueryService visitListQueryService;
+
+    public List<TotalOrder> getTotalOrder(Long storeId) {
+
+        List<Menu> menus = menuQueryService.findMenusByStoreId(storeId);
+        List<OrderItem> items = new ArrayList<>();
+        for (Menu menu : menus) {
+            List<OrderItem> item = orderQueryService.findOrderItemsByMenuId(menu.getId());
+            items.addAll(item);
+        }
+
+        Map<Long, List<OrderItem>> groupedItems = new HashMap<>();
+        for (OrderItem item : items) {
+            groupedItems.computeIfAbsent(item.getOrder().getId(), k -> new ArrayList<>()).add(item);
+        }
+
+        List<TotalOrder> totalOrders = new ArrayList<>();
+
+        for (Map.Entry<Long, List<OrderItem>> entry : groupedItems.entrySet()) {
+
+            List<OrderItem> orderItems = entry.getValue();
+            Order order = orderQueryService.findOrderById(orderItems.get(0).getOrder().getId());
+            User user = userQueryService.findById(order.getUser().getUserId());
+            VisitList visitList = visitListQueryService.findVisitListByStoreIdAndUserId(storeId, user.getUserId());
+
+            List<MenuOrder> menuOrders = orderItems.stream()
+                    .map(item -> {
+
+                        Menu menu = menuQueryService.findMenuById(item.getMenu().getId());
+
+                        return new MenuOrder(
+                                menu.getName(),
+                                menu.getImageUrl(),
+                                item.getQuantity(),
+                                menu.getPrice() * item.getQuantity()
+                        );
+                    })
+                    .collect(Collectors.toList());
+
+            Integer totalPrice = menuOrders.stream()
+                    .mapToInt(MenuOrder::totalPrice)
+                    .sum();
+
+            TotalOrder totalOrder = new TotalOrder(
+                    order.getPickUpRoute(),
+                    order.getVisitHour().toString(),
+                    order.getVisitMin().toString(),
+                    user.getName(),
+                    visitList.getVisit_status(),
+                    order.getCreatedAt(),
+                    order.getOrderNum(),
+                    menuOrders,
+                    totalPrice
+            );
+
+            totalOrders.add(totalOrder);
+        }
+
+        return totalOrders;
+    }
+}

api-module/src/main/java/com/likelion/apimodule/customer/application/CustomerSaveUseCase.java

@@ -0,0 +1,59 @@
+package com.likelion.apimodule.customer.application;
+
+import com.likelion.apimodule.customer.dto.AddMenu;
+import com.likelion.commonmodule.image.service.AwsS3Service;
+import com.likelion.coremodule.VisitList.domain.VisitList;
+import com.likelion.coremodule.VisitList.service.VisitListQueryService;
+import com.likelion.coremodule.menu.domain.Menu;
+import com.likelion.coremodule.menu.service.MenuQueryService;
+import com.likelion.coremodule.order.domain.Order;
+import com.likelion.coremodule.order.service.OrderQueryService;
+import com.likelion.coremodule.store.domain.Store;
+import com.likelion.coremodule.store.service.StoreQueryService;
+import com.likelion.coremodule.user.application.UserQueryService;
+import com.likelion.coremodule.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class CustomerSaveUseCase {
+
+    private final VisitListQueryService visitListQueryService;
+    private final OrderQueryService orderQueryService;
+    private final UserQueryService userQueryService;
+    private final StoreQueryService storeQueryService;
+    private final AwsS3Service awsS3Service;
+    private final MenuQueryService menuQueryService;
+
+    public void changeToPreparing(Long storeId, Long orderId) {
+
+        Order order = orderQueryService.findOrderById(orderId);
+        User user = userQueryService.findById(order.getUser().getUserId());
+
+        VisitList visitList = visitListQueryService.findVisitListByStoreIdAndUserId(storeId, user.getUserId());
+        visitList.updateToPreparing();
+    }
+
+    public void changeToPrepared(Long storeId, Long orderId) {
+
+        Order order = orderQueryService.findOrderById(orderId);
+        User user = userQueryService.findById(order.getUser().getUserId());
+
+        VisitList visitList = visitListQueryService.findVisitListByStoreIdAndUserId(storeId, user.getUserId());
+        visitList.updateToPrepared();
+    }
+
+    public void addMenuInfo(Long storeId, AddMenu addMenu, MultipartFile multipartFile) {
+
+        Store store = storeQueryService.findStoreById(storeId);
+        String imageUrl = awsS3Service.uploadFile(multipartFile);
+
+        final Menu menu = Menu.builder().store(store).name(addMenu.name()).content(addMenu.content()).
+                imageUrl(imageUrl).price(addMenu.price()).build();
+        menuQueryService.saveMenu(menu);
+    }
+}

api-module/src/main/java/com/likelion/apimodule/customer/dto/AddMenu.java

@@ -0,0 +1,8 @@
+package com.likelion.apimodule.customer.dto;
+
+public record AddMenu(
+        String name,
+        Integer price,
+        String content
+) {
+}

api-module/src/main/java/com/likelion/apimodule/customer/dto/OrderMenu.java

@@ -0,0 +1,7 @@
+package com.likelion.apimodule.customer.dto;
+
+public record OrderMenu(
+        Long menuId,
+        String menuName
+) {
+}

api-module/src/main/java/com/likelion/apimodule/customer/dto/TotalOrder.java

@@ -0,0 +1,20 @@
+package com.likelion.apimodule.customer.dto;
+
+import com.likelion.apimodule.order.dto.MenuOrder;
+import com.likelion.coremodule.VisitList.domain.VisitStatus;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public record TotalOrder(
+        String pickUpRoute,
+        String visitHour,
+        String visitMin,
+        String userName,
+        VisitStatus orderStatus,
+        LocalDateTime createdAt,
+        String orderNum,
+        List<MenuOrder> menu,
+        Integer totalPrice
+) {
+}

api-module/src/main/java/com/likelion/apimodule/customer/presentation/CustomerController.java

@@ -0,0 +1,112 @@
+package com.likelion.apimodule.customer.presentation;
+
+import com.likelion.apimodule.customer.application.CustomerFIndUseCase;
+import com.likelion.apimodule.customer.application.CustomerSaveUseCase;
+import com.likelion.apimodule.customer.dto.AddMenu;
+import com.likelion.apimodule.customer.dto.TotalOrder;
+import com.likelion.commonmodule.exception.common.ApplicationResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/v1/customer")
+@Validated
+@Tag(name = "Customer", description = "Customer 관련 API")
+public class CustomerController {
+
+    private final CustomerFIndUseCase customerFIndUseCase;
+    private final CustomerSaveUseCase customerSaveUseCase;
+
+    // 주문 전체 조회 (정후)
+    @GetMapping("/{storeId}")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "주문 전체 조회",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "주문 전체 조회 API", description = "주문 전체 조회 API 입니다.")
+    public ApplicationResponse<List<TotalOrder>> getTotalOrder(
+            @PathVariable Long storeId
+    ) {
+
+        List<TotalOrder> orders = customerFIndUseCase.getTotalOrder(storeId);
+        return ApplicationResponse.ok(orders);
+    }
+
+    // 접수하는 API (정후)
+    @PostMapping("/{storeId}/{orderId}/preparing")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "주문 접숙하기",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "주문 접수 API", description = "주문 접수 API 입니다.")
+    public ApplicationResponse<String> changeToPreparing(
+            @PathVariable Long storeId,
+            @PathVariable Long orderId
+    ) {
+
+        customerSaveUseCase.changeToPreparing(storeId, orderId);
+        return ApplicationResponse.ok("주문을 접수했습니다.");
+    }
+
+    // 준비 완료 시키는 API (정후)
+    @PostMapping("/{storeId}/{orderId}/prepared")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "주문 준비 완료",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "주문 준비 완료 API", description = "주문 준비 완료 API 입니다.")
+    public ApplicationResponse<String> changeToPrepared(
+            @PathVariable Long storeId,
+            @PathVariable Long orderId
+    ) {
+
+        customerSaveUseCase.changeToPrepared(storeId, orderId);
+        return ApplicationResponse.ok("주문을 준비 완료했습니다.");
+    }
+
+    // 메뉴 추가 API
+    @PostMapping("/{storeId}/addmenu")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "메뉴 추가 완료",
+                            useReturnTypeSchema = true
+                    )
+            }
+    )
+    @Operation(summary = "메뉴 추가 완료 API", description = "메뉴 추가 완료 API 입니다.")
+    public ApplicationResponse<String> addMenuInfo(
+            @PathVariable Long storeId,
+            @RequestPart(value = "dto") AddMenu addMenu,
+            @RequestPart(value = "file") MultipartFile multipartFile) {
+
+        customerSaveUseCase.addMenuInfo(storeId, addMenu, multipartFile);
+        return ApplicationResponse.ok("메뉴 추가가 완료 되었습니다.");
+    }
+
+}

api-module/src/main/java/com/likelion/apimodule/order/presentation/OrderController.java

@@ -5,7 +5,6 @@
 import com.likelion.apimodule.order.dto.OrderDetail;
 import com.likelion.apimodule.order.dto.OrderInfo;
 import com.likelion.apimodule.payment.dto.request.ApprovalRequest;
-import com.likelion.apimodule.payment.dto.response.ApprovalResponse;
 import com.likelion.apimodule.payment.service.PaymentService;
 import com.likelion.commonmodule.exception.common.ApplicationResponse;
 import com.likelion.commonmodule.security.util.AuthConsts;
@@ -104,13 +103,13 @@ public ApplicationResponse<OrderDetail> findMyOrderDetail(
             }
     )
     @Operation(summary = "주문하기(방문리스트 준비중 추가) + 토스 결제 API", description = "주문하기(방문리스트 준비중 추가) + 토스 결제 API 입니다.")
-    public ApplicationResponse<ApprovalResponse> tossPayment(
+    public ApplicationResponse<String> tossPayment(
             @RequestHeader(AuthConsts.ACCESS_TOKEN_HEADER) String accessToken,
             @RequestBody ApprovalRequest request
     ) {
 
-        final ApprovalResponse approval = paymentService.approval(accessToken, request);
-        return ApplicationResponse.ok(approval);
+        paymentService.approval(accessToken, request);
+        return ApplicationResponse.ok("주문 완료");
     }
 
     // 주문 삭제

api-module/src/main/java/com/likelion/apimodule/payment/dto/request/ApprovalRequest.java

@@ -3,7 +3,7 @@
 import java.util.List;
 
 public record ApprovalRequest(
-        List<Long> menuIds,
+        List<Long> cartIds,
         String orderNum,
         String paymentKey,
         Integer amount,