diff --git a/order-service/src/main/java/com/justpickup/orderservice/OrderServiceApplication.java b/order-service/src/main/java/com/justpickup/orderservice/OrderServiceApplication.java index a785347..698d9fd 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/OrderServiceApplication.java +++ b/order-service/src/main/java/com/justpickup/orderservice/OrderServiceApplication.java @@ -1,17 +1,9 @@ package com.justpickup.orderservice; -import com.justpickup.orderservice.domain.order.entity.Order; -import com.justpickup.orderservice.domain.order.repository.OrderRepository; -import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; -import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption; -import com.justpickup.orderservice.domain.transaction.entity.Transaction; -import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; -import org.springframework.transaction.annotation.Transactional; @SpringBootApplication @EnableEurekaClient @@ -22,38 +14,4 @@ public class OrderServiceApplication { SpringApplication.run(OrderServiceApplication.class, args); } - @Bean - @Transactional - CommandLineRunner run(OrderRepository orderRepository) { - return args -> { - Long userId = 2L; - Long userCouponId = null; - Long storeId = 1L; - Long orderPrice = 1000L; - - for (int i = 1; i <= 20; i++) { - Transaction transaction = Transaction.of(); - - Long itemId = 1L; - Long price = 100L; - Long count = 1L; - OrderItem orderItem = OrderItem.of(itemId + i, price * i, count + i, - OrderItemOption.of(), OrderItemOption.of()); - - OrderItem orderItem1 = OrderItem.of(itemId + i + 1, price * (i + 1), count + (i + 1), - OrderItemOption.of(), OrderItemOption.of()); - - Order order = Order.of(userId, userCouponId, storeId, orderPrice * i, transaction, orderItem, orderItem1); - - if (i % 2 == 0) { - order.placed(); - } else { - order.order(); - } - - orderRepository.save(order); - } - }; - } - } 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 new file mode 100644 index 0000000..8d4e5c4 --- /dev/null +++ b/order-service/src/main/java/com/justpickup/orderservice/global/SqlCommandLineRunner.java @@ -0,0 +1,48 @@ +package com.justpickup.orderservice.global; + +import com.justpickup.orderservice.domain.order.entity.Order; +import com.justpickup.orderservice.domain.order.repository.OrderRepository; +import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; +import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption; +import com.justpickup.orderservice.domain.transaction.entity.Transaction; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class SqlCommandLineRunner implements CommandLineRunner { + + private final OrderRepository orderRepository; + + @Override + public void run(String... args) throws Exception { + Long userId = 2L; + Long userCouponId = null; + Long storeId = 1L; + Long orderPrice = 1000L; + + for (int i = 1; i <= 20; i++) { + Transaction transaction = Transaction.of(); + + Long itemId = 1L; + Long price = 100L; + Long count = 1L; + OrderItem orderItem = OrderItem.of(itemId + i, price * i, count + i, + OrderItemOption.of(), OrderItemOption.of()); + + OrderItem orderItem1 = OrderItem.of(itemId + i + 1, price * (i + 1), count + (i + 1), + OrderItemOption.of(), OrderItemOption.of()); + + Order order = Order.of(userId, userCouponId, storeId, orderPrice * i, transaction, orderItem, orderItem1); + + if (i % 2 == 0) { + order.placed(); + } else { + order.order(); + } + + orderRepository.save(order); + } + } +} diff --git a/order-service/src/main/resources/static/docs/api-docs.html b/order-service/src/main/resources/static/docs/api-docs.html deleted file mode 100644 index 148f1af..0000000 --- a/order-service/src/main/resources/static/docs/api-docs.html +++ /dev/null @@ -1,836 +0,0 @@ - - - - - - - -개요 - - - - - - -
-
-

HTTP 동사

-
-
-

본 REST API에서 사용하는 HTTP 동사(verbs)는 가능한한 표준 HTTP와 REST 규약을 따릅니다.

-
- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
동사용례

GET

리소스를 가져올 때 사용

POST

새 리소스를 만들 때 사용

PUT

기존 리소스를 수정할 때 사용

PATCH

기존 리소스의 일부를 수정할 때 사용

DELETE

기존 리소스를 삭제할 떄 사용

-
-
-
-

HTTP 상태 코드

-
-
-

본 REST API에서 사용하는 HTTP 상태 코드는 가능한 표준 HTTP와 REST 규약을 따릅니다.

-
- ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
상태 코드용례

200 OK

요청을 성공적으로 처리함

201 Created

새 리소스를 성공적으로 생성함. 응답의 Location 헤더에 해당 리소스의 URI가 담겨있다.

204 No Content

기존 리소스를 성공적으로 수정함.

400 Bad Request

잘못된 요청을 보낸 경우. 응답 본문에 더 오류에 대한 정보가 담겨있다.

404 Not Found

요청한 리소스가 없음.

409 Conflict

클라이언트의 요청이 서버의 상태와 충돌이 발생한 경우.

-
-
-
-

snippets 작성 컨벤션

-
-
-

domain-httpRequestCode-etc

