[feat]order isDel boolean->int로 변경#137

src/main/java/wowmarket/wow_server/domain/Orders.java

@@ -2,6 +2,7 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.ColumnDefault;
 
 import java.time.LocalDateTime;
 
@@ -35,9 +36,9 @@ public class Orders extends BaseEntity {
     @Setter
     private int order_status;
 
-    @Column(columnDefinition="tinyint(0) default 0")
+    @ColumnDefault("0")
     @Setter
-    private boolean isDel;
+    private int isDel;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "buyer_id", referencedColumnName = "user_id")

src/main/java/wowmarket/wow_server/mypage/myorder/controller/MyOrderController.java

@@ -19,17 +19,20 @@ public class MyOrderController {
 
     private final MyOrderService myOrderService;
 
+    //나의 주문폼 목록 불러오기
     @GetMapping()
     public MyOrderFormListResponseDto getMyOrderList(@RequestParam(value = "page", defaultValue = "1", required = false)int page, @AuthenticationPrincipal User user){
         Pageable pageable = PageRequest.of(page - 1, 10);
         return myOrderService.findAllMyOrderForm(pageable, user);
     }
 
+    //나의 주문폼 상세 보기
     @GetMapping("/detail/{order_id}")
     public MyOrderFormDetailResponseDto getMyDetailOrder(@PathVariable Long order_id){
         return myOrderService.findMyOrderFormDetail(order_id);
     }
 
+    //나의 주문폼 취소하기
     @DeleteMapping("/detail/{order_id}")
     public ResponseEntity deleteMyOrder(@PathVariable Long order_id){
         return myOrderService.deleteMyOrderFormDetail(order_id);

src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormResponseDto.java

@@ -14,13 +14,13 @@ public class MyOrderFormResponseDto {
     private String name;
     private LocalDateTime createdtime;
     private int status;
-    private boolean isdel;
+    private int isdel;
 
     public MyOrderFormResponseDto(Orders order){
         this.orderId = order.getId();
         this.name = order.getProject().getName();
         this.createdtime = order.getCreated_time();
         this.status = order.getOrder_status();
-        this.isdel = order.isDel();
+        this.isdel = order.getIsDel();
     }
 }

src/main/java/wowmarket/wow_server/mypage/myorder/service/MyOrderService.java

@@ -54,8 +54,8 @@ public MyOrderFormDetailResponseDto findMyOrderFormDetail(Long order_id){
     public ResponseEntity deleteMyOrderFormDetail(Long order_id){
         Orders orders = orderRepository.findById(order_id)
                 .orElseThrow(()->new ResponseStatusException(HttpStatus.BAD_REQUEST));
-        if (orders.isDel() == false)
-            orders.setDel(true);
+        if (orders.getIsDel() == 0)
+            orders.setIsDel(1);
         return new ResponseEntity(HttpStatus.OK);
     }
 }

src/main/java/wowmarket/wow_server/mypage/myproject/MySalesOrder/service/MySalesOrderService.java

@@ -74,8 +74,8 @@ public MySalesOrderDetailResponseDto findMySalesOrderDetail(Long order_id){
     public ResponseEntity deleteMySalesOrder(Long order_id){
         Orders orders = orderRepository.findById(order_id)
                 .orElseThrow(()->new ResponseStatusException(HttpStatus.BAD_REQUEST));;
-        if (orders.isDel() == false)
-            orders.setDel(true);
+        if (orders.getIsDel() == 0)
+            orders.setIsDel(1);
         return new ResponseEntity(HttpStatus.OK);
     }
 }

src/main/java/wowmarket/wow_server/repository/ItemRepository.java

@@ -17,7 +17,7 @@ public interface ItemRepository extends JpaRepository<Item, Long> {
 
     @Query("SELECT COALESCE(SUM(od.count), 0) FROM OrderDetail od " +
             "WHERE od.item.project = :project " +
-            "AND od.orders.isDel = false")
+            "AND od.orders.isDel = 0")
     int getTotalOrderCountByProject(@Param("project") Project project);
     //OrderDetail이 아닌 Item에서 주문 개수를 고려하여 프로젝트 별 주문 개수의 합을 구하는 쿼리