FEAT:add new status order

rivopelu · Nov 28, 2024 · 8d495a4 · 8d495a4
1 parent 13cd79d
commit 8d495a4
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/src/main/java/com/pos/app/controller/OrderController.java b/src/main/java/com/pos/app/controller/OrderController.java
@@ -4,9 +4,7 @@
 import com.pos.app.model.request.ReqCreateOrder;
 import com.pos.app.model.response.BaseResponse;
 import org.springframework.data.domain.Pageable;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 @BaseController("order")
 public interface OrderController {
@@ -16,4 +14,7 @@ public interface OrderController {
 
     @GetMapping("v1/order-list")
     BaseResponse getOrderList(Pageable pageable);
+
+    @PatchMapping("v1/order-ready/{id}")
+    BaseResponse readyToTakeOrder(@PathVariable("id") String id);
 }
diff --git a/src/main/java/com/pos/app/controller/impl/OrderControllerImpl.java b/src/main/java/com/pos/app/controller/impl/OrderControllerImpl.java
@@ -23,4 +23,9 @@ public BaseResponse createOrder(ReqCreateOrder req) {
     public BaseResponse getOrderList(Pageable pageable) {
         return ResponseHelper.createBaseResponse(orderService.getOrderList(pageable));
     }
+
+    @Override
+    public BaseResponse readyToTakeOrder(String id) {
+        return ResponseHelper.createBaseResponse(orderService.readyToTakeOrder(id));
+    }
 }
diff --git a/src/main/java/com/pos/app/enums/OrderStatusEnum.java b/src/main/java/com/pos/app/enums/OrderStatusEnum.java
@@ -1,5 +1,5 @@
 package com.pos.app.enums;
 
 public enum OrderStatusEnum {
-    OPEN_BILL, COMPLETED, CREATED, IN_PROGRESS
+    COMPLETED, CREATED, IN_PROGRESS, READY
 }
diff --git a/src/main/java/com/pos/app/enums/ResponseEnum.java b/src/main/java/com/pos/app/enums/ResponseEnum.java
@@ -13,5 +13,5 @@ public enum ResponseEnum {
     ACCOUNT_DELETED_SUCCESSFULLY,
     UNAUTHORIZED,
     NUMBER_ALREADY_EXIST,
-    CLIENT_REQUIRED, CLIENT_CATEGORY_ALREADY_EXIST, CATEGORY_NOT_FOUND, PRODUCTS_NOT_FOUND, ORDER_NOT_FOUND, ACCESS_DENIED
+    CLIENT_REQUIRED, CLIENT_CATEGORY_ALREADY_EXIST, CATEGORY_NOT_FOUND, PRODUCTS_NOT_FOUND, ORDER_NOT_FOUND, ORDER_COMPLETED, ACCESS_DENIED
 }
diff --git a/src/main/java/com/pos/app/service/OrderService.java b/src/main/java/com/pos/app/service/OrderService.java
@@ -12,4 +12,6 @@ public interface OrderService {
     ResponseEnum createOrder(ReqCreateOrder req);
 
     Page<ResListOrder> getOrderList(Pageable pageable);
+
+    ResponseEnum readyToTakeOrder(String id);
 }
diff --git a/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java b/src/main/java/com/pos/app/service/impl/OrderServiceImpl.java
@@ -1,6 +1,5 @@
 package com.pos.app.service.impl;
 
-import com.pos.app.controller.OrderController;
 import com.pos.app.entities.Order;
 import com.pos.app.entities.OrderProduct;
 import com.pos.app.entities.Product;
@@ -26,7 +25,6 @@
 
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -147,6 +145,26 @@ public Page<ResListOrder> getOrderList(Pageable pageable) {
         }
     }
 
+    @Override
+    public ResponseEnum readyToTakeOrder(String id) {
+        Optional<Order> findOrder = orderRepository.findById(id);
+        if (findOrder.isEmpty()) {
+            throw new NotFoundException(ResponseEnum.ORDER_NOT_FOUND.name());
+        }
+        Order order = findOrder.get();
+        if (order.getStatus() != OrderStatusEnum.IN_PROGRESS) {
+            throw new BadRequestException(ResponseEnum.ORDER_COMPLETED.name());
+        }
+        order.setStatus(OrderStatusEnum.READY);
+        try {
+            orderRepository.save(order);
+
+            return ResponseEnum.SUCCESS;
+        } catch (Exception e) {
+            throw new SystemErrorException(e);
+        }
+    }
+
     private BigInteger getListTotalTransaction(String orderId) {
         List<Transaction> transactionList = transactionRepository.findAllByOrderId(orderId);
         BigInteger totalTransaction = BigInteger.ZERO;