Fix: User를 사용하는 부분을 userId로 변경[#1]

Lotte-Feelmycode · Sep 23, 2022 · 93d521f · 93d521f
1 parent f4aed27
commit 93d521f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/main/java/com/feelmycode/parabole/controller/OrderController.java b/src/main/java/com/feelmycode/parabole/controller/OrderController.java
@@ -35,8 +35,8 @@ public class OrderController {
     @PostMapping("/create")
     public ResponseEntity createOrder(@RequestParam Long userId,
                                         @RequestBody List<OrderInfo> orderInfoList) {
-        User getUSer = userService.getUser(userId);
-        Order order = new Order(getUSer, orderInfoList, 1, DELIVERY_FEE);
+//        User getUSer = userService.getUser(userId);
+        Order order = new Order(/*getUSer*/userId, orderInfoList, 1, DELIVERY_FEE);
         orderService.saveOrder(order);
         return new ResponseEntity(HttpStatus.CREATED);
     }

diff --git a/src/main/java/com/feelmycode/parabole/domain/Order.java b/src/main/java/com/feelmycode/parabole/domain/Order.java
@@ -27,9 +27,12 @@ public class Order extends BaseEntity {
     @Column(name = "order_id")
     private Long orderId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id")
-    private User user;
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    @JoinColumn(name = "user_id")
+//    private User user;
+
+    @Column(name = "user_id")
+    private Long userId;
 
     @OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
     private List<OrderInfo> orderInfoList = new ArrayList<>();
@@ -69,19 +72,20 @@ public Order() {
     }
     // TODO: 주문상세 정보 list로 추가하기
 
-    public Order(Long orderId, User user, List<OrderInfo> orderInfoList,
+    public Order(Long orderId, Long userId,/*User user,*/ List<OrderInfo> orderInfoList,
         int orderState, long orderDeliveryFee) {
         this.orderId = orderId;
-        this.user = user;
+        this.userId = userId;
         this.orderInfoList = orderInfoList;
         this.setOrderTotal(getOrderInfoList());
         this.orderState = orderState;
         this.orderDeliveryFee = orderDeliveryFee;
     }
 
-    public Order(User user, List<OrderInfo> orderInfoList,
+    public Order(Long userId/*User user*/, List<OrderInfo> orderInfoList,
         int orderState, long orderDeliveryFee) {
-        this.user = user;
+//        this.user = user;
+        this.userId = userId;
         this.orderInfoList = orderInfoList;
         this.setOrderTotal(getOrderInfoList());
         this.orderState = orderState;

diff --git a/src/test/java/com/feelmycode/parabole/service/OrderServiceTest.java b/src/test/java/com/feelmycode/parabole/service/OrderServiceTest.java
@@ -22,31 +22,32 @@ class OrderServiceTest {
     @Test
     public void saveOrder() throws Exception {
         //given
-        Order order = new Order(new User(1L), new ArrayList<OrderInfo>(), 1, 3000L);
+        Order order = new Order(1L/*new User(1L)*/, new ArrayList<OrderInfo>(), 1, 3000L);
 
         // when
         Long orderId = orderService.saveOrder(order);
 
         //then
         Order getOrder = orderService.getOrder(orderId);
 
-        assertEquals("유저", order.getUser().getUserId(), getOrder.getUser().getUserId());
+        assertEquals("유저", order.getUserId()/*order.getUser().getUserId()*/, /*getOrder.getUser().getUserId()*/getOrder.getUserId());
         assertEquals("배달비", order.getOrderDeliveryFee(), getOrder.getOrderDeliveryFee());
         assertEquals("총 금액", order.getOrderTotal(), getOrder.getOrderTotal());
     }
 
     @Test
     public void updateOrder() throws Exception {
         //given
-        Order order = new Order(2L, new User(1L), new ArrayList<OrderInfo>(),1, 3000L);
+        Order order = new Order(2L, 1L/*new User(1L)*/, new ArrayList<OrderInfo>(),1, 3000L);
 
         // when
         Long orderId = orderService.updateOrder(1, 1L, 1L);
 
         //then
         Order getOrder = orderService.getOrder(orderId);
 
-        assertEquals("유저", order.getUser().getUserId(), getOrder.getUser().getUserId());
+//        assertEquals("유저", order.getUser().getUserId(), getOrder.getUser().getUserId());
+        assertEquals("유저", order.getUserId()/*order.getUser().getUserId()*/, /*getOrder.getUser().getUserId()*/getOrder.getUserId());
         assertEquals("배달비", order.getOrderDeliveryFee(), getOrder.getOrderDeliveryFee());
         assertEquals("총 금액", order.getOrderTotal(), getOrder.getOrderTotal());
     }