From 1c7f21964ac96d8bfae2e9adfefd3e55cfb4da98 Mon Sep 17 00:00:00 2001 From: hoon7566 Date: Tue, 15 Mar 2022 17:48:53 +0900 Subject: [PATCH] =?UTF-8?q?test(store-service):=20getItem=20list=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - getItemList 테스트 작성 --- .../web/OrderCustomerApiControllerTest.java | 32 ++++++++++++------- store-service/src/docs/asciidoc/api-docs.adoc | 3 ++ 2 files changed, 24 insertions(+), 11 deletions(-) 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..6105adc 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 @@ -9,6 +9,8 @@ import com.justpickup.orderservice.domain.order.repository.OrderRepository; import com.justpickup.orderservice.domain.order.service.OrderService; import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto; import com.justpickup.orderservice.domain.orderItemOption.dto.OrderItemOptionDto; +import com.justpickup.orderservice.global.client.store.GetItemResponse; +import com.justpickup.orderservice.global.client.store.OptionType; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; @@ -177,15 +179,15 @@ class OrderCustomerApiControllerTest { void fetchOrder() throws Exception{ //Given FetchOrderDto fetchOrderDto = - new FetchOrderDto(2L,2L,12000L,2L + new FetchOrderDto(2L,2L,12000L,"저스트카페" ,List.of( - OrderItemDto.of(1L,300L,3000L,2L, - List.of(new OrderItemOptionDto(2L) - ,new OrderItemOptionDto(3L)) + new FetchOrderDto.OrderItemDto(1L,1L,"카페라테", + List.of(new GetItemResponse.ItemOptionDto(2L, OptionType.REQUIRED,"Hot") + ,new GetItemResponse.ItemOptionDto(2L, OptionType.OTHER,"샷추카")),3000L,32L) ) - ) ); + given(orderService.fetchOrder(2L)).willReturn(fetchOrderDto); //When @@ -201,12 +203,20 @@ class OrderCustomerApiControllerTest { responseFields( fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"), fieldWithPath("message").description("메시지"), - fieldWithPath("data.storeId").description("매장 고유번호"), - fieldWithPath("data.totalPrice").description("총 합계"), - fieldWithPath("data._orderItemDtos[*].itemId").description("상품 고유번호"), - fieldWithPath("data._orderItemDtos[*].price").description("상품 가격"), - fieldWithPath("data._orderItemDtos[*].count").description("상품 갯수"), - fieldWithPath("data._orderItemDtos[*].itemOptionIds[*]").description("아이템 옵션들") + fieldWithPath("data.id").description("주문 고유번호"), + fieldWithPath("data.userId").description("주문한 유저 고유번호"), + fieldWithPath("data.storeName").description("매장 명"), + fieldWithPath("data.orderPrice").description("총 합계"), + fieldWithPath("data.orderItemDtoList[*].id").description("orderItem 고유번호"), + fieldWithPath("data.orderItemDtoList[*].itemId").description("상품 고유번호"), + fieldWithPath("data.orderItemDtoList[*].itemName").description("상품 명"), + fieldWithPath("data.orderItemDtoList[*].orderItemOptionDtoList[*]").description("아이템 옵션들"), + fieldWithPath("data.orderItemDtoList[*].orderItemOptionDtoList[*].id").description("아이템 옵션 고유번호"), + fieldWithPath("data.orderItemDtoList[*].orderItemOptionDtoList[*].optionType").description("아이템 옵션 타입"), + fieldWithPath("data.orderItemDtoList[*].orderItemOptionDtoList[*].name").description("아이템 옵션명"), + fieldWithPath("data.orderItemDtoList[*].price").description("상품 가격"), + fieldWithPath("data.orderItemDtoList[*].count").description("상품 갯수") + ))); diff --git a/store-service/src/docs/asciidoc/api-docs.adoc b/store-service/src/docs/asciidoc/api-docs.adoc index cdb3467..bdba3b4 100644 --- a/store-service/src/docs/asciidoc/api-docs.adoc +++ b/store-service/src/docs/asciidoc/api-docs.adoc @@ -70,6 +70,9 @@ operation::item-get[snippets='curl-request,http-request,http-response,path-param === 상품 조회 (존재하지 않는 상품) operation::item-get-notExistItemException[snippets='curl-request,http-request,http-response,path-parameters,response-fields'] +=== 상품 리스트 조회(구매자) +operation::customer-itemList-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields'] + === 상품 조회(판매자) operation::owner-item-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']