-
-
-
-
-

주문

-
-
-

점주 서비스 - 주문 페이지

-
-
    -
  • -

    페이지 offset : 6

    -
    • -
-
-
-

Curl request

-
-
-
$ curl 'http://127.0.0.1:8001/orderMain?orderDate=2022-02-03&lastOrderId=7' -i -X GET
-
-
-
-
-

HTTP request

-
-
-
GET /orderMain?orderDate=2022-02-03&lastOrderId=7 HTTP/1.1
-Host: 127.0.0.1:8001
-
-
-
-
-

HTTP response

-
-
-
HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 769
-
-{
-  "code" : "SUCCESS",
-  "message" : "",
-  "data" : [ {
-    "orderId" : 1,
-    "userId" : 1,
-    "userName" : "닉네임",
-    "orderItemResponses" : [ {
-      "orderItemId" : 100,
-      "itemId" : 100,
-      "itemName" : "아이템1"
-    }, {
-      "orderItemId" : 101,
-      "itemId" : 101,
-      "itemName" : "아이템2"
-    } ],
-    "orderStatus" : "PLACED",
-    "orderTime" : "2022-02-03 14:00:00"
-  }, {
-    "orderId" : 2,
-    "userId" : 1,
-    "userName" : "닉네임",
-    "orderItemResponses" : [ {
-      "orderItemId" : 102,
-      "itemId" : 102,
-      "itemName" : "아이템3"
-    }, {
-      "orderItemId" : 103,
-      "itemId" : 103,
-      "itemName" : "아이템2"
-    } ],
-    "orderStatus" : "CANCELED",
-    "orderTime" : "2022-02-03 15:00:00"
-  } ]
-}
-
-
-
-
-

Request parameters

- ---- - - - - - - - - - - - - - - - - -
ParameterDescription

orderDate

주문 날짜 YYYY-MM-DD

lastOrderId

페이지의 마지막 주문 고유 번호

-
-
-

Response fields

- ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
PathTypeDescription

code

String

결과 코드 SUCCESS/ERROR

message

String

메시지

data[*].orderId

Number

주문 고유 번호

data[*].userId

Number

고객 고유 번호

data[*].userName

String

고객 이름

data[*].orderItemResponses[*].orderItemId

Number

장바구니 고유번호

data[*].orderItemResponses[*].itemId

Number

상품 고유번호

data[*].orderItemResponses[*].itemName

String

상품 이름

data[*].orderStatus

String

주문 상태

data[*].orderTime

String

주문 시간

-
-
-
-

점주 서비스 - 주문 페이지 (잘못된 파라미터 형식)

-
-

Curl request

-
-
-
$ curl 'http://127.0.0.1:8001/orderMain?orderDate=20220203&lastOrderId=7' -i -X GET
-
-
-
-
-

HTTP request

-
-
-
GET /orderMain?orderDate=20220203&lastOrderId=7 HTTP/1.1
-Host: 127.0.0.1:8001
-
-
-
-
-

HTTP response

-
-
-
HTTP/1.1 400 Bad Request
-Content-Type: application/json
-Content-Length: 160
-
-{
-  "code" : "ERROR",
-  "message" : "[orderDate](은)는 YYYY-MM-DD 형식에 맞게 작성되지 않았습니다. 입력된 값: [20220203]",
-  "data" : null
-}
-
-
-
-
-

Request parameters

- ---- - - - - - - - - - - - - - - - - -
ParameterDescription

orderDate

주문 날짜 YYYY-MM-DD

lastOrderId

페이지의 마지막 주문 고유 번호

-
-
-

Response fields

- ----- - - - - - - - - - - - - - - - - - - - - - - - - -
PathTypeDescription

code

String

결과 코드 SUCCESS/ERROR

message

String

메시지

data

Null

데이터

-
-
-
-
-
- - - - - - \ No newline at end of file diff --git a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderControllerTest.java b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderControllerTest.java index a5a68df..b17c477 100644 --- a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderControllerTest.java +++ b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderControllerTest.java @@ -42,9 +42,6 @@ class OrderControllerTest { @MockBean OrderService orderService; - @MockBean - OrderRepository orderRepository; - @Test @DisplayName("[PATCH] 주문 수정") public void patchOrder() throws Exception { diff --git a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderCustomerApiControllerTest.java b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderCustomerApiControllerTest.java index d05625a..78175ff 100644 --- a/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderCustomerApiControllerTest.java +++ b/order-service/src/test/java/com/justpickup/orderservice/domain/order/web/OrderCustomerApiControllerTest.java @@ -55,9 +55,6 @@ class OrderCustomerApiControllerTest { @MockBean OrderService orderService; - @MockBean - OrderRepository orderRepository; - private final String url = "/api/customer/order"; @Test 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 f1e8bb2..9c80c26 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 @@ -62,9 +62,6 @@ class OrderOwnerApiControllerTest { @SpyBean PrevOrderSearchValidator prevOrderSearchValidator; - @MockBean - OrderRepository orderRepository; - private final String url = "/api/owner/order"; @Test