diff --git a/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/NotificationConsumer.java b/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/NotificationConsumer.java index 831a5f8..2026a18 100644 --- a/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/NotificationConsumer.java +++ b/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/NotificationConsumer.java @@ -23,6 +23,7 @@ public class NotificationConsumer { private final ObjectMapper objectMapper; private final NotificationService notificationService; + @Transactional @KafkaListener(topics = "orderPlaced") public void orderPlaced(String kafkaMessage) throws JsonProcessingException { log.debug("## NotificationConsumer.orderPlaced"); diff --git a/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/OrderStatus.java b/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/OrderStatus.java index 49acc9d..6b55509 100644 --- a/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/OrderStatus.java +++ b/notification-service/src/main/java/com/justpickup/notificationservice/domain/notification/messagequeue/OrderStatus.java @@ -12,7 +12,9 @@ public enum OrderStatus { ACCEPTED("주문수락"), REJECTED("주문거절"), WAITING("픽업대기"), - FINISHED("픽업완료"); + FINISHED("픽업완료"), + FAILED("실패"); + private String message; diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java index 09465ea..0fec5e1 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java @@ -83,13 +83,12 @@ public class Order extends BaseEntity { return this; } - public Order setOrderStatus(OrderStatus orderStatus){ + public void setOrderStatus(OrderStatus orderStatus){ this.orderStatus = orderStatus; - return this; } - public void order() { - this.orderStatus = OrderStatus.ORDER; + public void placed() { + this.orderStatus = OrderStatus.PLACED; } /** @@ -104,6 +103,6 @@ public class Order extends BaseEntity { } public void fail() { - this.orderStatus = OrderStatus.FAIL; + this.orderStatus = OrderStatus.FAILED; } } diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderListener.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderListener.java index b5e0890..f20318e 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderListener.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderListener.java @@ -20,16 +20,16 @@ public class OrderListener { @PostUpdate public void postUpdate(Order order){ OrderStatus orderStatus = order.getOrderStatus(); - if (orderStatus == OrderStatus.ORDER) { - log.info("[OrderListener] {}", OrderStatus.ORDER.name()); + if (orderStatus == OrderStatus.PLACED) { + log.info("[OrderListener] {}", OrderStatus.PLACED.name()); try{ orderSender.orderPlaced(OrderSender.KafkaSendOrderDto.createPrimitiveField(order)); }catch (Exception ex){ throw new OrderException(ex.getMessage()); } - } else if (orderStatus == OrderStatus.PLACED) { - log.info("[OrderListener] {}", OrderStatus.PLACED.name()); + } else if (orderStatus == OrderStatus.ACCEPTED) { + log.info("[OrderListener] {}", OrderStatus.ACCEPTED.name()); } } } diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java index 1a1f748..502d78f 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java @@ -1,11 +1,18 @@ package com.justpickup.orderservice.domain.order.entity; +import lombok.Getter; +// 주문 대기 -> 주문 신청 --> 주문수락 -> 픽업대기 -> 픽업완료 +// \ +// ㄴ> 주문거절 +@Getter public enum OrderStatus { - PENDING("주문대기"), - ORDER("주문"), - PLACED("주문수락"), - REJECT("주문거절"), - FAIL("주문실패"); + PENDING("주문대기(장바구니)"), + PLACED("주문신청"), + ACCEPTED("주문수락"), + REJECTED("주문거절"), + WAITING("픽업대기"), + FINISHED("픽업완료"), + FAILED("실패"); private String message; diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java index 3a913db..36132cf 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/repository/OrderRepositoryCustom.java @@ -50,7 +50,7 @@ public class OrderRepositoryCustom { order.orderTime.between(start, end), order.storeId.eq(storeId), order.orderStatus.ne(OrderStatus.PENDING), - order.orderStatus.ne(OrderStatus.FAIL) + order.orderStatus.ne(OrderStatus.FAILED) ) .orderBy(order.id.desc()) .limit(pageSize + 1) diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java index 5ba1aa3..a201a1f 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java @@ -9,15 +9,9 @@ import com.justpickup.orderservice.domain.order.repository.OrderRepositoryCustom import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto; import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption; -import com.justpickup.orderservice.global.client.store.GetItemsResponse; -import com.justpickup.orderservice.global.client.store.GetStoreResponse; -import com.justpickup.orderservice.global.client.store.StoreByUserIdResponse; -import com.justpickup.orderservice.global.client.store.StoreClient; +import com.justpickup.orderservice.global.client.store.*; import com.justpickup.orderservice.global.client.user.GetCustomerResponse; import com.justpickup.orderservice.global.client.user.UserClient; -import com.justpickup.orderservice.global.client.store.GetItemResponse; -import com.justpickup.orderservice.global.client.store.GetStoreReseponse; -import com.justpickup.orderservice.global.client.store.StoreClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; @@ -25,12 +19,10 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.SliceImpl; import org.springframework.data.support.PageableExecutionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; @@ -258,7 +250,7 @@ public class OrderServiceImpl implements OrderService { public void saveOrder(Long userId) { orderRepository.findByUserIdAndOrderStatus(userId, OrderStatus.PENDING) .orElseThrow(() -> new OrderException("장바구니 정보를 찾을 수 없습니다.")) - .order(); + .placed(); } @Override diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/web/OrderController.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/web/OrderController.java index 64eeb1e..86b9eb2 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/web/OrderController.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/web/OrderController.java @@ -26,7 +26,7 @@ public class OrderController { public ResponseEntity patchOrder(@PathVariable("orderId") Long orderId, @RequestBody PatchOrderRequest patchOrderRequest) { OrderStatus orderStatus = patchOrderRequest.getOrderStatus(); - if (orderStatus != OrderStatus.PLACED && orderStatus != OrderStatus.REJECT) { + if (orderStatus != OrderStatus.PLACED && orderStatus != OrderStatus.REJECTED) { throw new OrderException("주문 수락, 거절 외에는 변경 불가능합니다."); } diff --git a/order-service/src/main/java/com/justpickup/orderservice/global/SqlCommandLineRunner.java b/order-service/src/main/java/com/justpickup/orderservice/global/SqlCommandLineRunner.java index bfd9acd..d3fa2a8 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/global/SqlCommandLineRunner.java +++ b/order-service/src/main/java/com/justpickup/orderservice/global/SqlCommandLineRunner.java @@ -77,8 +77,8 @@ public class SqlCommandLineRunner implements CommandLineRunner { } Order order = Order.of(userId, userCouponId, storeId, orderItems); - if (i % 2 == 0) order.setOrderStatus(OrderStatus.ORDER); - else order.setOrderStatus(OrderStatus.REJECT); + if (i % 2 == 0) order.setOrderStatus(OrderStatus.FINISHED); + else order.setOrderStatus(OrderStatus.REJECTED); orders.add(order); } diff --git a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderOwnerApiControllerTest.java b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderOwnerApiControllerTest.java index 64192c6..7289163 100644 --- a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderOwnerApiControllerTest.java +++ b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderOwnerApiControllerTest.java @@ -128,7 +128,7 @@ class OrderOwnerApiControllerTest { } _Order order = _Order.builder() - .id(i).userId(i + 10).orderStatus(OrderStatus.ORDER) + .id(i).userId(i + 10).orderStatus(OrderStatus.ACCEPTED) .orderTime(LocalDateTime.now()).orderItems(orderItems).storeName("가게명" + i) .build(); orders.add(order); @@ -208,7 +208,7 @@ class OrderOwnerApiControllerTest { .id(2L) .userId(1L) .orderItems(List.of(orderItemDto_102, orderItemDto_103)) - .orderStatus(OrderStatus.FAIL) + .orderStatus(OrderStatus.FAILED) .orderTime(LocalDateTime.of(2022, 2, 3, 15, 0, 0)) .build(); orderDto_2.changeUserName("닉네임"); diff --git a/owner-vue/src/router/index.js b/owner-vue/src/router/index.js index 5d593a4..3180761 100644 --- a/owner-vue/src/router/index.js +++ b/owner-vue/src/router/index.js @@ -29,29 +29,29 @@ const routes = [ component: DashboardLayout, beforeEnter: authCheck, children: [ - { - path: "/dashboard", - name: 'dashboard', - component: () => import('./../views/Dashboard') - }, + { path: '/category', name: 'category', + beforeEnter: authCheck, component: () => import('./../views/Category') }, { path: '/menu', name: 'menu', + beforeEnter: authCheck, component: () => import('./../views/Menu') }, { path: '/prev-order', name: 'prev-order', + beforeEnter: authCheck, component: () => import('./../views/PrevOrder') }, { path: '/order', name: 'order', + beforeEnter: authCheck, component: () => import('./../views/Order.vue') } ] diff --git a/owner-vue/src/views/Dashboard.vue b/owner-vue/src/views/Dashboard.vue deleted file mode 100644 index 7eb71a8..0000000 --- a/owner-vue/src/views/Dashboard.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - - - \ No newline at end of file diff --git a/owner-vue/src/views/Layout/Sidebar.vue b/owner-vue/src/views/Layout/Sidebar.vue index c5ac391..384062f 100644 --- a/owner-vue/src/views/Layout/Sidebar.vue +++ b/owner-vue/src/views/Layout/Sidebar.vue @@ -1,10 +1,13 @@