Merge pull request #52 from Development-team-1/feign_클라이언트_연동
점주 주문내역, Just Pickup 주문내역 관련 Feign 클라이언트 로직 추가
This commit is contained in:
백창훈
GitHub
@@ -79,20 +79,27 @@ export default {
|
||||
const orders = data.orders;
|
||||
|
||||
orders.forEach( (order) => {
|
||||
let orderItemNames = [];
|
||||
order.orderItems.forEach(orderItem => {
|
||||
orderItemNames.push(orderItem.orderItemName);
|
||||
})
|
||||
|
||||
this.cards.push({
|
||||
orderId: order.orderId,
|
||||
orderTime: order.orderTime,
|
||||
storeName: order.storeName,
|
||||
orderPrice: order.orderPrice,
|
||||
orderStatus: order.orderStatus,
|
||||
orderItemNames: orderItemNames.join(", ")
|
||||
orderStatus: this.getOrderStatusName(order.orderStatus),
|
||||
orderItemNames: this.getOrderItemName(order.orderItems)
|
||||
})
|
||||
});
|
||||
},
|
||||
getOrderStatusName(orderStatus) {
|
||||
if (orderStatus === "REJECT") return "주문 거절";
|
||||
if (orderStatus === "ORDER") return "주문 중";
|
||||
if (orderStatus === "PLACED") return "주문 수락";
|
||||
return orderStatus;
|
||||
},
|
||||
getOrderItemName(orderItems) {
|
||||
const itemSize = orderItems.length;
|
||||
if (itemSize == 1) return orderItems[0].orderItemName;
|
||||
else if (itemSize > 1) return orderItems[0].orderItemName + " 외 " + (itemSize - 1) + "건";
|
||||
else return "없음";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,16 +72,16 @@ operation::order-patch[snippets='curl-request,http-request,http-response,path-pa
|
||||
=== 주문 페이지
|
||||
- 페이지 offset : 6
|
||||
|
||||
operation::orderMain-get[snippets='curl-request,http-request,http-response,request-parameters,response-fields']
|
||||
operation::orderMain-get[snippets='curl-request,http-request,http-response,request-headers,request-parameters,response-fields']
|
||||
=== 점주 서비스 - 주문 페이지 (잘못된 파라미터 형식)
|
||||
|
||||
operation::orderMain-get-badParameterException[snippets='curl-request,http-request,http-response,request-parameters,response-fields']
|
||||
operation::orderMain-get-badParameterException[snippets='curl-request,http-request,http-response,request-headers,request-parameters,response-fields']
|
||||
|
||||
=== 점주 서비스 - 지난 주문 페이지
|
||||
operation::prevOrder-get[snippets='curl-request,http-request,http-response,request-parameters,response-fields']
|
||||
operation::prevOrder-get[snippets='curl-request,http-request,http-response,request-headers,request-parameters,response-fields']
|
||||
|
||||
=== 점주 서비스 - 지난 주문 페이지 (잘못된 파라미터 형식)
|
||||
operation::prevOrder-get-BindException[snippets='curl-request,http-request,http-response,request-parameters,response-fields']
|
||||
operation::prevOrder-get-BindException[snippets='curl-request,http-request,http-response,request-headers,request-parameters,response-fields']
|
||||
|
||||
== Just Pick-up
|
||||
=== 주문 내역 페이지
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
package com.justpickup.orderservice.domain.order.dto;
|
||||
|
||||
import com.justpickup.orderservice.domain.order.entity.Order;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.orderItem.entity.OrderItem;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public class OrderHistoryDto {
|
||||
private Long id;
|
||||
private LocalDateTime orderTime;
|
||||
private long price;
|
||||
private OrderStatus orderStatus;
|
||||
private Long storeId;
|
||||
private String storeName;
|
||||
private List<_OrderHistoryItem> orderItems = new ArrayList<>();
|
||||
|
||||
@Builder
|
||||
public OrderHistoryDto(Long id, LocalDateTime orderTime, long price, OrderStatus orderStatus, Long storeId, String storeName, List<_OrderHistoryItem> orderItems) {
|
||||
this.id = id;
|
||||
this.orderTime = orderTime;
|
||||
this.price = price;
|
||||
this.orderStatus = orderStatus;
|
||||
this.storeId = storeId;
|
||||
this.storeName = storeName;
|
||||
this.orderItems = orderItems;
|
||||
}
|
||||
|
||||
@Getter @NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public static class _OrderHistoryItem {
|
||||
private Long id;
|
||||
private Long itemId;
|
||||
private String itemName;
|
||||
|
||||
@Builder
|
||||
public _OrderHistoryItem(Long id, Long itemId, String itemName) {
|
||||
this.id = id;
|
||||
this.itemId = itemId;
|
||||
this.itemName = itemName;
|
||||
}
|
||||
|
||||
public static _OrderHistoryItem of(OrderItem orderItem) {
|
||||
_OrderHistoryItem orderHistoryItem = new _OrderHistoryItem();
|
||||
orderHistoryItem.id = orderItem.getId();
|
||||
orderHistoryItem.itemId = orderItem.getItemId();
|
||||
return orderHistoryItem;
|
||||
}
|
||||
|
||||
public void changeItemName(String itemName) {
|
||||
this.itemName = itemName;
|
||||
}
|
||||
}
|
||||
|
||||
public static OrderHistoryDto of(Order order) {
|
||||
OrderHistoryDto orderHistoryDto = new OrderHistoryDto();
|
||||
orderHistoryDto.id = order.getId();
|
||||
orderHistoryDto.orderTime = order.getOrderTime();
|
||||
orderHistoryDto.price = order.getOrderPrice();
|
||||
orderHistoryDto.orderStatus = order.getOrderStatus();
|
||||
orderHistoryDto.storeId = order.getUserId();
|
||||
|
||||
orderHistoryDto.orderItems = order.getOrderItems().stream()
|
||||
.map(_OrderHistoryItem::of)
|
||||
.collect(Collectors.toList());
|
||||
return orderHistoryDto;
|
||||
}
|
||||
|
||||
public void changeStoreName(String storeName) {
|
||||
this.storeName = storeName;
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,10 @@ public class OrderMainDto {
|
||||
.orderItems(orderItems)
|
||||
.build();
|
||||
}
|
||||
|
||||
public void changeUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
}
|
||||
|
||||
@Getter @Builder
|
||||
@@ -64,5 +68,9 @@ public class OrderMainDto {
|
||||
.itemId(orderItem.getItemId())
|
||||
.build();
|
||||
}
|
||||
|
||||
public void changeItemName(String itemName) {
|
||||
this.itemName = itemName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
package com.justpickup.orderservice.domain.order.dto;
|
||||
|
||||
import com.justpickup.orderservice.domain.order.entity.Order;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.orderItem.entity.OrderItem;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static java.util.stream.Collectors.toList;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public class PrevOrderDto {
|
||||
private Long id;
|
||||
private OrderStatus orderStatus;
|
||||
private LocalDateTime orderTime;
|
||||
private long orderPrice;
|
||||
private Long userId;
|
||||
private String userName;
|
||||
|
||||
private List<_PrevOrderItem> orderItems = new ArrayList<>();
|
||||
|
||||
@Builder
|
||||
public PrevOrderDto(Long id, OrderStatus orderStatus, LocalDateTime orderTime, long orderPrice, Long userId, String userName, List<_PrevOrderItem> orderItems) {
|
||||
this.id = id;
|
||||
this.orderStatus = orderStatus;
|
||||
this.orderTime = orderTime;
|
||||
this.orderPrice = orderPrice;
|
||||
this.userId = userId;
|
||||
this.userName = userName;
|
||||
this.orderItems = orderItems;
|
||||
}
|
||||
|
||||
@Getter @NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public static class _PrevOrderItem {
|
||||
private Long id;
|
||||
private Long itemId;
|
||||
private String name;
|
||||
|
||||
@Builder
|
||||
public _PrevOrderItem(Long id, Long itemId, String name) {
|
||||
this.id = id;
|
||||
this.itemId = itemId;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
// 생성 메소드
|
||||
static _PrevOrderItem of(OrderItem orderItem) {
|
||||
_PrevOrderItem prevOrderItem = new _PrevOrderItem();
|
||||
prevOrderItem.id = orderItem.getId();
|
||||
prevOrderItem.itemId = orderItem.getItemId();
|
||||
return prevOrderItem;
|
||||
}
|
||||
|
||||
public void changeName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
}
|
||||
|
||||
// 생성 메소드
|
||||
public static PrevOrderDto of(Order order) {
|
||||
PrevOrderDto prevOrder = new PrevOrderDto();
|
||||
prevOrder.id = order.getId();
|
||||
prevOrder.orderStatus = order.getOrderStatus();
|
||||
prevOrder.orderTime = order.getOrderTime();
|
||||
prevOrder.orderPrice = order.getOrderPrice();
|
||||
prevOrder.userId = order.getUserId();
|
||||
|
||||
prevOrder.orderItems = order.getOrderItems()
|
||||
.stream()
|
||||
.map(_PrevOrderItem::of)
|
||||
.collect(toList());
|
||||
|
||||
return prevOrder;
|
||||
}
|
||||
|
||||
public void changeUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -30,11 +30,11 @@ public class Order extends BaseEntity {
|
||||
|
||||
private Long storeId;
|
||||
|
||||
private Long orderPrice;
|
||||
private long orderPrice;
|
||||
|
||||
private LocalDateTime orderTime;
|
||||
|
||||
private Long usedPoint;
|
||||
private long usedPoint;
|
||||
|
||||
@Enumerated(EnumType.STRING)
|
||||
private OrderStatus orderStatus;
|
||||
@@ -46,32 +46,11 @@ public class Order extends BaseEntity {
|
||||
@OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
|
||||
private List<OrderItem> orderItems = new ArrayList<>();
|
||||
|
||||
public static Order of(Long userId, Long userCouponId, Long storeId, Long orderPrice,
|
||||
Transaction transaction, OrderItem... orderItems) {
|
||||
public static Order of(Long userId, Long userCouponId, Long storeId, OrderItem orderItem) {
|
||||
Order order = new Order();
|
||||
order.userId = userId;
|
||||
order.userCouponId = userCouponId;
|
||||
order.storeId = storeId;
|
||||
order.orderPrice = orderPrice;
|
||||
|
||||
order.setTransaction(transaction);
|
||||
for (OrderItem orderItem : orderItems) {
|
||||
order.addOrderItem(orderItem);
|
||||
}
|
||||
|
||||
order.usedPoint = 0L;
|
||||
order.orderStatus = OrderStatus.PLACED;
|
||||
order.orderTime = LocalDateTime.now();
|
||||
return order;
|
||||
}
|
||||
|
||||
public static Order of(Long userId, Long userCouponId, Long storeId, Long orderPrice,
|
||||
OrderItem orderItem) {
|
||||
Order order = new Order();
|
||||
order.userId = userId;
|
||||
order.userCouponId = userCouponId;
|
||||
order.storeId = storeId;
|
||||
order.orderPrice = orderPrice;
|
||||
|
||||
order.addOrderItem(orderItem);
|
||||
|
||||
@@ -81,14 +60,25 @@ public class Order extends BaseEntity {
|
||||
return order;
|
||||
}
|
||||
|
||||
public void setTransaction(Transaction transaction) {
|
||||
this.transaction = transaction;
|
||||
transaction.setOrder(this);
|
||||
public static Order of(Long userId, Long userCouponId, Long storeId, List<OrderItem> orderItems) {
|
||||
Order order = new Order();
|
||||
order.userId = userId;
|
||||
order.userCouponId = userCouponId;
|
||||
order.storeId = storeId;
|
||||
|
||||
for (OrderItem item : orderItems) {
|
||||
order.addOrderItem(item);
|
||||
}
|
||||
|
||||
order.usedPoint = 0L;
|
||||
order.orderStatus = OrderStatus.PENDING;
|
||||
order.orderTime = LocalDateTime.now();
|
||||
return order;
|
||||
}
|
||||
|
||||
public Order addOrderItem(OrderItem orderItem) {
|
||||
this.orderItems.add(orderItem);
|
||||
this.orderPrice += (orderItem.getPrice()*orderItem.getCount());
|
||||
this.orderPrice += orderItem.getTotalPrice();
|
||||
orderItem.setOrder(this);
|
||||
return this;
|
||||
}
|
||||
@@ -98,16 +88,19 @@ public class Order extends BaseEntity {
|
||||
return this;
|
||||
}
|
||||
|
||||
public void placed() {
|
||||
this.orderStatus = OrderStatus.PLACED;
|
||||
}
|
||||
|
||||
public void order() {
|
||||
this.orderStatus = OrderStatus.ORDER;
|
||||
}
|
||||
|
||||
public void reject() {
|
||||
this.orderStatus = OrderStatus.REJECT;
|
||||
/**
|
||||
* 전체 주문 가격 조회
|
||||
*/
|
||||
public int getTotalPrice() {
|
||||
int totalPrice = 0;
|
||||
for (OrderItem orderItem : orderItems) {
|
||||
totalPrice += orderItem.getTotalPrice();
|
||||
}
|
||||
return totalPrice;
|
||||
}
|
||||
|
||||
public void fail() {
|
||||
|
||||
@@ -44,7 +44,7 @@ public class OrderRepositoryCustom {
|
||||
|
||||
List<Order> orders = queryFactory
|
||||
.selectFrom(order)
|
||||
.join(order.transaction).fetchJoin()
|
||||
.leftJoin(order.transaction)
|
||||
.where(
|
||||
orderIdLt(condition.getLastOrderId()),
|
||||
order.orderTime.between(start, end),
|
||||
@@ -75,7 +75,7 @@ public class OrderRepositoryCustom {
|
||||
Long count = queryFactory
|
||||
.select(order.countDistinct())
|
||||
.from(order)
|
||||
.innerJoin(order.transaction)
|
||||
.leftJoin(order.transaction)
|
||||
.where(
|
||||
order.orderTime.between(search.getStartDateTime(), search.getEndDateTime()),
|
||||
order.storeId.eq(storeId)
|
||||
@@ -85,7 +85,7 @@ public class OrderRepositoryCustom {
|
||||
// 데이터 가져오기
|
||||
List<Order> orders = queryFactory
|
||||
.selectFrom(order)
|
||||
.join(order.transaction).fetchJoin()
|
||||
.leftJoin(order.transaction).fetchJoin()
|
||||
.where(
|
||||
order.orderTime.between(search.getStartDateTime(), search.getEndDateTime()),
|
||||
order.storeId.eq(storeId)
|
||||
@@ -103,7 +103,7 @@ public class OrderRepositoryCustom {
|
||||
public SliceImpl<Order> findOrderHistory(Pageable pageable, Long userId) {
|
||||
List<Order> contents = queryFactory
|
||||
.selectFrom(order)
|
||||
.join(order.transaction).fetchJoin()
|
||||
.leftJoin(order.transaction).fetchJoin()
|
||||
.where(
|
||||
order.userId.eq(userId)
|
||||
)
|
||||
|
||||
@@ -8,12 +8,11 @@ import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.SliceImpl;
|
||||
|
||||
public interface OrderService {
|
||||
OrderMainDto findOrderMain(OrderSearchCondition condition, Long storeId);
|
||||
Page<OrderDto> findPrevOrderMain(PrevOrderSearch search, Pageable pageable, Long storeId);
|
||||
SliceImpl<OrderDto> findOrderHistory(Pageable pageable, Long userId);
|
||||
OrderMainDto findOrderMain(OrderSearchCondition condition, Long userId);
|
||||
Page<PrevOrderDto> findPrevOrderMain(PrevOrderSearch search, Pageable pageable, Long userId);
|
||||
SliceImpl<OrderHistoryDto> findOrderHistory(Pageable pageable, Long userId);
|
||||
void addItemToBasket(OrderItemDto orderItemDto,Long storeId, Long userId);
|
||||
FetchOrderDto fetchOrder(Long userId);
|
||||
void saveOrder(Long userId);
|
||||
|
||||
void modifyOrder(Long userId, OrderStatus orderStatus);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,12 @@ 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.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;
|
||||
@@ -22,15 +28,12 @@ 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.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static java.util.stream.Collectors.toList;
|
||||
import static java.util.stream.Collectors.toMap;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -40,47 +43,148 @@ public class OrderServiceImpl implements OrderService {
|
||||
|
||||
private final OrderRepository orderRepository;
|
||||
private final OrderRepositoryCustom orderRepositoryCustom;
|
||||
|
||||
private final OrderSender orderSender;
|
||||
private final StoreClient storeClient;
|
||||
|
||||
private final UserClient userClient;
|
||||
|
||||
@Override
|
||||
public OrderMainDto findOrderMain(OrderSearchCondition condition, Long storeId) {
|
||||
public OrderMainDto findOrderMain(OrderSearchCondition condition, Long userId) {
|
||||
// storeId 가져오기
|
||||
StoreByUserIdResponse storeResponse = storeClient.getStoreByUserId(userId).getData();
|
||||
|
||||
// 주문 가져오기
|
||||
OrderMainResult orderMainResult = orderRepositoryCustom.findOrderMain(condition, storeId);
|
||||
OrderMainResult orderMainResult = orderRepositoryCustom.findOrderMain(condition, storeResponse.getId());
|
||||
|
||||
// 사용자명 및 아이템 이름 가져오기
|
||||
// getUserNameAndItemName(orderDtoList);
|
||||
// 사용자 고유번호 및 아이템 고유번호 필터링
|
||||
Set<Long> userIds = new HashSet<>();
|
||||
Set<Long> itemIds = new HashSet<>();
|
||||
|
||||
return OrderMainDto.of(orderMainResult.getOrders(), orderMainResult.isHasNext());
|
||||
OrderMainDto returnDto = OrderMainDto.of(orderMainResult.getOrders(), orderMainResult.isHasNext());
|
||||
List<OrderMainDto._Order> orders = returnDto.getOrders();
|
||||
|
||||
// userId 및 itemId Set에 추가
|
||||
for (OrderMainDto._Order order : orders) {
|
||||
userIds.add(order.getUserId());
|
||||
for (OrderMainDto._OrderItem orderItem : order.getOrderItems()) {
|
||||
itemIds.add(orderItem.getItemId());
|
||||
}
|
||||
}
|
||||
|
||||
// item name 가져오기
|
||||
Map<Long, String> itemNameMap = getItemNameMap(itemIds);
|
||||
|
||||
// user name 가져오기
|
||||
Map<Long, String> userNameMap = getUserNameMap(userIds);
|
||||
|
||||
// 해당 ID에 맞게 이름 설정해주기
|
||||
for (OrderMainDto._Order order : orders) {
|
||||
String userName = userNameMap.get(order.getUserId());
|
||||
order.changeUserName(userName);
|
||||
for (OrderMainDto._OrderItem orderItem : order.getOrderItems()) {
|
||||
String itemName = itemNameMap.get(orderItem.getItemId());
|
||||
orderItem.changeItemName(itemName);
|
||||
}
|
||||
}
|
||||
|
||||
return returnDto;
|
||||
}
|
||||
|
||||
private Map<Long, String> getUserNameMap(Iterable<Long> userIds) {
|
||||
List<GetCustomerResponse> userResponses = userClient.getCustomers(userIds).getData();
|
||||
return userResponses.stream()
|
||||
.collect(
|
||||
toMap(GetCustomerResponse::getUserId, GetCustomerResponse::getUserName)
|
||||
);
|
||||
}
|
||||
|
||||
private Map<Long, String> getItemNameMap(Iterable<Long> itemIds) {
|
||||
List<GetItemsResponse> itemResponses = storeClient.getItems(itemIds).getData();
|
||||
return itemResponses.stream()
|
||||
.collect(
|
||||
toMap(GetItemsResponse::getId, GetItemsResponse::getName)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Page<OrderDto> findPrevOrderMain(PrevOrderSearch search, Pageable pageable, Long storeId) {
|
||||
Page<Order> orderPage = orderRepositoryCustom.findPrevOrderMain(search, pageable, storeId);
|
||||
public Page<PrevOrderDto> findPrevOrderMain(PrevOrderSearch search, Pageable pageable, Long userId) {
|
||||
StoreByUserIdResponse store = storeClient.getStoreByUserId(userId).getData();
|
||||
|
||||
List<OrderDto> orderDtoList = orderPage.getContent()
|
||||
Page<Order> orderPage = orderRepositoryCustom.findPrevOrderMain(search, pageable, store.getId());
|
||||
|
||||
List<PrevOrderDto> prevOrderDtoList = orderPage.getContent()
|
||||
.stream()
|
||||
.map(OrderDto::createFullField)
|
||||
.map(PrevOrderDto::of)
|
||||
.collect(toList());
|
||||
|
||||
// 사용자명 및 아이템 이름 가져오기
|
||||
// getUserNameAndItemName(orderDtoList);
|
||||
Set<Long> userIds = new HashSet<>();
|
||||
Set<Long> itemIds = new HashSet<>();
|
||||
|
||||
return PageableExecutionUtils.getPage(orderDtoList, pageable, orderPage::getTotalElements);
|
||||
for (PrevOrderDto prevOrderDto : prevOrderDtoList) {
|
||||
userIds.add(prevOrderDto.getUserId());
|
||||
for (PrevOrderDto._PrevOrderItem orderItem : prevOrderDto.getOrderItems()) {
|
||||
itemIds.add(orderItem.getItemId());
|
||||
}
|
||||
}
|
||||
|
||||
// item name 가져오기
|
||||
Map<Long, String> itemNameMap = getItemNameMap(itemIds);
|
||||
|
||||
// user name 가져오기
|
||||
Map<Long, String> userNameMap = getUserNameMap(userIds);
|
||||
|
||||
for (PrevOrderDto prevOrderDto : prevOrderDtoList) {
|
||||
String userName = userNameMap.get(prevOrderDto.getUserId());
|
||||
prevOrderDto.changeUserName(userName);
|
||||
for (PrevOrderDto._PrevOrderItem orderItem : prevOrderDto.getOrderItems()) {
|
||||
String itemName = itemNameMap.get(orderItem.getItemId());
|
||||
orderItem.changeName(itemName);
|
||||
}
|
||||
}
|
||||
|
||||
return PageableExecutionUtils.getPage(prevOrderDtoList, pageable, orderPage::getTotalElements);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SliceImpl<OrderDto> findOrderHistory(Pageable pageable, Long userId) {
|
||||
public SliceImpl<OrderHistoryDto> findOrderHistory(Pageable pageable, Long userId) {
|
||||
SliceImpl<Order> orderHistory = orderRepositoryCustom.findOrderHistory(pageable, userId);
|
||||
|
||||
List<OrderDto> contents = orderHistory.getContent()
|
||||
List<OrderHistoryDto> orderHistoryDtoList = orderHistory.getContent()
|
||||
.stream()
|
||||
.map(OrderDto::createFullField)
|
||||
.map(OrderHistoryDto::of)
|
||||
.collect(toList());
|
||||
|
||||
// TODO: 2022/03/07 Feign Client 통신
|
||||
Set<Long> storeIds = new HashSet<>();
|
||||
Set<Long> itemIds = new HashSet<>();
|
||||
for (OrderHistoryDto orderHistoryDto : orderHistoryDtoList) {
|
||||
storeIds.add(orderHistoryDto.getStoreId());
|
||||
for (OrderHistoryDto._OrderHistoryItem orderItem : orderHistoryDto.getOrderItems()) {
|
||||
itemIds.add(orderItem.getItemId());
|
||||
}
|
||||
}
|
||||
|
||||
return new SliceImpl<>(contents, pageable, orderHistory.hasNext());
|
||||
Map<Long, String> storeNameMap = this.getStoreNameMap(storeIds);
|
||||
Map<Long, String> itemNameMap = this.getItemNameMap(itemIds);
|
||||
|
||||
for (OrderHistoryDto orderHistoryDto : orderHistoryDtoList) {
|
||||
String userName = storeNameMap.get(orderHistoryDto.getStoreId());
|
||||
orderHistoryDto.changeStoreName(userName);
|
||||
for (OrderHistoryDto._OrderHistoryItem orderItem : orderHistoryDto.getOrderItems()) {
|
||||
String itemName = itemNameMap.get(orderItem.getItemId());
|
||||
orderItem.changeItemName(itemName);
|
||||
}
|
||||
}
|
||||
|
||||
return new SliceImpl<>(orderHistoryDtoList, pageable, orderHistory.hasNext());
|
||||
}
|
||||
|
||||
private Map<Long, String> getStoreNameMap(Set<Long> storeIds) {
|
||||
List<GetStoreResponse> storeResponses = storeClient.getStoreAllById(storeIds).getData();
|
||||
Map<Long, String> storeMap = storeResponses.stream()
|
||||
.collect(
|
||||
toMap(GetStoreResponse::getId, GetStoreResponse::getName)
|
||||
);
|
||||
return storeMap;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -107,7 +211,7 @@ public class OrderServiceImpl implements OrderService {
|
||||
.getStoreId().equals(storeId))
|
||||
throw new OrderException("장바구니에 여러 카페의 메뉴를 담을수 없습니다.");
|
||||
}else{
|
||||
orderRepository.save(Order.of(userId,userCouponId,storeId,0L,orderItem));
|
||||
orderRepository.save(Order.of(userId,userCouponId,storeId,orderItem));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.order.exception.OrderException;
|
||||
import com.justpickup.orderservice.domain.order.service.OrderService;
|
||||
import com.justpickup.orderservice.global.dto.Result;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -34,7 +35,7 @@ public class OrderController {
|
||||
return ResponseEntity.ok(Result.createSuccessResult(null));
|
||||
}
|
||||
|
||||
@Data @NoArgsConstructor
|
||||
@Data @NoArgsConstructor @AllArgsConstructor
|
||||
static class PatchOrderRequest {
|
||||
private OrderStatus orderStatus;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.justpickup.orderservice.domain.order.web;
|
||||
|
||||
import com.justpickup.orderservice.domain.order.dto.FetchOrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderHistoryDto;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.order.service.OrderService;
|
||||
import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto;
|
||||
@@ -36,7 +36,7 @@ public class OrderCustomerApiController {
|
||||
@PageableDefault(page = 0, size = 3) Pageable pageable) {
|
||||
Long userId = Long.parseLong(userHeader);
|
||||
|
||||
SliceImpl<OrderDto> orderHistory = orderService.findOrderHistory(pageable, userId);
|
||||
SliceImpl<OrderHistoryDto> orderHistory = orderService.findOrderHistory(pageable, userId);
|
||||
|
||||
OrderHistoryResponse orderHistoryResponse =
|
||||
new OrderHistoryResponse(orderHistory.getContent(), orderHistory.hasNext());
|
||||
@@ -47,45 +47,45 @@ public class OrderCustomerApiController {
|
||||
|
||||
@Data @NoArgsConstructor
|
||||
static class OrderHistoryResponse {
|
||||
private List<_Order> orders;
|
||||
private List<_OrderResponse> orders;
|
||||
private boolean hasNext;
|
||||
|
||||
public OrderHistoryResponse(List<OrderDto> orders, boolean hasNext) {
|
||||
this.orders = orders.stream().map(_Order::new).collect(Collectors.toList());
|
||||
public OrderHistoryResponse(List<OrderHistoryDto> orders, boolean hasNext) {
|
||||
this.orders = orders.stream().map(_OrderResponse::new).collect(Collectors.toList());
|
||||
this.hasNext = hasNext;
|
||||
}
|
||||
|
||||
@Data
|
||||
static class _Order {
|
||||
static class _OrderResponse {
|
||||
private Long orderId;
|
||||
private String orderTime;
|
||||
private OrderStatus orderStatus;
|
||||
private String storeName;
|
||||
private Long orderPrice;
|
||||
private List<_OrderItem> orderItems;
|
||||
private List<_OrderItemResponse> orderItems;
|
||||
|
||||
public _Order(OrderDto orderDto) {
|
||||
this.orderId = orderDto.getId();
|
||||
this.orderTime = orderDto.getOrderTime()
|
||||
public _OrderResponse(OrderHistoryDto orderHistoryDto) {
|
||||
this.orderId = orderHistoryDto.getId();
|
||||
this.orderTime = orderHistoryDto.getOrderTime()
|
||||
.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
|
||||
this.orderStatus = orderDto.getOrderStatus();
|
||||
this.storeName = orderDto.getStoreId().toString();
|
||||
this.orderPrice = orderDto.getOrderPrice();
|
||||
this.orderItems = orderDto.getOrderItemDtoList()
|
||||
this.orderStatus = orderHistoryDto.getOrderStatus();
|
||||
this.storeName = orderHistoryDto.getStoreName();
|
||||
this.orderPrice = orderHistoryDto.getPrice();
|
||||
this.orderItems = orderHistoryDto.getOrderItems()
|
||||
.stream()
|
||||
.map(_OrderItem::new)
|
||||
.map(_OrderItemResponse::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
static class _OrderItem {
|
||||
static class _OrderItemResponse {
|
||||
private Long orderItemId;
|
||||
private String orderItemName;
|
||||
|
||||
public _OrderItem(OrderItemDto orderItemDto) {
|
||||
this.orderItemId = orderItemDto.getItemId();
|
||||
this.orderItemName = orderItemDto.getItemId().toString();
|
||||
public _OrderItemResponse(OrderHistoryDto._OrderHistoryItem orderHistoryItem) {
|
||||
this.orderItemId = orderHistoryItem.getItemId();
|
||||
this.orderItemName = orderHistoryItem.getItemName();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -131,6 +131,4 @@ public class OrderCustomerApiController {
|
||||
return ResponseEntity.status(HttpStatus.CREATED).body(Result.createSuccessResult(null));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.justpickup.orderservice.domain.order.web;
|
||||
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderMainDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderSearchCondition;
|
||||
import com.justpickup.orderservice.domain.order.dto.PrevOrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.PrevOrderSearch;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.order.service.OrderService;
|
||||
import com.justpickup.orderservice.domain.order.validator.PrevOrderSearchValidator;
|
||||
import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto;
|
||||
import com.justpickup.orderservice.global.dto.Result;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
@@ -22,6 +21,7 @@ import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.validation.BindException;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestHeader;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@@ -41,12 +41,11 @@ public class OrderOwnerApiController {
|
||||
private final PrevOrderSearchValidator prevOrderSearchValidator;
|
||||
|
||||
@GetMapping("/order-main")
|
||||
public ResponseEntity<Result> orderMain(@Valid OrderSearchCondition condition) {
|
||||
// TODO: 2022/03/10 Feign client storeId 가져오기 구현 필요
|
||||
Long userId = 1L;
|
||||
Long storeId = 1L;
|
||||
public ResponseEntity<Result> orderMain(@Valid OrderSearchCondition condition,
|
||||
@RequestHeader(value="user-id") String userHeader) {
|
||||
Long userId = Long.valueOf(userHeader);
|
||||
|
||||
OrderMainDto orderMainDto = orderService.findOrderMain(condition, storeId);
|
||||
OrderMainDto orderMainDto = orderService.findOrderMain(condition, userId);
|
||||
|
||||
OrderMainResponse orderMainResponse = new OrderMainResponse(orderMainDto);
|
||||
|
||||
@@ -101,6 +100,7 @@ public class OrderOwnerApiController {
|
||||
@GetMapping("/prev-order")
|
||||
public ResponseEntity<Result> findPrevOrder(@Valid PrevOrderSearch prevOrderSearch,
|
||||
@PageableDefault(page = 0, size = 10) Pageable pageable,
|
||||
@RequestHeader(value="user-id") String userHeader,
|
||||
BindingResult bindingResult) throws BindException {
|
||||
// validation
|
||||
if (bindingResult.hasErrors()) throw new BindException(bindingResult);
|
||||
@@ -108,7 +108,8 @@ public class OrderOwnerApiController {
|
||||
if (bindingResult.hasErrors()) throw new BindException(bindingResult);
|
||||
|
||||
// get data
|
||||
Page<OrderDto> prevOrderMain = orderService.findPrevOrderMain(prevOrderSearch, pageable, 1L);
|
||||
Long userId = Long.valueOf(userHeader);
|
||||
Page<PrevOrderDto> prevOrderMain = orderService.findPrevOrderMain(prevOrderSearch, pageable, userId);
|
||||
|
||||
// format data
|
||||
ResponsePrevOrder responsePrevOrder =
|
||||
@@ -118,42 +119,42 @@ public class OrderOwnerApiController {
|
||||
|
||||
@Data @AllArgsConstructor @NoArgsConstructor
|
||||
static class ResponsePrevOrder {
|
||||
private List<OrderVo> orders;
|
||||
private List<_Order> orders;
|
||||
private Page page;
|
||||
|
||||
public ResponsePrevOrder(List<OrderDto> orderDtoList, int startPage, int totalPage) {
|
||||
orders = orderDtoList.stream().map(OrderVo::new).collect(toList());
|
||||
public ResponsePrevOrder(List<PrevOrderDto> orderDtoList, int startPage, int totalPage) {
|
||||
orders = orderDtoList.stream().map(_Order::new).collect(toList());
|
||||
page = new Page(startPage, totalPage);
|
||||
}
|
||||
|
||||
@Data
|
||||
static class OrderVo {
|
||||
static class _Order {
|
||||
private Long orderId;
|
||||
private OrderStatus orderStatus;
|
||||
private String orderTime;
|
||||
private Long orderPrice;
|
||||
private String userName;
|
||||
private List<OrderItemVo> orderItems;
|
||||
private List<_OrderItem> orderItems;
|
||||
|
||||
public OrderVo(OrderDto orderDto) {
|
||||
this.orderId = orderDto.getId();
|
||||
this.orderStatus = orderDto.getOrderStatus();
|
||||
this.orderTime = orderDto.getOrderTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||
this.orderPrice = orderDto.getOrderPrice();
|
||||
this.userName = orderDto.getUserName();
|
||||
this.orderItems = orderDto.getOrderItemDtoList()
|
||||
.stream().map(OrderItemVo::new).collect(toList());
|
||||
public _Order(PrevOrderDto prevOrderDto) {
|
||||
this.orderId = prevOrderDto.getId();
|
||||
this.orderStatus = prevOrderDto.getOrderStatus();
|
||||
this.orderTime = prevOrderDto.getOrderTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||
this.orderPrice = prevOrderDto.getOrderPrice();
|
||||
this.userName = prevOrderDto.getUserName();
|
||||
this.orderItems = prevOrderDto.getOrderItems()
|
||||
.stream().map(_OrderItem::new).collect(toList());
|
||||
}
|
||||
}
|
||||
|
||||
@Data
|
||||
static class OrderItemVo {
|
||||
static class _OrderItem {
|
||||
private Long orderItemId;
|
||||
private String orderItemName;
|
||||
|
||||
public OrderItemVo(OrderItemDto orderItemDto) {
|
||||
public _OrderItem(PrevOrderDto._PrevOrderItem orderItemDto) {
|
||||
this.orderItemId = orderItemDto.getId();
|
||||
this.orderItemName = orderItemDto.getItemName();
|
||||
this.orderItemName = orderItemDto.getName();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.justpickup.orderservice.domain.orderItem.entity;
|
||||
|
||||
import com.justpickup.orderservice.domain.order.entity.Order;
|
||||
import com.justpickup.orderservice.domain.orderItem.dto.OrderItemDto;
|
||||
import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption;
|
||||
import com.justpickup.orderservice.global.entity.BaseEntity;
|
||||
import lombok.AccessLevel;
|
||||
@@ -65,4 +64,11 @@ public class OrderItem extends BaseEntity {
|
||||
}
|
||||
return orderItem;
|
||||
}
|
||||
|
||||
/**
|
||||
* 주문상품 전체 가격 조회
|
||||
*/
|
||||
public long getTotalPrice() {
|
||||
return price * count;
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,9 @@
|
||||
package com.justpickup.orderservice.global.client.store;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GetItemsResponse {
|
||||
private Long id;
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package com.justpickup.orderservice.global.client.store;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class GetStoreResponse {
|
||||
private Long id;
|
||||
private String name;
|
||||
private String phoneNumber;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.justpickup.orderservice.global.client.store;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class StoreByUserIdResponse {
|
||||
private Long id;
|
||||
private String name;
|
||||
}
|
||||
@@ -4,12 +4,25 @@ import com.justpickup.orderservice.global.dto.Result;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestHeader;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@FeignClient("store-service")
|
||||
@FeignClient("STORE-SERVICE")
|
||||
public interface StoreClient {
|
||||
|
||||
@GetMapping("/item/{itemId}")
|
||||
Result<GetItemResponse> getItem(@PathVariable("itemId") Long itemId);
|
||||
|
||||
@GetMapping("/items/{itemIds}")
|
||||
Result<List<GetItemsResponse>> getItems(@PathVariable("itemIds") Iterable<Long> itemIds);
|
||||
|
||||
@GetMapping("/api/owner/store/")
|
||||
Result<StoreByUserIdResponse> getStoreByUserId(@RequestHeader(value="user-id") Long userId);
|
||||
|
||||
@GetMapping("/stores/{storeId}")
|
||||
Result<List<GetStoreResponse>> getStoreAllById(@PathVariable("storeId") Iterable<Long> storeIds);
|
||||
|
||||
@GetMapping("/store/{storeId}")
|
||||
Result<GetStoreReseponse> getStore(@PathVariable(value = "storeId") String storeId);
|
||||
|
||||
|
||||
@@ -5,9 +5,14 @@ import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
|
||||
@FeignClient(name = "USER-SERVICE", url = "127.0.0.1:8001/user-service")
|
||||
import java.util.List;
|
||||
|
||||
@FeignClient("USER-SERVICE")
|
||||
public interface UserClient {
|
||||
|
||||
@GetMapping("/customer/{userId}")
|
||||
Result<GetCustomerResponse> getUser(@PathVariable("userId") Long userId);
|
||||
Result<GetCustomerResponse> getCustomerById(@PathVariable("userId") Long userId);
|
||||
|
||||
@GetMapping("/customers/{userIds}")
|
||||
Result<List<GetCustomerResponse>> getCustomers(@PathVariable("userIds") Iterable<Long> userIds);
|
||||
}
|
||||
|
||||
@@ -1,836 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="generator" content="Asciidoctor 2.0.10">
|
||||
<title>개요</title>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
|
||||
<style>
|
||||
/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
|
||||
/* Uncomment @import statement to use as custom stylesheet */
|
||||
/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
|
||||
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
|
||||
audio,video{display:inline-block}
|
||||
audio:not([controls]){display:none;height:0}
|
||||
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
|
||||
a{background:none}
|
||||
a:focus{outline:thin dotted}
|
||||
a:active,a:hover{outline:0}
|
||||
h1{font-size:2em;margin:.67em 0}
|
||||
abbr[title]{border-bottom:1px dotted}
|
||||
b,strong{font-weight:bold}
|
||||
dfn{font-style:italic}
|
||||
hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
|
||||
mark{background:#ff0;color:#000}
|
||||
code,kbd,pre,samp{font-family:monospace;font-size:1em}
|
||||
pre{white-space:pre-wrap}
|
||||
q{quotes:"\201C" "\201D" "\2018" "\2019"}
|
||||
small{font-size:80%}
|
||||
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
|
||||
sup{top:-.5em}
|
||||
sub{bottom:-.25em}
|
||||
img{border:0}
|
||||
svg:not(:root){overflow:hidden}
|
||||
figure{margin:0}
|
||||
fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
|
||||
legend{border:0;padding:0}
|
||||
button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
|
||||
button,input{line-height:normal}
|
||||
button,select{text-transform:none}
|
||||
button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
|
||||
button[disabled],html input[disabled]{cursor:default}
|
||||
input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
|
||||
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
|
||||
textarea{overflow:auto;vertical-align:top}
|
||||
table{border-collapse:collapse;border-spacing:0}
|
||||
*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
|
||||
html,body{font-size:100%}
|
||||
body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
|
||||
a:hover{cursor:pointer}
|
||||
img,object,embed{max-width:100%;height:auto}
|
||||
object,embed{height:100%}
|
||||
img{-ms-interpolation-mode:bicubic}
|
||||
.left{float:left!important}
|
||||
.right{float:right!important}
|
||||
.text-left{text-align:left!important}
|
||||
.text-right{text-align:right!important}
|
||||
.text-center{text-align:center!important}
|
||||
.text-justify{text-align:justify!important}
|
||||
.hide{display:none}
|
||||
img,object,svg{display:inline-block;vertical-align:middle}
|
||||
textarea{height:auto;min-height:50px}
|
||||
select{width:100%}
|
||||
.center{margin-left:auto;margin-right:auto}
|
||||
.stretch{width:100%}
|
||||
.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
|
||||
div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
|
||||
a{color:#2156a5;text-decoration:underline;line-height:inherit}
|
||||
a:hover,a:focus{color:#1d4b8f}
|
||||
a img{border:0}
|
||||
p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
|
||||
p aside{font-size:.875em;line-height:1.35;font-style:italic}
|
||||
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
|
||||
h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
|
||||
h1{font-size:2.125em}
|
||||
h2{font-size:1.6875em}
|
||||
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
|
||||
h4,h5{font-size:1.125em}
|
||||
h6{font-size:1em}
|
||||
hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
|
||||
em,i{font-style:italic;line-height:inherit}
|
||||
strong,b{font-weight:bold;line-height:inherit}
|
||||
small{font-size:60%;line-height:inherit}
|
||||
code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
|
||||
ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
|
||||
ul,ol{margin-left:1.5em}
|
||||
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
|
||||
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
|
||||
ul.square{list-style-type:square}
|
||||
ul.circle{list-style-type:circle}
|
||||
ul.disc{list-style-type:disc}
|
||||
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
|
||||
dl dt{margin-bottom:.3125em;font-weight:bold}
|
||||
dl dd{margin-bottom:1.25em}
|
||||
abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
|
||||
abbr{text-transform:none}
|
||||
blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
|
||||
blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
|
||||
blockquote cite::before{content:"\2014 \0020"}
|
||||
blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
|
||||
blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
|
||||
@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
|
||||
h1{font-size:2.75em}
|
||||
h2{font-size:2.3125em}
|
||||
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
|
||||
h4{font-size:1.4375em}}
|
||||
table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
|
||||
table thead,table tfoot{background:#f7f8f7}
|
||||
table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
|
||||
table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
|
||||
table tr.even,table tr.alt{background:#f8f8f7}
|
||||
table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
|
||||
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
|
||||
h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
|
||||
.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
|
||||
.clearfix::after,.float-group::after{clear:both}
|
||||
:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
|
||||
:not(pre)>code.nobreak{word-wrap:normal}
|
||||
:not(pre)>code.nowrap{white-space:nowrap}
|
||||
pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
|
||||
pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
|
||||
pre>code{display:block}
|
||||
pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
|
||||
em em{font-style:normal}
|
||||
strong strong{font-weight:400}
|
||||
.keyseq{color:rgba(51,51,51,.8)}
|
||||
kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
|
||||
.keyseq kbd:first-child{margin-left:0}
|
||||
.keyseq kbd:last-child{margin-right:0}
|
||||
.menuseq,.menuref{color:#000}
|
||||
.menuseq b:not(.caret),.menuref{font-weight:inherit}
|
||||
.menuseq{word-spacing:-.02em}
|
||||
.menuseq b.caret{font-size:1.25em;line-height:.8}
|
||||
.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
|
||||
b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
|
||||
b.button::before{content:"[";padding:0 3px 0 2px}
|
||||
b.button::after{content:"]";padding:0 2px 0 3px}
|
||||
p a>code:hover{color:rgba(0,0,0,.9)}
|
||||
#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
|
||||
#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
|
||||
#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
|
||||
#content{margin-top:1.25em}
|
||||
#content::before{content:none}
|
||||
#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
|
||||
#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
|
||||
#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
|
||||
#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
|
||||
#header .details span:first-child{margin-left:-.125em}
|
||||
#header .details span.email a{color:rgba(0,0,0,.85)}
|
||||
#header .details br{display:none}
|
||||
#header .details br+span::before{content:"\00a0\2013\00a0"}
|
||||
#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
|
||||
#header .details br+span#revremark::before{content:"\00a0|\00a0"}
|
||||
#header #revnumber{text-transform:capitalize}
|
||||
#header #revnumber::after{content:"\00a0"}
|
||||
#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
|
||||
#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
|
||||
#toc>ul{margin-left:.125em}
|
||||
#toc ul.sectlevel0>li>a{font-style:italic}
|
||||
#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
|
||||
#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
|
||||
#toc li{line-height:1.3334;margin-top:.3334em}
|
||||
#toc a{text-decoration:none}
|
||||
#toc a:active{text-decoration:underline}
|
||||
#toctitle{color:#7a2518;font-size:1.2em}
|
||||
@media screen and (min-width:768px){#toctitle{font-size:1.375em}
|
||||
body.toc2{padding-left:15em;padding-right:0}
|
||||
#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
|
||||
#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
|
||||
#toc.toc2>ul{font-size:.9em;margin-bottom:0}
|
||||
#toc.toc2 ul ul{margin-left:0;padding-left:1em}
|
||||
#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
|
||||
body.toc2.toc-right{padding-left:0;padding-right:15em}
|
||||
body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
|
||||
@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
|
||||
#toc.toc2{width:20em}
|
||||
#toc.toc2 #toctitle{font-size:1.375em}
|
||||
#toc.toc2>ul{font-size:.95em}
|
||||
#toc.toc2 ul ul{padding-left:1.25em}
|
||||
body.toc2.toc-right{padding-left:0;padding-right:20em}}
|
||||
#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
|
||||
#content #toc>:first-child{margin-top:0}
|
||||
#content #toc>:last-child{margin-bottom:0}
|
||||
#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
|
||||
#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
|
||||
#content{margin-bottom:.625em}
|
||||
.sect1{padding-bottom:.625em}
|
||||
@media screen and (min-width:768px){#content{margin-bottom:1.25em}
|
||||
.sect1{padding-bottom:1.25em}}
|
||||
.sect1:last-child{padding-bottom:0}
|
||||
.sect1+.sect1{border-top:1px solid #e7e7e9}
|
||||
#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
|
||||
#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
|
||||
#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
|
||||
#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
|
||||
#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
|
||||
details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
|
||||
details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
|
||||
.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
|
||||
table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
|
||||
.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
|
||||
table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
|
||||
.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
|
||||
.admonitionblock>table td.icon{text-align:center;width:80px}
|
||||
.admonitionblock>table td.icon img{max-width:none}
|
||||
.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
|
||||
.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
|
||||
.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
|
||||
.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
|
||||
.exampleblock>.content>:first-child{margin-top:0}
|
||||
.exampleblock>.content>:last-child{margin-bottom:0}
|
||||
.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
|
||||
.sidebarblock>:first-child{margin-top:0}
|
||||
.sidebarblock>:last-child{margin-bottom:0}
|
||||
.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
|
||||
.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
|
||||
.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
|
||||
@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
|
||||
@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
|
||||
.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
|
||||
.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
|
||||
.listingblock>.content{position:relative}
|
||||
.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
|
||||
.listingblock:hover code[data-lang]::before{display:block}
|
||||
.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
|
||||
.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
|
||||
.listingblock pre.highlightjs{padding:0}
|
||||
.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
|
||||
.listingblock pre.prettyprint{border-width:0}
|
||||
.prettyprint{background:#f7f7f8}
|
||||
pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
|
||||
pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
|
||||
pre.prettyprint li code[data-lang]::before{opacity:1}
|
||||
pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
|
||||
table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
|
||||
table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
|
||||
table.linenotable td.code{padding-left:.75em}
|
||||
table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em}
|
||||
pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em}
|
||||
pre.pygments .lineno::before{content:"";margin-right:-.125em}
|
||||
.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
|
||||
.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
|
||||
.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
|
||||
.quoteblock blockquote{margin:0;padding:0;border:0}
|
||||
.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
|
||||
.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
|
||||
.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
|
||||
.verseblock{margin:0 1em 1.25em}
|
||||
.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
|
||||
.verseblock pre strong{font-weight:400}
|
||||
.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
|
||||
.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
|
||||
.quoteblock .attribution br,.verseblock .attribution br{display:none}
|
||||
.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
|
||||
.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
|
||||
.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
|
||||
.quoteblock.abstract{margin:0 1em 1.25em;display:block}
|
||||
.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
|
||||
.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
|
||||
.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
|
||||
.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
|
||||
.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
|
||||
table.tableblock{max-width:100%;border-collapse:separate}
|
||||
p.tableblock:last-child{margin-bottom:0}
|
||||
td.tableblock>.content>:last-child{margin-bottom:-1.25em}
|
||||
td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
|
||||
table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
|
||||
table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
|
||||
table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
|
||||
table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
|
||||
table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
|
||||
table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
|
||||
table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
|
||||
table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
|
||||
table.frame-all{border-width:1px}
|
||||
table.frame-sides{border-width:0 1px}
|
||||
table.frame-topbot,table.frame-ends{border-width:1px 0}
|
||||
table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
|
||||
th.halign-left,td.halign-left{text-align:left}
|
||||
th.halign-right,td.halign-right{text-align:right}
|
||||
th.halign-center,td.halign-center{text-align:center}
|
||||
th.valign-top,td.valign-top{vertical-align:top}
|
||||
th.valign-bottom,td.valign-bottom{vertical-align:bottom}
|
||||
th.valign-middle,td.valign-middle{vertical-align:middle}
|
||||
table thead th,table tfoot th{font-weight:bold}
|
||||
tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
|
||||
tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
|
||||
p.tableblock>code:only-child{background:none;padding:0}
|
||||
p.tableblock{font-size:1em}
|
||||
ol{margin-left:1.75em}
|
||||
ul li ol{margin-left:1.5em}
|
||||
dl dd{margin-left:1.125em}
|
||||
dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
|
||||
ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
|
||||
ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
|
||||
ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
|
||||
ul.unstyled,ol.unstyled{margin-left:0}
|
||||
ul.checklist{margin-left:.625em}
|
||||
ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
|
||||
ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
|
||||
ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
|
||||
ul.inline>li{margin-left:1.25em}
|
||||
.unstyled dl dt{font-weight:400;font-style:normal}
|
||||
ol.arabic{list-style-type:decimal}
|
||||
ol.decimal{list-style-type:decimal-leading-zero}
|
||||
ol.loweralpha{list-style-type:lower-alpha}
|
||||
ol.upperalpha{list-style-type:upper-alpha}
|
||||
ol.lowerroman{list-style-type:lower-roman}
|
||||
ol.upperroman{list-style-type:upper-roman}
|
||||
ol.lowergreek{list-style-type:lower-greek}
|
||||
.hdlist>table,.colist>table{border:0;background:none}
|
||||
.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
|
||||
td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
|
||||
td.hdlist1{font-weight:bold;padding-bottom:1.25em}
|
||||
.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
|
||||
.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
|
||||
.colist td:not([class]):first-child img{max-width:none}
|
||||
.colist td:not([class]):last-child{padding:.25em 0}
|
||||
.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
|
||||
.imageblock.left{margin:.25em .625em 1.25em 0}
|
||||
.imageblock.right{margin:.25em 0 1.25em .625em}
|
||||
.imageblock>.title{margin-bottom:0}
|
||||
.imageblock.thumb,.imageblock.th{border-width:6px}
|
||||
.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
|
||||
.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
|
||||
.image.left{margin-right:.625em}
|
||||
.image.right{margin-left:.625em}
|
||||
a.image{text-decoration:none;display:inline-block}
|
||||
a.image object{pointer-events:none}
|
||||
sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
|
||||
sup.footnote a,sup.footnoteref a{text-decoration:none}
|
||||
sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
|
||||
#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
|
||||
#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
|
||||
#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
|
||||
#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
|
||||
#footnotes .footnote:last-of-type{margin-bottom:0}
|
||||
#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
|
||||
.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
|
||||
.gist .file-data>table td.line-data{width:99%}
|
||||
div.unbreakable{page-break-inside:avoid}
|
||||
.big{font-size:larger}
|
||||
.small{font-size:smaller}
|
||||
.underline{text-decoration:underline}
|
||||
.overline{text-decoration:overline}
|
||||
.line-through{text-decoration:line-through}
|
||||
.aqua{color:#00bfbf}
|
||||
.aqua-background{background:#00fafa}
|
||||
.black{color:#000}
|
||||
.black-background{background:#000}
|
||||
.blue{color:#0000bf}
|
||||
.blue-background{background:#0000fa}
|
||||
.fuchsia{color:#bf00bf}
|
||||
.fuchsia-background{background:#fa00fa}
|
||||
.gray{color:#606060}
|
||||
.gray-background{background:#7d7d7d}
|
||||
.green{color:#006000}
|
||||
.green-background{background:#007d00}
|
||||
.lime{color:#00bf00}
|
||||
.lime-background{background:#00fa00}
|
||||
.maroon{color:#600000}
|
||||
.maroon-background{background:#7d0000}
|
||||
.navy{color:#000060}
|
||||
.navy-background{background:#00007d}
|
||||
.olive{color:#606000}
|
||||
.olive-background{background:#7d7d00}
|
||||
.purple{color:#600060}
|
||||
.purple-background{background:#7d007d}
|
||||
.red{color:#bf0000}
|
||||
.red-background{background:#fa0000}
|
||||
.silver{color:#909090}
|
||||
.silver-background{background:#bcbcbc}
|
||||
.teal{color:#006060}
|
||||
.teal-background{background:#007d7d}
|
||||
.white{color:#bfbfbf}
|
||||
.white-background{background:#fafafa}
|
||||
.yellow{color:#bfbf00}
|
||||
.yellow-background{background:#fafa00}
|
||||
span.icon>.fa{cursor:default}
|
||||
a span.icon>.fa{cursor:inherit}
|
||||
.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
|
||||
.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
|
||||
.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
|
||||
.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
|
||||
.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
|
||||
.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
|
||||
.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
|
||||
.conum[data-value] *{color:#fff!important}
|
||||
.conum[data-value]+b{display:none}
|
||||
.conum[data-value]::after{content:attr(data-value)}
|
||||
pre .conum[data-value]{position:relative;top:-.125em}
|
||||
b.conum *{color:inherit!important}
|
||||
.conum:not([data-value]):empty{display:none}
|
||||
dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
|
||||
h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
|
||||
p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
|
||||
p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
|
||||
p{margin-bottom:1.25rem}
|
||||
.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
|
||||
.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
|
||||
.print-only{display:none!important}
|
||||
@page{margin:1.25cm .75cm}
|
||||
@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
|
||||
html{font-size:80%}
|
||||
a{color:inherit!important;text-decoration:underline!important}
|
||||
a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
|
||||
a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
|
||||
abbr[title]::after{content:" (" attr(title) ")"}
|
||||
pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
|
||||
thead{display:table-header-group}
|
||||
svg{max-width:100%}
|
||||
p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
|
||||
h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
|
||||
#toc,.sidebarblock,.exampleblock>.content{background:none!important}
|
||||
#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
|
||||
body.book #header{text-align:center}
|
||||
body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
|
||||
body.book #header .details{border:0!important;display:block;padding:0!important}
|
||||
body.book #header .details span:first-child{margin-left:0!important}
|
||||
body.book #header .details br{display:block}
|
||||
body.book #header .details br+span::before{content:none!important}
|
||||
body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
|
||||
body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
|
||||
.listingblock code[data-lang]::before{display:block}
|
||||
#footer{padding:0 .9375em}
|
||||
.hide-on-print{display:none!important}
|
||||
.print-only{display:block!important}
|
||||
.hide-for-print{display:none!important}
|
||||
.show-for-print{display:inherit!important}}
|
||||
@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
|
||||
.sect1{padding:0!important}
|
||||
.sect1+.sect1{border:0}
|
||||
#footer{background:none}
|
||||
#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
|
||||
@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
</head>
|
||||
<body id="overview" class="book toc2 toc-left">
|
||||
<div id="header">
|
||||
<h1>개요</h1>
|
||||
<div class="details">
|
||||
<span id="revnumber">version 0.0.1-SNAPSHOT</span>
|
||||
</div>
|
||||
<div id="toc" class="toc2">
|
||||
<div id="toctitle">Table of Contents</div>
|
||||
<ul class="sectlevel1">
|
||||
<li><a href="#overview-http-verbs">HTTP 동사</a></li>
|
||||
<li><a href="#overview-http-status-codes">HTTP 상태 코드</a></li>
|
||||
<li><a href="#snippets-write-convention">snippets 작성 컨벤션</a></li>
|
||||
<li><a href="#_주문">주문</a>
|
||||
<ul class="sectlevel2">
|
||||
<li><a href="#_점주_서비스_주문_페이지">점주 서비스 - 주문 페이지</a></li>
|
||||
<li><a href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식">점주 서비스 - 주문 페이지 (잘못된 파라미터 형식)</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="content">
|
||||
<div class="sect1">
|
||||
<h2 id="overview-http-verbs"><a class="link" href="#overview-http-verbs">HTTP 동사</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>본 REST API에서 사용하는 HTTP 동사(verbs)는 가능한한 표준 HTTP와 REST 규약을 따릅니다.</p>
|
||||
</div>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">동사</th>
|
||||
<th class="tableblock halign-left valign-top">용례</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GET</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">리소스를 가져올 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>POST</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">새 리소스를 만들 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PUT</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 수정할 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PATCH</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스의 일부를 수정할 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>DELETE</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 삭제할 떄 사용</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="overview-http-status-codes"><a class="link" href="#overview-http-status-codes">HTTP 상태 코드</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>본 REST API에서 사용하는 HTTP 상태 코드는 가능한 표준 HTTP와 REST 규약을 따릅니다.</p>
|
||||
</div>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">상태 코드</th>
|
||||
<th class="tableblock halign-left valign-top">용례</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>200 OK</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">요청을 성공적으로 처리함</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>201 Created</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">새 리소스를 성공적으로 생성함. 응답의 <code>Location</code> 헤더에 해당 리소스의 URI가 담겨있다.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>204 No Content</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 성공적으로 수정함.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">잘못된 요청을 보낸 경우. 응답 본문에 더 오류에 대한 정보가 담겨있다.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>404 Not Found</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">요청한 리소스가 없음.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>409 Conflict</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">클라이언트의 요청이 서버의 상태와 충돌이 발생한 경우.</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="snippets-write-convention"><a class="link" href="#snippets-write-convention">snippets 작성 컨벤션</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>domain-httpRequestCode-etc</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="_주문"><a class="link" href="#_주문">주문</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="sect2">
|
||||
<h3 id="_점주_서비스_주문_페이지"><a class="link" href="#_점주_서비스_주문_페이지">점주 서비스 - 주문 페이지</a></h3>
|
||||
<div class="ulist">
|
||||
<ul>
|
||||
<li>
|
||||
<p>페이지 offset : 6</p>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_curl_request"><a class="link" href="#_점주_서비스_주문_페이지_curl_request">Curl request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'http://127.0.0.1:8001/orderMain?orderDate=2022-02-03&lastOrderId=7' -i -X GET</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_http_request"><a class="link" href="#_점주_서비스_주문_페이지_http_request">HTTP request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /orderMain?orderDate=2022-02-03&lastOrderId=7 HTTP/1.1
|
||||
Host: 127.0.0.1:8001</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_http_response"><a class="link" href="#_점주_서비스_주문_페이지_http_response">HTTP response</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">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"
|
||||
} ]
|
||||
}</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_request_parameters"><a class="link" href="#_점주_서비스_주문_페이지_request_parameters">Request parameters</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Parameter</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>orderDate</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">주문 날짜 YYYY-MM-DD</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>lastOrderId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">페이지의 마지막 주문 고유 번호</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_response_fields"><a class="link" href="#_점주_서비스_주문_페이지_response_fields">Response fields</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3334%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Path</th>
|
||||
<th class="tableblock halign-left valign-top">Type</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>code</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">결과 코드 SUCCESS/ERROR</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>message</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">메시지</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">주문 고유 번호</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].userId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">고객 고유 번호</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].userName</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">고객 이름</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderItemResponses[*].orderItemId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">장바구니 고유번호</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderItemResponses[*].itemId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 고유번호</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderItemResponses[*].itemName</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 이름</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderStatus</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">주문 상태</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data[*].orderTime</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">주문 시간</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect2">
|
||||
<h3 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식">점주 서비스 - 주문 페이지 (잘못된 파라미터 형식)</a></h3>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식_curl_request"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식_curl_request">Curl request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'http://127.0.0.1:8001/orderMain?orderDate=20220203&lastOrderId=7' -i -X GET</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식_http_request"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식_http_request">HTTP request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /orderMain?orderDate=20220203&lastOrderId=7 HTTP/1.1
|
||||
Host: 127.0.0.1:8001</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식_http_response"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식_http_response">HTTP response</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 400 Bad Request
|
||||
Content-Type: application/json
|
||||
Content-Length: 160
|
||||
|
||||
{
|
||||
"code" : "ERROR",
|
||||
"message" : "[orderDate](은)는 YYYY-MM-DD 형식에 맞게 작성되지 않았습니다. 입력된 값: [20220203]",
|
||||
"data" : null
|
||||
}</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식_request_parameters"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식_request_parameters">Request parameters</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Parameter</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>orderDate</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">주문 날짜 YYYY-MM-DD</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>lastOrderId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">페이지의 마지막 주문 고유 번호</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_점주_서비스_주문_페이지_잘못된_파라미터_형식_response_fields"><a class="link" href="#_점주_서비스_주문_페이지_잘못된_파라미터_형식_response_fields">Response fields</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3334%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Path</th>
|
||||
<th class="tableblock halign-left valign-top">Type</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>code</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">결과 코드 SUCCESS/ERROR</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>message</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">메시지</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">데이터</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<div id="footer-text">
|
||||
Version 0.0.1-SNAPSHOT<br>
|
||||
Last updated 2022-02-07 18:57:22 +0900
|
||||
</div>
|
||||
</div>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/github.min.css">
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
|
||||
<script>hljs.initHighlighting()</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -42,9 +42,6 @@ class OrderControllerTest {
|
||||
@MockBean
|
||||
OrderService orderService;
|
||||
|
||||
@MockBean
|
||||
OrderRepository orderRepository;
|
||||
|
||||
@Test
|
||||
@DisplayName("[PATCH] 주문 수정")
|
||||
public void patchOrder() throws Exception {
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.justpickup.orderservice.config.TestConfig;
|
||||
import com.justpickup.orderservice.domain.order.dto.FetchOrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderHistoryDto;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.order.repository.OrderRepository;
|
||||
import com.justpickup.orderservice.domain.order.service.OrderService;
|
||||
@@ -57,9 +58,6 @@ class OrderCustomerApiControllerTest {
|
||||
@MockBean
|
||||
OrderService orderService;
|
||||
|
||||
@MockBean
|
||||
OrderRepository orderRepository;
|
||||
|
||||
private final String url = "/api/customer/order";
|
||||
|
||||
@Test
|
||||
@@ -103,21 +101,25 @@ class OrderCustomerApiControllerTest {
|
||||
;
|
||||
}
|
||||
|
||||
private SliceImpl<OrderDto> getWillReturnOrderHistory(Pageable pageable) {
|
||||
private SliceImpl<OrderHistoryDto> getWillReturnOrderHistory(Pageable pageable) {
|
||||
|
||||
List<OrderDto> contents = new ArrayList<>();
|
||||
List<OrderHistoryDto> contents = new ArrayList<>();
|
||||
for (long i = 1; i <= 3; i++) {
|
||||
OrderItemDto orderItemDto_1 = OrderItemDto.builder().id(i * 10).itemId(i * 100).build();
|
||||
OrderItemDto orderItemDto_2 = OrderItemDto.builder().id((i + 1) * 20L).itemId((i + 1) *200L).build();
|
||||
OrderHistoryDto._OrderHistoryItem orderItemDto_1 =
|
||||
OrderHistoryDto._OrderHistoryItem.builder()
|
||||
.id(i * 10).itemId(i * 100).build();
|
||||
OrderHistoryDto._OrderHistoryItem orderItemDto_2 =
|
||||
OrderHistoryDto._OrderHistoryItem.builder()
|
||||
.id((i + 1) * 20L).itemId((i + 1) *200L).build();
|
||||
|
||||
int hour = 20;
|
||||
OrderDto orderDto = OrderDto.builder()
|
||||
OrderHistoryDto orderDto = OrderHistoryDto.builder()
|
||||
.id(i)
|
||||
.orderTime(LocalDateTime.of(2022, 3, 7, --hour, 0, 0))
|
||||
.orderStatus(OrderStatus.PLACED)
|
||||
.storeId(i + 1000)
|
||||
.orderPrice(i * 10_000)
|
||||
.orderItemDtoList(List.of(orderItemDto_1, orderItemDto_2))
|
||||
.price(i * 10_000)
|
||||
.orderItems(List.of(orderItemDto_1, orderItemDto_2))
|
||||
.build();
|
||||
|
||||
contents.add(orderDto);
|
||||
|
||||
@@ -2,12 +2,9 @@ package com.justpickup.orderservice.domain.order.web;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.justpickup.orderservice.config.TestConfig;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderMainDto;
|
||||
import com.justpickup.orderservice.domain.order.dto.*;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderMainDto._Order;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderMainDto._OrderItem;
|
||||
import com.justpickup.orderservice.domain.order.dto.OrderSearchCondition;
|
||||
import com.justpickup.orderservice.domain.order.dto.PrevOrderSearch;
|
||||
import com.justpickup.orderservice.domain.order.entity.OrderStatus;
|
||||
import com.justpickup.orderservice.domain.order.repository.OrderRepository;
|
||||
import com.justpickup.orderservice.domain.order.service.OrderService;
|
||||
@@ -35,6 +32,8 @@ import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
|
||||
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
|
||||
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
|
||||
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
|
||||
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
|
||||
@@ -62,9 +61,6 @@ class OrderOwnerApiControllerTest {
|
||||
@SpyBean
|
||||
PrevOrderSearchValidator prevOrderSearchValidator;
|
||||
|
||||
@MockBean
|
||||
OrderRepository orderRepository;
|
||||
|
||||
private final String url = "/api/owner/order";
|
||||
|
||||
@Test
|
||||
@@ -83,6 +79,7 @@ class OrderOwnerApiControllerTest {
|
||||
// WHEN
|
||||
|
||||
ResultActions actions = mockMvc.perform(get(url + "/order-main")
|
||||
.header("user-id", "1")
|
||||
.param("orderDate", orderDate)
|
||||
.param("lastOrderId", String.valueOf(lastOrderId))
|
||||
);
|
||||
@@ -100,6 +97,9 @@ class OrderOwnerApiControllerTest {
|
||||
parameterWithName("orderDate").description("주문 날짜 YYYY-MM-DD"),
|
||||
parameterWithName("lastOrderId").optional().description("페이지의 마지막 주문 고유 번호")
|
||||
),
|
||||
requestHeaders(
|
||||
headerWithName("user-id").description("유저 고유번호")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
@@ -145,6 +145,7 @@ class OrderOwnerApiControllerTest {
|
||||
|
||||
// WHEN
|
||||
ResultActions actions = mockMvc.perform(get(url + "/order-main")
|
||||
.header("user-id", "1")
|
||||
.param("orderDate", orderDate)
|
||||
.param("lastOrderId", String.valueOf(lastOrderId))
|
||||
);
|
||||
@@ -160,6 +161,9 @@ class OrderOwnerApiControllerTest {
|
||||
parameterWithName("orderDate").description("주문 날짜 YYYY-MM-DD"),
|
||||
parameterWithName("lastOrderId").optional().description("페이지의 마지막 주문 고유 번호")
|
||||
),
|
||||
requestHeaders(
|
||||
headerWithName("user-id").description("유저 고유번호")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
@@ -170,44 +174,44 @@ class OrderOwnerApiControllerTest {
|
||||
;
|
||||
}
|
||||
|
||||
private List<OrderDto> getOrderMainDtoList() {
|
||||
OrderItemDto orderItemDto_100 = OrderItemDto.builder()
|
||||
private List<PrevOrderDto> getOrderMainDtoList() {
|
||||
PrevOrderDto._PrevOrderItem orderItemDto_100 = PrevOrderDto._PrevOrderItem.builder()
|
||||
.id(100L)
|
||||
.itemId(100L)
|
||||
.build();
|
||||
orderItemDto_100.setItemName("아이템1");
|
||||
OrderItemDto orderItemDto_101 = OrderItemDto.builder()
|
||||
orderItemDto_100.changeName("아이템1");
|
||||
PrevOrderDto._PrevOrderItem orderItemDto_101 = PrevOrderDto._PrevOrderItem.builder()
|
||||
.id(101L)
|
||||
.itemId(101L)
|
||||
.build();
|
||||
orderItemDto_101.setItemName("아이템2");
|
||||
OrderItemDto orderItemDto_102 = OrderItemDto.builder()
|
||||
orderItemDto_101.changeName("아이템2");
|
||||
PrevOrderDto._PrevOrderItem orderItemDto_102 = PrevOrderDto._PrevOrderItem.builder()
|
||||
.id(102L)
|
||||
.itemId(102L)
|
||||
.build();
|
||||
orderItemDto_102.setItemName("아이템3");
|
||||
OrderItemDto orderItemDto_103 = OrderItemDto.builder()
|
||||
orderItemDto_102.changeName("아이템3");
|
||||
PrevOrderDto._PrevOrderItem orderItemDto_103 = PrevOrderDto._PrevOrderItem.builder()
|
||||
.id(103L)
|
||||
.itemId(103L)
|
||||
.build();
|
||||
orderItemDto_103.setItemName("아이템2");
|
||||
orderItemDto_103.changeName("아이템2");
|
||||
|
||||
OrderDto orderDto_1 = OrderDto.builder()
|
||||
PrevOrderDto orderDto_1 = PrevOrderDto.builder()
|
||||
.id(1L)
|
||||
.userId(1L)
|
||||
.orderItemDtoList(List.of(orderItemDto_100, orderItemDto_101))
|
||||
.orderItems(List.of(orderItemDto_100, orderItemDto_101))
|
||||
.orderStatus(OrderStatus.PLACED)
|
||||
.orderTime(LocalDateTime.of(2022, 2, 3, 14, 0, 0))
|
||||
.build();
|
||||
orderDto_1.setUserName("닉네임");
|
||||
OrderDto orderDto_2 = OrderDto.builder()
|
||||
orderDto_1.changeUserName("닉네임");
|
||||
PrevOrderDto orderDto_2 = PrevOrderDto.builder()
|
||||
.id(2L)
|
||||
.userId(1L)
|
||||
.orderItemDtoList(List.of(orderItemDto_102, orderItemDto_103))
|
||||
.orderItems(List.of(orderItemDto_102, orderItemDto_103))
|
||||
.orderStatus(OrderStatus.FAIL)
|
||||
.orderTime(LocalDateTime.of(2022, 2, 3, 15, 0, 0))
|
||||
.build();
|
||||
orderDto_2.setUserName("닉네임");
|
||||
orderDto_2.changeUserName("닉네임");
|
||||
|
||||
return List.of(orderDto_1, orderDto_2);
|
||||
}
|
||||
@@ -229,6 +233,7 @@ class OrderOwnerApiControllerTest {
|
||||
|
||||
// WHEN
|
||||
ResultActions actions = mockMvc.perform(get(url + "/prev-order")
|
||||
.header("user-id", "1")
|
||||
.param("startDate", startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
||||
.param("endDate", endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
||||
.param("page", page)
|
||||
@@ -254,6 +259,9 @@ class OrderOwnerApiControllerTest {
|
||||
parameterWithName("endDate").description("종료날짜 YYYY-MM-DD"),
|
||||
parameterWithName("page").optional().description("검색 페이지 (0부터 시작)")
|
||||
),
|
||||
requestHeaders(
|
||||
headerWithName("user-id").description("유저 고유번호")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
@@ -283,6 +291,7 @@ class OrderOwnerApiControllerTest {
|
||||
|
||||
// THEN
|
||||
ResultActions actions = mockMvc.perform(get(url + "/prev-order")
|
||||
.header("user-id", "1")
|
||||
.param("startDate", startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
||||
.param("endDate", endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
|
||||
.param("page", page)
|
||||
@@ -300,6 +309,9 @@ class OrderOwnerApiControllerTest {
|
||||
parameterWithName("endDate").description("종료날짜 YYYY-MM-DD"),
|
||||
parameterWithName("page").optional().description("검색 페이지 (0부터 시작)")
|
||||
),
|
||||
requestHeaders(
|
||||
headerWithName("user-id").description("유저 고유번호")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
|
||||
@@ -39,6 +39,7 @@ spring:
|
||||
- PUT
|
||||
- OPTIONS
|
||||
- DELETE
|
||||
- PATCH
|
||||
allowedHeaders: '*'
|
||||
allow-credentials: true
|
||||
routes:
|
||||
|
||||
@@ -5,7 +5,12 @@
|
||||
<v-spacer></v-spacer>
|
||||
<v-btn outlined color="grey grey lighten-1" small>상세보기</v-btn>
|
||||
</v-toolbar>
|
||||
<v-card-title>{{ itemNames.join(", ") }}</v-card-title>
|
||||
<v-card-title v-if="itemNames.length == 1">
|
||||
{{ itemNames[0] }}
|
||||
</v-card-title>
|
||||
<v-card-title v-if="itemNames.length > 1">
|
||||
{{ itemNames[0] }} 외 {{ itemNames.length - 1 }}건
|
||||
</v-card-title>
|
||||
<v-card-subtitle></v-card-subtitle>
|
||||
<v-card-text>{{ orderTime }}</v-card-text>
|
||||
<v-card-actions>
|
||||
@@ -56,7 +61,7 @@ export default {
|
||||
},
|
||||
props: {
|
||||
id: Number,
|
||||
userName: Number,
|
||||
userName: String,
|
||||
itemNames: [],
|
||||
orderTime: String,
|
||||
orderStatus: String
|
||||
|
||||
@@ -49,24 +49,11 @@ export default {
|
||||
'date-picker': DatePicker
|
||||
},
|
||||
mounted: function() {
|
||||
orderApi.requestPrevOrder(this.startDate, this.endDate, this.page - 1)
|
||||
.then( (response) => {
|
||||
this.renderList(response.data);
|
||||
})
|
||||
.catch( (error) => {
|
||||
console.log(error);
|
||||
});
|
||||
this.search();
|
||||
},
|
||||
watch: {
|
||||
"page": function (newPage) {
|
||||
orderApi.requestPrevOrder(this.startDate, this.endDate, newPage - 1)
|
||||
.then( (response) => {
|
||||
this.renderList(response.data);
|
||||
})
|
||||
.catch( (error) => {
|
||||
console.log(error);
|
||||
console.log(error.response.data);
|
||||
});
|
||||
"page": function () {
|
||||
this.search();
|
||||
}
|
||||
},
|
||||
data: function() {
|
||||
@@ -98,7 +85,6 @@ export default {
|
||||
orders: [],
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
search: function() {
|
||||
if(!this.checkDate()) return;
|
||||
@@ -116,16 +102,12 @@ export default {
|
||||
|
||||
this.orders = [];
|
||||
orders.forEach(order => {
|
||||
let orderItemNames = [];
|
||||
order.orderItems.forEach(orderItem => {
|
||||
orderItemNames.push(orderItem.orderItemId);
|
||||
})
|
||||
|
||||
this.orders.push({
|
||||
orderId: order.orderId,
|
||||
orderStatus: order.orderStatus,
|
||||
orderStatus: this.getOrderStatusName(order.orderStatus),
|
||||
orderTime: order.orderTime,
|
||||
orderItemNames: orderItemNames.join(", "),
|
||||
orderItemNames: this.getOrderItemName(order.orderItems),
|
||||
orderPrice: order.orderPrice,
|
||||
userName: order.userName
|
||||
});
|
||||
@@ -154,6 +136,21 @@ export default {
|
||||
},
|
||||
inputEndDate: function(value) {
|
||||
this.endDate = value;
|
||||
},
|
||||
getOrderStatusName: function(orderStatus) {
|
||||
if (orderStatus === "ORDER") return "주문";
|
||||
if (orderStatus === "PLACED") return "주문 수락";
|
||||
if (orderStatus === "REJECT") return "주문 거절";
|
||||
return orderStatus;
|
||||
},
|
||||
getOrderItemName: function(orderItems) {
|
||||
const orderItemLength = orderItems.length;
|
||||
const orderItemName = orderItems[0].orderItemName;
|
||||
if (orderItemLength == 1) {
|
||||
return orderItemName;
|
||||
} else if (orderItemLength > 1) {
|
||||
return orderItemName + " 외 " + (orderItemLength - 1) + "건";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,13 @@ domain-httpRequestCode-etc
|
||||
operation::item-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
=== 상품 조회 (존재하지 않는 상품)
|
||||
operation::item-get-notExistItemException[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
=== 상품 리스트 조회
|
||||
operation::items-get[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']
|
||||
|
||||
@@ -92,9 +98,6 @@ operation::get-categoryList[snippets='curl-request,http-request,http-response,re
|
||||
operation::put-categoryList[snippets='curl-request,http-request,http-response,request-body,request-fields']
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
== 매장
|
||||
=== 매장 검색 조회
|
||||
operation::api-customer-store-search[snippets='curl-request,http-request,http-response,request-parameters,response-fields']
|
||||
@@ -102,4 +105,7 @@ operation::api-customer-store-search[snippets='curl-request,http-request,http-re
|
||||
operation::favoriteStore-get[snippets='curl-request,http-request,http-response,request-headers,request-parameters,response-fields']
|
||||
=== 매장 조회
|
||||
operation::store-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
|
||||
=== 매장 조회 (회원 고유번호)
|
||||
operation::api-get-store-byUserId[snippets='curl-request,http-request,http-response,request-headers,response-fields']
|
||||
=== 매장 리스트 조회
|
||||
operation::stores-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.justpickup.storeservice.domain.item.dto;
|
||||
|
||||
import com.justpickup.storeservice.domain.item.entity.Item;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Getter @NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public class ItemsDto {
|
||||
private Long itemId;
|
||||
private String itemName;
|
||||
|
||||
@Builder
|
||||
public ItemsDto(Long itemId, String itemName) {
|
||||
this.itemId = itemId;
|
||||
this.itemName = itemName;
|
||||
}
|
||||
|
||||
public static ItemsDto of(Item item) {
|
||||
ItemsDto itemsDto = new ItemsDto();
|
||||
itemsDto.itemId = item.getId();
|
||||
itemsDto.itemName = item.getName();
|
||||
return itemsDto;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package com.justpickup.storeservice.domain.item.service;
|
||||
import com.justpickup.storeservice.domain.item.dto.FetchItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.GetItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemsDto;
|
||||
import com.justpickup.storeservice.domain.itemoption.dto.ItemOptionDto;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
@@ -16,9 +17,11 @@ public interface ItemService {
|
||||
List<GetItemDto> getItemAndItemOptions(List<Long> itemIds);
|
||||
FetchItemDto fetchItem(Long itemId);
|
||||
|
||||
Page<ItemDto> findItemList(Long userId,String word, Pageable pageable);
|
||||
Page<ItemDto> findMenuItemList(Long userId, String word, Pageable pageable);
|
||||
|
||||
void putItem(Long itemId, String itemName, Long itemPrice, Long categoryId, List<ItemOptionDto> itemOptionDtos);
|
||||
|
||||
void createItem( Long userId, String itemName, Long itemPrice, Long categoryId, List<ItemOptionDto> itemOptionDtos);
|
||||
|
||||
List<ItemsDto> findItems(List<Long> itemIds);
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.justpickup.storeservice.domain.category.repository.CategoryRepository
|
||||
import com.justpickup.storeservice.domain.item.dto.FetchItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.GetItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemsDto;
|
||||
import com.justpickup.storeservice.domain.item.entity.Item;
|
||||
import com.justpickup.storeservice.domain.item.exception.NotExistItemException;
|
||||
import com.justpickup.storeservice.domain.item.repository.ItemRepository;
|
||||
@@ -37,8 +38,6 @@ public class ItemServiceImpl implements ItemService {
|
||||
private final CategoryRepository categoryRepository;
|
||||
private final StoreRepository storeRepository;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public ItemDto findItemByItemId(Long itemId) {
|
||||
Item findItem = itemRepository.findById(itemId)
|
||||
@@ -66,9 +65,9 @@ public class ItemServiceImpl implements ItemService {
|
||||
|
||||
|
||||
@Override
|
||||
public Page<ItemDto> findItemList( Long userId,String word, Pageable pageable) {
|
||||
public Page<ItemDto> findMenuItemList(Long userId, String word, Pageable pageable) {
|
||||
|
||||
Page<Item> itemList = itemRepositoryCustom.findItem(userId,word,pageable);
|
||||
Page<Item> itemList = itemRepositoryCustom.findItem(userId, word, pageable);
|
||||
return PageableExecutionUtils.getPage(itemList.stream()
|
||||
.map(ItemDto::createWithCategory)
|
||||
.collect(Collectors.toList()),pageable,itemList::getTotalElements);
|
||||
@@ -122,4 +121,12 @@ public class ItemServiceImpl implements ItemService {
|
||||
|
||||
itemRepository.save(createdItem);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemsDto> findItems(List<Long> itemIds) {
|
||||
return itemRepository.findAllById(itemIds)
|
||||
.stream()
|
||||
.map(ItemsDto::of)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +1,20 @@
|
||||
package com.justpickup.storeservice.domain.item.web;
|
||||
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemsDto;
|
||||
import com.justpickup.storeservice.domain.item.service.ItemService;
|
||||
import com.justpickup.storeservice.domain.itemoption.dto.ItemOptionDto;
|
||||
import com.justpickup.storeservice.domain.itemoption.entity.OptionType;
|
||||
import com.justpickup.storeservice.global.dto.Result;
|
||||
import com.justpickup.storeservice.global.entity.Yn;
|
||||
import lombok.*;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.web.PageableDefault;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -50,5 +49,26 @@ public class ItemController {
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/items/{itemIds}")
|
||||
public ResponseEntity<Result> getItems(@PathVariable List<Long> itemIds) {
|
||||
List<ItemsDto> items = itemService.findItems(itemIds);
|
||||
|
||||
List<GetItemsResponse> responses = items.stream()
|
||||
.map(GetItemsResponse::new)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return ResponseEntity.ok(Result.createSuccessResult(responses));
|
||||
}
|
||||
|
||||
@Data @NoArgsConstructor
|
||||
static class GetItemsResponse {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
public GetItemsResponse(ItemsDto itemsDto) {
|
||||
this.id = itemsDto.getItemId();
|
||||
this.name = itemsDto.getItemName();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public class ItemOwnerApiController {
|
||||
|
||||
|
||||
Page<ItemDto> itemDtoList =
|
||||
itemService.findItemList(Long.parseLong(userId),
|
||||
itemService.findMenuItemList(Long.parseLong(userId),
|
||||
word.orElse(""),
|
||||
pageable);
|
||||
List<GetItemListResponse.Item> itemList = itemDtoList.stream()
|
||||
|
||||
@@ -31,7 +31,6 @@ public class ItemOption extends BaseEntity {
|
||||
// == 연관관계 편의 메소드 == //
|
||||
public void setItem(Item item) {
|
||||
this.item = item;
|
||||
item.getItemOptions().add(this);
|
||||
}
|
||||
|
||||
public ItemOption(OptionType optionType, String name, Item item) {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.justpickup.storeservice.domain.store.dto;
|
||||
|
||||
import com.justpickup.storeservice.domain.store.entity.Store;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class StoreByUserIdDto {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
@Builder
|
||||
public StoreByUserIdDto(Long id, String name) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public static StoreByUserIdDto of(Store store) {
|
||||
return StoreByUserIdDto.builder()
|
||||
.id(store.getId())
|
||||
.name(store.getName())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,30 @@
|
||||
package com.justpickup.storeservice.domain.store.dto;
|
||||
|
||||
import com.justpickup.storeservice.domain.store.entity.Store;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
@Builder
|
||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
public class StoreDto {
|
||||
private Long id;
|
||||
private String name;
|
||||
private String phoneNumber;
|
||||
|
||||
public StoreDto(Store store) {
|
||||
this.id = store.getId();
|
||||
this.name = store.getName();
|
||||
this.phoneNumber = store.getPhoneNumber();
|
||||
@Builder
|
||||
public StoreDto(Long id, String name, String phoneNumber) {
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
this.phoneNumber = phoneNumber;
|
||||
}
|
||||
|
||||
public static StoreDto of(Store store) {
|
||||
StoreDto storeDto = new StoreDto();
|
||||
storeDto.id = store.getId();
|
||||
storeDto.name = store.getName();
|
||||
storeDto.phoneNumber = store.getPhoneNumber();
|
||||
return storeDto;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.justpickup.storeservice.domain.store.service;
|
||||
|
||||
import com.justpickup.storeservice.domain.store.dto.SearchStoreCondition;
|
||||
import com.justpickup.storeservice.domain.store.dto.SearchStoreResult;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreByUserIdDto;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreDto;
|
||||
import org.springframework.data.domain.Pageable;
|
||||
import org.springframework.data.domain.SliceImpl;
|
||||
@@ -11,5 +12,7 @@ import java.util.List;
|
||||
public interface StoreService {
|
||||
SliceImpl<SearchStoreResult> findSearchStoreScroll(SearchStoreCondition condition, Pageable pageable);
|
||||
List<SearchStoreResult> findFavoriteStore(SearchStoreCondition condition, Long userId);
|
||||
StoreDto findStore(Long storeId);
|
||||
StoreDto findStoreById(Long storeId);
|
||||
StoreByUserIdDto findStoreByUserId(Long userId);
|
||||
List<StoreDto> findStoreAllById(Iterable<Long> storeIds);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.justpickup.storeservice.domain.store.service;
|
||||
import com.justpickup.storeservice.domain.favoritestore.repository.FavoriteStoreCustom;
|
||||
import com.justpickup.storeservice.domain.store.dto.SearchStoreCondition;
|
||||
import com.justpickup.storeservice.domain.store.dto.SearchStoreResult;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreByUserIdDto;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreDto;
|
||||
import com.justpickup.storeservice.domain.store.entity.Store;
|
||||
import com.justpickup.storeservice.domain.store.exception.NotExistStoreException;
|
||||
@@ -14,6 +15,7 @@ import org.springframework.data.domain.SliceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@@ -47,10 +49,26 @@ public class StoreServiceImpl implements StoreService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public StoreDto findStore(Long storeId) {
|
||||
public StoreDto findStoreById(Long storeId) {
|
||||
Store store = storeRepository.findById(storeId)
|
||||
.orElseThrow(() -> new NotExistStoreException(storeId + "는 없는 매장 고유번호입니다."));
|
||||
|
||||
return new StoreDto(store);
|
||||
return StoreDto.of(store);
|
||||
}
|
||||
|
||||
@Override
|
||||
public StoreByUserIdDto findStoreByUserId(Long userId) {
|
||||
Store store = storeRepository.findByUserId(userId)
|
||||
.orElseThrow(() -> new NotExistStoreException(userId + "의 매장은 없습니다."));
|
||||
|
||||
return StoreByUserIdDto.of(store);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<StoreDto> findStoreAllById(Iterable<Long> storeIds) {
|
||||
return storeRepository.findAllById(storeIds)
|
||||
.stream()
|
||||
.map(StoreDto::of)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,19 +9,20 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/store")
|
||||
public class StoreController {
|
||||
|
||||
private final StoreService storeService;
|
||||
|
||||
@GetMapping("/{storeId}")
|
||||
@GetMapping("/store/{storeId}")
|
||||
public ResponseEntity<Result> getStore(@PathVariable("storeId") Long storeId) {
|
||||
StoreDto storeDto = storeService.findStore(storeId);
|
||||
StoreDto storeDto = storeService.findStoreById(storeId);
|
||||
|
||||
GetStoreResponse getStoreResponse = new GetStoreResponse(storeDto);
|
||||
return ResponseEntity.ok(Result.createSuccessResult(getStoreResponse));
|
||||
@@ -39,4 +40,16 @@ public class StoreController {
|
||||
this.phoneNumber = storeDto.getPhoneNumber();
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/stores/{storeIds}")
|
||||
public ResponseEntity<Result> getStores(@PathVariable("storeIds") List<Long> storeIds) {
|
||||
|
||||
List<StoreDto> storeDtoList = storeService.findStoreAllById(storeIds);
|
||||
|
||||
List<GetStoreResponse> responses = storeDtoList.stream()
|
||||
.map(GetStoreResponse::new)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return ResponseEntity.ok(Result.createSuccessResult(responses));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.justpickup.storeservice.domain.store.web;
|
||||
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreByUserIdDto;
|
||||
import com.justpickup.storeservice.domain.store.service.StoreService;
|
||||
import com.justpickup.storeservice.global.dto.Result;
|
||||
import lombok.Data;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestHeader;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/api")
|
||||
@Slf4j
|
||||
public class StoreOwnerApiController {
|
||||
|
||||
private final StoreService storeService;
|
||||
|
||||
@GetMapping("/owner/store")
|
||||
public ResponseEntity<Result> getStoreByUserId(@RequestHeader("user-id") String userHeader) {
|
||||
Long userId = Long.valueOf(userHeader);
|
||||
|
||||
StoreByUserIdDto dto = storeService.findStoreByUserId(userId);
|
||||
|
||||
return ResponseEntity.ok(Result.createSuccessResult(dto));
|
||||
}
|
||||
|
||||
@Data
|
||||
static class StoreByUserIdResponse {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
public StoreByUserIdResponse(StoreByUserIdDto dto) {
|
||||
this.id = dto.getId();
|
||||
this.name = dto.getName();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.justpickup.storeservice.global;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.justpickup.storeservice.domain.category.entity.Category;
|
||||
import com.justpickup.storeservice.domain.category.repository.CategoryRepository;
|
||||
import com.justpickup.storeservice.domain.favoritestore.entity.FavoriteStore;
|
||||
@@ -12,22 +13,76 @@ import com.justpickup.storeservice.domain.map.entity.Map;
|
||||
import com.justpickup.storeservice.domain.store.entity.Store;
|
||||
import com.justpickup.storeservice.domain.store.repository.StoreRepository;
|
||||
import com.justpickup.storeservice.global.entity.Address;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
//@Component
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class SqlCommandLineRunner implements CommandLineRunner {
|
||||
|
||||
private final StoreRepository storeRepository;
|
||||
private final FavoriteStoreRepository favoriteStoreRepository;
|
||||
private final ItemRepository itemRepository;
|
||||
private final CategoryRepository categoryRepository;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
@Data
|
||||
static class _Store {
|
||||
private Long id;
|
||||
private String name;
|
||||
private List<_Item> items = new ArrayList<>();
|
||||
|
||||
public _Store(Store store) {
|
||||
this.id = store.getId();
|
||||
this.name = store.getName();
|
||||
this.items = store.getItems()
|
||||
.stream()
|
||||
.map(_Item::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
@NoArgsConstructor @Data
|
||||
static class _Item {
|
||||
private Long id;
|
||||
private String name;
|
||||
private Long price;
|
||||
List<_ItemOption> itemOptions = new ArrayList<>();
|
||||
|
||||
public _Item(Item item) {
|
||||
this.id = item.getId();
|
||||
this.name = item.getName();
|
||||
this.price = item.getPrice();
|
||||
this.itemOptions = item.getItemOptions()
|
||||
.stream()
|
||||
.map(_ItemOption::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
@NoArgsConstructor @Data
|
||||
static class _ItemOption {
|
||||
private Long id;
|
||||
private String name;
|
||||
|
||||
public _ItemOption(ItemOption itemOption) {
|
||||
this.id = itemOption.getId();
|
||||
this.name = itemOption.getName();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
List<Store> stores = new ArrayList<>();
|
||||
@@ -37,9 +92,14 @@ public class SqlCommandLineRunner implements CommandLineRunner {
|
||||
createFavoriteStore(favoriteStoreRepository, stores);
|
||||
|
||||
createItemAndCategories(itemRepository, categoryRepository, stores);
|
||||
|
||||
List<_Store> list = stores.stream().map(_Store::new).collect(Collectors.toList());
|
||||
String json = objectMapper.writeValueAsString(list);
|
||||
log.info("[Test] {}", json);
|
||||
}
|
||||
|
||||
private void createItemAndCategories(ItemRepository itemRepository, CategoryRepository categoryRepository, List<Store> stores) {
|
||||
|
||||
void createItemAndCategories(ItemRepository itemRepository, CategoryRepository categoryRepository, List<Store> stores) {
|
||||
stores.forEach(store -> {
|
||||
Category 카페인 = categoryRepository.save(Category.of("카페인", 0, store));
|
||||
Category 디카페인 = categoryRepository.save(Category.of("디카페인", 1, store));
|
||||
@@ -56,17 +116,20 @@ public class SqlCommandLineRunner implements CommandLineRunner {
|
||||
Item 딸기라떼 = Item.of("딸기라떼", 3000L, 디카페인, store, List.of(ice, hot));
|
||||
Item 녹차 = Item.of("녹차", 3000L, 티, store, List.of(hot));
|
||||
Item 히비스커스 = Item.of("히비스커스 티", 3000L, 티, store, List.of(hot));
|
||||
itemRepository.saveAll(List.of(아메리카노, 카페라떼, 콜드브루, 녹차라떼, 딸기라떼, 녹차, 히비스커스));
|
||||
|
||||
List<Item> items = List.of(아메리카노, 카페라떼, 카페모카, 콜드브루, 녹차라떼, 딸기라떼, 녹차, 히비스커스);
|
||||
itemRepository.saveAll(items);
|
||||
|
||||
items.forEach(item -> store.addItem(item));
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
private void createFavoriteStore(FavoriteStoreRepository favoriteStoreRepository, List<Store> stores) {
|
||||
void createFavoriteStore(FavoriteStoreRepository favoriteStoreRepository, List<Store> stores) {
|
||||
List<Long> userList = List.of(1L,2L,3L,4L,5L,6L,7L);
|
||||
userList.forEach(userId -> stores.forEach(store -> favoriteStoreRepository.save(FavoriteStore.of(userId, store))));
|
||||
}
|
||||
|
||||
private void createStores(StoreRepository storeRepository, List<Store> stores) {
|
||||
void createStores(StoreRepository storeRepository, List<Store> stores) {
|
||||
stores.add(
|
||||
Store.of(
|
||||
new Address("서울시", "마포구 도화동", "201-20"),
|
||||
|
||||
@@ -5,9 +5,9 @@ import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
|
||||
@FeignClient(name = "USER-SERVICE", url = "127.0.0.1:8001/user-service")
|
||||
@FeignClient("USER-SERVICE")
|
||||
public interface UserClient {
|
||||
|
||||
@GetMapping("/customer/{userId}")
|
||||
Result<GetCustomerResponse> getUser(@PathVariable("userId") Long userId);
|
||||
Result<GetCustomerResponse> getCustomerById(@PathVariable("userId") Long userId);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
server:
|
||||
port: 12343
|
||||
port: 0
|
||||
|
||||
spring:
|
||||
application:
|
||||
@@ -27,10 +27,11 @@ spring:
|
||||
username: postgres
|
||||
password: admin
|
||||
|
||||
sql:
|
||||
init:
|
||||
data-locations: classpath:data/data.sql
|
||||
mode: always
|
||||
|
||||
# sql:
|
||||
# init:
|
||||
# data-locations: classpath:data/data.sql
|
||||
# mode: always
|
||||
|
||||
|
||||
eureka:
|
||||
|
||||
@@ -1,778 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="generator" content="Asciidoctor 2.0.10">
|
||||
<title>개요</title>
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
|
||||
<style>
|
||||
/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
|
||||
/* Uncomment @import statement to use as custom stylesheet */
|
||||
/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
|
||||
article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
|
||||
audio,video{display:inline-block}
|
||||
audio:not([controls]){display:none;height:0}
|
||||
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
|
||||
a{background:none}
|
||||
a:focus{outline:thin dotted}
|
||||
a:active,a:hover{outline:0}
|
||||
h1{font-size:2em;margin:.67em 0}
|
||||
abbr[title]{border-bottom:1px dotted}
|
||||
b,strong{font-weight:bold}
|
||||
dfn{font-style:italic}
|
||||
hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
|
||||
mark{background:#ff0;color:#000}
|
||||
code,kbd,pre,samp{font-family:monospace;font-size:1em}
|
||||
pre{white-space:pre-wrap}
|
||||
q{quotes:"\201C" "\201D" "\2018" "\2019"}
|
||||
small{font-size:80%}
|
||||
sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
|
||||
sup{top:-.5em}
|
||||
sub{bottom:-.25em}
|
||||
img{border:0}
|
||||
svg:not(:root){overflow:hidden}
|
||||
figure{margin:0}
|
||||
fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
|
||||
legend{border:0;padding:0}
|
||||
button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
|
||||
button,input{line-height:normal}
|
||||
button,select{text-transform:none}
|
||||
button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
|
||||
button[disabled],html input[disabled]{cursor:default}
|
||||
input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
|
||||
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
|
||||
textarea{overflow:auto;vertical-align:top}
|
||||
table{border-collapse:collapse;border-spacing:0}
|
||||
*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
|
||||
html,body{font-size:100%}
|
||||
body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
|
||||
a:hover{cursor:pointer}
|
||||
img,object,embed{max-width:100%;height:auto}
|
||||
object,embed{height:100%}
|
||||
img{-ms-interpolation-mode:bicubic}
|
||||
.left{float:left!important}
|
||||
.right{float:right!important}
|
||||
.text-left{text-align:left!important}
|
||||
.text-right{text-align:right!important}
|
||||
.text-center{text-align:center!important}
|
||||
.text-justify{text-align:justify!important}
|
||||
.hide{display:none}
|
||||
img,object,svg{display:inline-block;vertical-align:middle}
|
||||
textarea{height:auto;min-height:50px}
|
||||
select{width:100%}
|
||||
.center{margin-left:auto;margin-right:auto}
|
||||
.stretch{width:100%}
|
||||
.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
|
||||
div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
|
||||
a{color:#2156a5;text-decoration:underline;line-height:inherit}
|
||||
a:hover,a:focus{color:#1d4b8f}
|
||||
a img{border:0}
|
||||
p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
|
||||
p aside{font-size:.875em;line-height:1.35;font-style:italic}
|
||||
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
|
||||
h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
|
||||
h1{font-size:2.125em}
|
||||
h2{font-size:1.6875em}
|
||||
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
|
||||
h4,h5{font-size:1.125em}
|
||||
h6{font-size:1em}
|
||||
hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
|
||||
em,i{font-style:italic;line-height:inherit}
|
||||
strong,b{font-weight:bold;line-height:inherit}
|
||||
small{font-size:60%;line-height:inherit}
|
||||
code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
|
||||
ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
|
||||
ul,ol{margin-left:1.5em}
|
||||
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
|
||||
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
|
||||
ul.square{list-style-type:square}
|
||||
ul.circle{list-style-type:circle}
|
||||
ul.disc{list-style-type:disc}
|
||||
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
|
||||
dl dt{margin-bottom:.3125em;font-weight:bold}
|
||||
dl dd{margin-bottom:1.25em}
|
||||
abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
|
||||
abbr{text-transform:none}
|
||||
blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
|
||||
blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
|
||||
blockquote cite::before{content:"\2014 \0020"}
|
||||
blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
|
||||
blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
|
||||
@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
|
||||
h1{font-size:2.75em}
|
||||
h2{font-size:2.3125em}
|
||||
h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
|
||||
h4{font-size:1.4375em}}
|
||||
table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
|
||||
table thead,table tfoot{background:#f7f8f7}
|
||||
table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
|
||||
table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
|
||||
table tr.even,table tr.alt{background:#f8f8f7}
|
||||
table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
|
||||
h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
|
||||
h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
|
||||
.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
|
||||
.clearfix::after,.float-group::after{clear:both}
|
||||
:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed;word-wrap:break-word}
|
||||
:not(pre)>code.nobreak{word-wrap:normal}
|
||||
:not(pre)>code.nowrap{white-space:nowrap}
|
||||
pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
|
||||
pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
|
||||
pre>code{display:block}
|
||||
pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
|
||||
em em{font-style:normal}
|
||||
strong strong{font-weight:400}
|
||||
.keyseq{color:rgba(51,51,51,.8)}
|
||||
kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
|
||||
.keyseq kbd:first-child{margin-left:0}
|
||||
.keyseq kbd:last-child{margin-right:0}
|
||||
.menuseq,.menuref{color:#000}
|
||||
.menuseq b:not(.caret),.menuref{font-weight:inherit}
|
||||
.menuseq{word-spacing:-.02em}
|
||||
.menuseq b.caret{font-size:1.25em;line-height:.8}
|
||||
.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
|
||||
b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
|
||||
b.button::before{content:"[";padding:0 3px 0 2px}
|
||||
b.button::after{content:"]";padding:0 2px 0 3px}
|
||||
p a>code:hover{color:rgba(0,0,0,.9)}
|
||||
#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
|
||||
#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
|
||||
#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
|
||||
#content{margin-top:1.25em}
|
||||
#content::before{content:none}
|
||||
#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
|
||||
#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
|
||||
#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
|
||||
#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
|
||||
#header .details span:first-child{margin-left:-.125em}
|
||||
#header .details span.email a{color:rgba(0,0,0,.85)}
|
||||
#header .details br{display:none}
|
||||
#header .details br+span::before{content:"\00a0\2013\00a0"}
|
||||
#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
|
||||
#header .details br+span#revremark::before{content:"\00a0|\00a0"}
|
||||
#header #revnumber{text-transform:capitalize}
|
||||
#header #revnumber::after{content:"\00a0"}
|
||||
#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
|
||||
#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
|
||||
#toc>ul{margin-left:.125em}
|
||||
#toc ul.sectlevel0>li>a{font-style:italic}
|
||||
#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
|
||||
#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
|
||||
#toc li{line-height:1.3334;margin-top:.3334em}
|
||||
#toc a{text-decoration:none}
|
||||
#toc a:active{text-decoration:underline}
|
||||
#toctitle{color:#7a2518;font-size:1.2em}
|
||||
@media screen and (min-width:768px){#toctitle{font-size:1.375em}
|
||||
body.toc2{padding-left:15em;padding-right:0}
|
||||
#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
|
||||
#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
|
||||
#toc.toc2>ul{font-size:.9em;margin-bottom:0}
|
||||
#toc.toc2 ul ul{margin-left:0;padding-left:1em}
|
||||
#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
|
||||
body.toc2.toc-right{padding-left:0;padding-right:15em}
|
||||
body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
|
||||
@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
|
||||
#toc.toc2{width:20em}
|
||||
#toc.toc2 #toctitle{font-size:1.375em}
|
||||
#toc.toc2>ul{font-size:.95em}
|
||||
#toc.toc2 ul ul{padding-left:1.25em}
|
||||
body.toc2.toc-right{padding-left:0;padding-right:20em}}
|
||||
#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
|
||||
#content #toc>:first-child{margin-top:0}
|
||||
#content #toc>:last-child{margin-bottom:0}
|
||||
#footer{max-width:100%;background:rgba(0,0,0,.8);padding:1.25em}
|
||||
#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
|
||||
#content{margin-bottom:.625em}
|
||||
.sect1{padding-bottom:.625em}
|
||||
@media screen and (min-width:768px){#content{margin-bottom:1.25em}
|
||||
.sect1{padding-bottom:1.25em}}
|
||||
.sect1:last-child{padding-bottom:0}
|
||||
.sect1+.sect1{border-top:1px solid #e7e7e9}
|
||||
#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
|
||||
#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
|
||||
#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
|
||||
#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
|
||||
#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
|
||||
details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
|
||||
details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
|
||||
.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
|
||||
table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
|
||||
.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
|
||||
table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
|
||||
.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
|
||||
.admonitionblock>table td.icon{text-align:center;width:80px}
|
||||
.admonitionblock>table td.icon img{max-width:none}
|
||||
.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
|
||||
.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6)}
|
||||
.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
|
||||
.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
|
||||
.exampleblock>.content>:first-child{margin-top:0}
|
||||
.exampleblock>.content>:last-child{margin-bottom:0}
|
||||
.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
|
||||
.sidebarblock>:first-child{margin-top:0}
|
||||
.sidebarblock>:last-child{margin-bottom:0}
|
||||
.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
|
||||
.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
|
||||
.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;overflow-x:auto;padding:1em;font-size:.8125em}
|
||||
@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
|
||||
@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
|
||||
.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
|
||||
.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
|
||||
.listingblock>.content{position:relative}
|
||||
.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
|
||||
.listingblock:hover code[data-lang]::before{display:block}
|
||||
.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
|
||||
.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
|
||||
.listingblock pre.highlightjs{padding:0}
|
||||
.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
|
||||
.listingblock pre.prettyprint{border-width:0}
|
||||
.prettyprint{background:#f7f7f8}
|
||||
pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
|
||||
pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
|
||||
pre.prettyprint li code[data-lang]::before{opacity:1}
|
||||
pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
|
||||
table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
|
||||
table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
|
||||
table.linenotable td.code{padding-left:.75em}
|
||||
table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em}
|
||||
pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em}
|
||||
pre.pygments .lineno::before{content:"";margin-right:-.125em}
|
||||
.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
|
||||
.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
|
||||
.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
|
||||
.quoteblock blockquote{margin:0;padding:0;border:0}
|
||||
.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
|
||||
.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
|
||||
.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
|
||||
.verseblock{margin:0 1em 1.25em}
|
||||
.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
|
||||
.verseblock pre strong{font-weight:400}
|
||||
.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
|
||||
.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
|
||||
.quoteblock .attribution br,.verseblock .attribution br{display:none}
|
||||
.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
|
||||
.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
|
||||
.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
|
||||
.quoteblock.abstract{margin:0 1em 1.25em;display:block}
|
||||
.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
|
||||
.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
|
||||
.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
|
||||
.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
|
||||
.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;text-align:left;margin-right:0}
|
||||
table.tableblock{max-width:100%;border-collapse:separate}
|
||||
p.tableblock:last-child{margin-bottom:0}
|
||||
td.tableblock>.content>:last-child{margin-bottom:-1.25em}
|
||||
td.tableblock>.content>:last-child.sidebarblock{margin-bottom:0}
|
||||
table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
|
||||
table.grid-all>thead>tr>.tableblock,table.grid-all>tbody>tr>.tableblock{border-width:0 1px 1px 0}
|
||||
table.grid-all>tfoot>tr>.tableblock{border-width:1px 1px 0 0}
|
||||
table.grid-cols>*>tr>.tableblock{border-width:0 1px 0 0}
|
||||
table.grid-rows>thead>tr>.tableblock,table.grid-rows>tbody>tr>.tableblock{border-width:0 0 1px}
|
||||
table.grid-rows>tfoot>tr>.tableblock{border-width:1px 0 0}
|
||||
table.grid-all>*>tr>.tableblock:last-child,table.grid-cols>*>tr>.tableblock:last-child{border-right-width:0}
|
||||
table.grid-all>tbody>tr:last-child>.tableblock,table.grid-all>thead:last-child>tr>.tableblock,table.grid-rows>tbody>tr:last-child>.tableblock,table.grid-rows>thead:last-child>tr>.tableblock{border-bottom-width:0}
|
||||
table.frame-all{border-width:1px}
|
||||
table.frame-sides{border-width:0 1px}
|
||||
table.frame-topbot,table.frame-ends{border-width:1px 0}
|
||||
table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
|
||||
th.halign-left,td.halign-left{text-align:left}
|
||||
th.halign-right,td.halign-right{text-align:right}
|
||||
th.halign-center,td.halign-center{text-align:center}
|
||||
th.valign-top,td.valign-top{vertical-align:top}
|
||||
th.valign-bottom,td.valign-bottom{vertical-align:bottom}
|
||||
th.valign-middle,td.valign-middle{vertical-align:middle}
|
||||
table thead th,table tfoot th{font-weight:bold}
|
||||
tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
|
||||
tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
|
||||
p.tableblock>code:only-child{background:none;padding:0}
|
||||
p.tableblock{font-size:1em}
|
||||
ol{margin-left:1.75em}
|
||||
ul li ol{margin-left:1.5em}
|
||||
dl dd{margin-left:1.125em}
|
||||
dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
|
||||
ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
|
||||
ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
|
||||
ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
|
||||
ul.unstyled,ol.unstyled{margin-left:0}
|
||||
ul.checklist{margin-left:.625em}
|
||||
ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
|
||||
ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
|
||||
ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
|
||||
ul.inline>li{margin-left:1.25em}
|
||||
.unstyled dl dt{font-weight:400;font-style:normal}
|
||||
ol.arabic{list-style-type:decimal}
|
||||
ol.decimal{list-style-type:decimal-leading-zero}
|
||||
ol.loweralpha{list-style-type:lower-alpha}
|
||||
ol.upperalpha{list-style-type:upper-alpha}
|
||||
ol.lowerroman{list-style-type:lower-roman}
|
||||
ol.upperroman{list-style-type:upper-roman}
|
||||
ol.lowergreek{list-style-type:lower-greek}
|
||||
.hdlist>table,.colist>table{border:0;background:none}
|
||||
.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
|
||||
td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
|
||||
td.hdlist1{font-weight:bold;padding-bottom:1.25em}
|
||||
.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
|
||||
.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
|
||||
.colist td:not([class]):first-child img{max-width:none}
|
||||
.colist td:not([class]):last-child{padding:.25em 0}
|
||||
.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
|
||||
.imageblock.left{margin:.25em .625em 1.25em 0}
|
||||
.imageblock.right{margin:.25em 0 1.25em .625em}
|
||||
.imageblock>.title{margin-bottom:0}
|
||||
.imageblock.thumb,.imageblock.th{border-width:6px}
|
||||
.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
|
||||
.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
|
||||
.image.left{margin-right:.625em}
|
||||
.image.right{margin-left:.625em}
|
||||
a.image{text-decoration:none;display:inline-block}
|
||||
a.image object{pointer-events:none}
|
||||
sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
|
||||
sup.footnote a,sup.footnoteref a{text-decoration:none}
|
||||
sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
|
||||
#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
|
||||
#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
|
||||
#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
|
||||
#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
|
||||
#footnotes .footnote:last-of-type{margin-bottom:0}
|
||||
#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
|
||||
.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
|
||||
.gist .file-data>table td.line-data{width:99%}
|
||||
div.unbreakable{page-break-inside:avoid}
|
||||
.big{font-size:larger}
|
||||
.small{font-size:smaller}
|
||||
.underline{text-decoration:underline}
|
||||
.overline{text-decoration:overline}
|
||||
.line-through{text-decoration:line-through}
|
||||
.aqua{color:#00bfbf}
|
||||
.aqua-background{background:#00fafa}
|
||||
.black{color:#000}
|
||||
.black-background{background:#000}
|
||||
.blue{color:#0000bf}
|
||||
.blue-background{background:#0000fa}
|
||||
.fuchsia{color:#bf00bf}
|
||||
.fuchsia-background{background:#fa00fa}
|
||||
.gray{color:#606060}
|
||||
.gray-background{background:#7d7d7d}
|
||||
.green{color:#006000}
|
||||
.green-background{background:#007d00}
|
||||
.lime{color:#00bf00}
|
||||
.lime-background{background:#00fa00}
|
||||
.maroon{color:#600000}
|
||||
.maroon-background{background:#7d0000}
|
||||
.navy{color:#000060}
|
||||
.navy-background{background:#00007d}
|
||||
.olive{color:#606000}
|
||||
.olive-background{background:#7d7d00}
|
||||
.purple{color:#600060}
|
||||
.purple-background{background:#7d007d}
|
||||
.red{color:#bf0000}
|
||||
.red-background{background:#fa0000}
|
||||
.silver{color:#909090}
|
||||
.silver-background{background:#bcbcbc}
|
||||
.teal{color:#006060}
|
||||
.teal-background{background:#007d7d}
|
||||
.white{color:#bfbfbf}
|
||||
.white-background{background:#fafafa}
|
||||
.yellow{color:#bfbf00}
|
||||
.yellow-background{background:#fafa00}
|
||||
span.icon>.fa{cursor:default}
|
||||
a span.icon>.fa{cursor:inherit}
|
||||
.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
|
||||
.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
|
||||
.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
|
||||
.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
|
||||
.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
|
||||
.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
|
||||
.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
|
||||
.conum[data-value] *{color:#fff!important}
|
||||
.conum[data-value]+b{display:none}
|
||||
.conum[data-value]::after{content:attr(data-value)}
|
||||
pre .conum[data-value]{position:relative;top:-.125em}
|
||||
b.conum *{color:inherit!important}
|
||||
.conum:not([data-value]):empty{display:none}
|
||||
dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
|
||||
h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
|
||||
p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
|
||||
p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
|
||||
p{margin-bottom:1.25rem}
|
||||
.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
|
||||
.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
|
||||
.print-only{display:none!important}
|
||||
@page{margin:1.25cm .75cm}
|
||||
@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
|
||||
html{font-size:80%}
|
||||
a{color:inherit!important;text-decoration:underline!important}
|
||||
a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
|
||||
a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
|
||||
abbr[title]::after{content:" (" attr(title) ")"}
|
||||
pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
|
||||
thead{display:table-header-group}
|
||||
svg{max-width:100%}
|
||||
p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
|
||||
h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
|
||||
#toc,.sidebarblock,.exampleblock>.content{background:none!important}
|
||||
#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
|
||||
body.book #header{text-align:center}
|
||||
body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
|
||||
body.book #header .details{border:0!important;display:block;padding:0!important}
|
||||
body.book #header .details span:first-child{margin-left:0!important}
|
||||
body.book #header .details br{display:block}
|
||||
body.book #header .details br+span::before{content:none!important}
|
||||
body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
|
||||
body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
|
||||
.listingblock code[data-lang]::before{display:block}
|
||||
#footer{padding:0 .9375em}
|
||||
.hide-on-print{display:none!important}
|
||||
.print-only{display:block!important}
|
||||
.hide-for-print{display:none!important}
|
||||
.show-for-print{display:inherit!important}}
|
||||
@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
|
||||
.sect1{padding:0!important}
|
||||
.sect1+.sect1{border:0}
|
||||
#footer{background:none}
|
||||
#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
|
||||
@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
</head>
|
||||
<body id="overview" class="book toc2 toc-left">
|
||||
<div id="header">
|
||||
<h1>개요</h1>
|
||||
<div class="details">
|
||||
<span id="revnumber">version 0.0.1-SNAPSHOT</span>
|
||||
</div>
|
||||
<div id="toc" class="toc2">
|
||||
<div id="toctitle">Table of Contents</div>
|
||||
<ul class="sectlevel1">
|
||||
<li><a href="#overview-http-verbs">HTTP 동사</a></li>
|
||||
<li><a href="#overview-http-status-codes">HTTP 상태 코드</a></li>
|
||||
<li><a href="#snippets-write-convention">snippets 작성 컨벤션</a></li>
|
||||
<li><a href="#_상품">상품</a>
|
||||
<ul class="sectlevel2">
|
||||
<li><a href="#_상품_조회">상품 조회</a></li>
|
||||
<li><a href="#_상품_조회_존재하지_않는_상품">상품 조회 (존재하지 않는 상품)</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="content">
|
||||
<div class="sect1">
|
||||
<h2 id="overview-http-verbs"><a class="link" href="#overview-http-verbs">HTTP 동사</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>본 REST API에서 사용하는 HTTP 동사(verbs)는 가능한한 표준 HTTP와 REST 규약을 따릅니다.</p>
|
||||
</div>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">동사</th>
|
||||
<th class="tableblock halign-left valign-top">용례</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>GET</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">리소스를 가져올 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>POST</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">새 리소스를 만들 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PUT</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 수정할 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>PATCH</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스의 일부를 수정할 때 사용</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>DELETE</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 삭제할 떄 사용</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="overview-http-status-codes"><a class="link" href="#overview-http-status-codes">HTTP 상태 코드</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>본 REST API에서 사용하는 HTTP 상태 코드는 가능한 표준 HTTP와 REST 규약을 따릅니다.</p>
|
||||
</div>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">상태 코드</th>
|
||||
<th class="tableblock halign-left valign-top">용례</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>200 OK</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">요청을 성공적으로 처리함</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>201 Created</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">새 리소스를 성공적으로 생성함. 응답의 <code>Location</code> 헤더에 해당 리소스의 URI가 담겨있다.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>204 No Content</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">기존 리소스를 성공적으로 수정함.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>400 Bad Request</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">잘못된 요청을 보낸 경우. 응답 본문에 더 오류에 대한 정보가 담겨있다.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>404 Not Found</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">요청한 리소스가 없음.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>409 Conflict</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">클라이언트의 요청이 서버의 상태와 충돌이 발생한 경우.</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="snippets-write-convention"><a class="link" href="#snippets-write-convention">snippets 작성 컨벤션</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="paragraph">
|
||||
<p>domain-httpRequestCode-etc</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect1">
|
||||
<h2 id="_상품"><a class="link" href="#_상품">상품</a></h2>
|
||||
<div class="sectionbody">
|
||||
<div class="sect2">
|
||||
<h3 id="_상품_조회"><a class="link" href="#_상품_조회">상품 조회</a></h3>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_curl_request"><a class="link" href="#_상품_조회_curl_request">Curl request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'http://127.0.0.1:8001/item/1' -i -X GET</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_http_request"><a class="link" href="#_상품_조회_http_request">HTTP request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /item/1 HTTP/1.1
|
||||
Host: 127.0.0.1:8001</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_http_response"><a class="link" href="#_상품_조회_http_response">HTTP response</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
|
||||
Content-Type: application/json
|
||||
Content-Length: 146
|
||||
|
||||
{
|
||||
"code" : "SUCCESS",
|
||||
"message" : "",
|
||||
"data" : {
|
||||
"id" : 1,
|
||||
"name" : "아메리카노",
|
||||
"salesYn" : "Y",
|
||||
"price" : 1500
|
||||
}
|
||||
}</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_path_parameters"><a class="link" href="#_상품_조회_path_parameters">Path parameters</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<caption class="title">Table 1. /item/{itemId}</caption>
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Parameter</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>itemId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 고유 번호</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_response_fields"><a class="link" href="#_상품_조회_response_fields">Response fields</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3334%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Path</th>
|
||||
<th class="tableblock halign-left valign-top">Type</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>code</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">결과 코드 SUCCESS/ERROR</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>message</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">메시지</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.id</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 고유 번호</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.name</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 이름</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.salesYn</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">화면 표시 여부 Y/N</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data.price</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Number</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 가격</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect2">
|
||||
<h3 id="_상품_조회_존재하지_않는_상품"><a class="link" href="#_상품_조회_존재하지_않는_상품">상품 조회 (존재하지 않는 상품)</a></h3>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_존재하지_않는_상품_curl_request"><a class="link" href="#_상품_조회_존재하지_않는_상품_curl_request">Curl request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'http://127.0.0.1:8001/item/9999' -i -X GET</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_존재하지_않는_상품_http_request"><a class="link" href="#_상품_조회_존재하지_않는_상품_http_request">HTTP request</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /item/9999 HTTP/1.1
|
||||
Host: 127.0.0.1:8001</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_존재하지_않는_상품_http_response"><a class="link" href="#_상품_조회_존재하지_않는_상품_http_response">HTTP response</a></h4>
|
||||
<div class="listingblock">
|
||||
<div class="content">
|
||||
<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 409 Conflict
|
||||
Content-Type: application/json
|
||||
Content-Length: 93
|
||||
|
||||
{
|
||||
"code" : "ERROR",
|
||||
"message" : "존재하지 않는 상품입니다.",
|
||||
"data" : null
|
||||
}</code></pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_존재하지_않는_상품_path_parameters"><a class="link" href="#_상품_조회_존재하지_않는_상품_path_parameters">Path parameters</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<caption class="title">Table 1. /item/{itemId}</caption>
|
||||
<colgroup>
|
||||
<col style="width: 50%;">
|
||||
<col style="width: 50%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Parameter</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>itemId</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">상품 고유 번호</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="sect3">
|
||||
<h4 id="_상품_조회_존재하지_않는_상품_response_fields"><a class="link" href="#_상품_조회_존재하지_않는_상품_response_fields">Response fields</a></h4>
|
||||
<table class="tableblock frame-all grid-all stretch">
|
||||
<colgroup>
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3333%;">
|
||||
<col style="width: 33.3334%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="tableblock halign-left valign-top">Path</th>
|
||||
<th class="tableblock halign-left valign-top">Type</th>
|
||||
<th class="tableblock halign-left valign-top">Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>code</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">결과 코드 SUCCESS/ERROR</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>message</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>String</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">메시지</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>data</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Null</code></p></td>
|
||||
<td class="tableblock halign-left valign-top"><p class="tableblock">데이터</p></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<div id="footer-text">
|
||||
Version 0.0.1-SNAPSHOT<br>
|
||||
Last updated 2022-02-04 20:43:44 +0900
|
||||
</div>
|
||||
</div>
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/github.min.css">
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
|
||||
<script>hljs.initHighlighting()</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -2,11 +2,10 @@ package com.justpickup.storeservice.domain.item.web;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.justpickup.storeservice.config.TestConfig;
|
||||
import com.justpickup.storeservice.domain.favoritestore.repository.FavoriteStoreRepository;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemsDto;
|
||||
import com.justpickup.storeservice.domain.item.exception.NotExistItemException;
|
||||
import com.justpickup.storeservice.domain.item.service.ItemService;
|
||||
import com.justpickup.storeservice.domain.store.repository.StoreRepository;
|
||||
import com.justpickup.storeservice.global.dto.Code;
|
||||
import com.justpickup.storeservice.global.entity.Yn;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -19,6 +18,10 @@ import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.ResultActions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
|
||||
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
|
||||
@@ -44,12 +47,6 @@ class ItemControllerTest {
|
||||
@MockBean
|
||||
ItemService itemService;
|
||||
|
||||
@MockBean
|
||||
private StoreRepository storeRepository;
|
||||
|
||||
@MockBean
|
||||
private FavoriteStoreRepository favoriteStoreRepository;
|
||||
|
||||
@Test
|
||||
@DisplayName("상품 조회")
|
||||
void getItem() throws Exception {
|
||||
@@ -122,5 +119,52 @@ class ItemControllerTest {
|
||||
;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("[GET] 아이템 리스트 조회")
|
||||
void getItems() throws Exception {
|
||||
// GIVEN
|
||||
List<Long> itemIds = List.of(1L, 2L, 3L);
|
||||
|
||||
given(itemService.findItems(itemIds))
|
||||
.willReturn(itemsWillReturnDto(itemIds));
|
||||
|
||||
String itemIdsParam = itemIds.stream()
|
||||
.map(String::valueOf)
|
||||
.collect(Collectors.joining(","));
|
||||
|
||||
// THEN
|
||||
ResultActions actions = mockMvc.perform(get("/items/{itemIds}", itemIdsParam));
|
||||
// WHEN
|
||||
actions.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("code").value(Code.SUCCESS.name()))
|
||||
.andExpect(jsonPath("message").value(""))
|
||||
.andDo(print())
|
||||
.andDo(document("items-get",
|
||||
pathParameters(
|
||||
parameterWithName("itemIds").description("상품 고유 번호들")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
fieldWithPath("data[*].id").description("상품 고유 번호"),
|
||||
fieldWithPath("data[*].name").description("상품 이름")
|
||||
)
|
||||
))
|
||||
;
|
||||
}
|
||||
|
||||
private List<ItemsDto> itemsWillReturnDto(List<Long> itemIds) {
|
||||
List<ItemsDto> items = new ArrayList<>();
|
||||
|
||||
for (Long itemId : itemIds) {
|
||||
ItemsDto itemsDto = ItemsDto.builder()
|
||||
.itemId(itemId)
|
||||
.itemName("아이템 이름" + itemId)
|
||||
.build();
|
||||
items.add(itemsDto);
|
||||
}
|
||||
|
||||
return items;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,12 +3,10 @@ package com.justpickup.storeservice.domain.item.web;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.justpickup.storeservice.config.TestConfig;
|
||||
import com.justpickup.storeservice.domain.category.dto.CategoryDto;
|
||||
import com.justpickup.storeservice.domain.favoritestore.repository.FavoriteStoreRepository;
|
||||
import com.justpickup.storeservice.domain.item.dto.FetchItemDto;
|
||||
import com.justpickup.storeservice.domain.item.dto.ItemDto;
|
||||
import com.justpickup.storeservice.domain.item.service.ItemService;
|
||||
import com.justpickup.storeservice.domain.itemoption.entity.OptionType;
|
||||
import com.justpickup.storeservice.domain.store.repository.StoreRepository;
|
||||
import com.justpickup.storeservice.global.dto.Code;
|
||||
import com.justpickup.storeservice.global.entity.Yn;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -78,7 +76,7 @@ class ItemOwnerApiControllerTest {
|
||||
|
||||
Page<ItemDto> page = PageableExecutionUtils.getPage(items, Pageable.ofSize(10), () -> 1);
|
||||
|
||||
given(itemService.findItemList(eq(1L),eq(""),any()))
|
||||
given(itemService.findMenuItemList(eq(1L),eq(""),any()))
|
||||
.willReturn(page);
|
||||
|
||||
// WHEN
|
||||
|
||||
@@ -3,6 +3,7 @@ package com.justpickup.storeservice.domain.store.web;
|
||||
import com.justpickup.storeservice.config.TestConfig;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreDto;
|
||||
import com.justpickup.storeservice.domain.store.service.StoreService;
|
||||
import com.justpickup.storeservice.global.dto.Code;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -13,6 +14,10 @@ import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.ResultActions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
|
||||
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
|
||||
@@ -21,6 +26,7 @@ import static org.springframework.restdocs.payload.PayloadDocumentation.response
|
||||
import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;
|
||||
import static org.springframework.restdocs.request.RequestDocumentation.pathParameters;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
@WebMvcTest(StoreController.class)
|
||||
@@ -41,7 +47,7 @@ class StoreControllerTest {
|
||||
void getStore() throws Exception {
|
||||
//given
|
||||
String storeId = "1";
|
||||
given(storeService.findStore(1L)).willReturn(getWillReturnStore());
|
||||
given(storeService.findStoreById(1L)).willReturn(getWillReturnStore());
|
||||
|
||||
//when
|
||||
ResultActions actions = mockMvc.perform(get("/store/{storeId}", storeId));
|
||||
@@ -66,4 +72,52 @@ class StoreControllerTest {
|
||||
private StoreDto getWillReturnStore() {
|
||||
return StoreDto.builder().id(1L).name("이디야커피 대림역점").phoneNumber("010-1234-5678").build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("[GET] 매장 정보들 가져오기")
|
||||
void getStores() throws Exception {
|
||||
// GIVEN
|
||||
List<Long> storeIds = List.of(1L, 2L, 3L);
|
||||
|
||||
given(storeService.findStoreAllById(storeIds))
|
||||
.willReturn(storesWillReturnDto(storeIds));
|
||||
|
||||
String storeIdsParam = storeIds.stream()
|
||||
.map(String::valueOf)
|
||||
.collect(Collectors.joining(","));
|
||||
|
||||
// THEN
|
||||
ResultActions actions = mockMvc.perform(get("/stores/{storeIds}", storeIdsParam));
|
||||
// WHEN
|
||||
actions.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("code").value(Code.SUCCESS.name()))
|
||||
.andExpect(jsonPath("message").value(""))
|
||||
.andDo(print())
|
||||
.andDo(document("stores-get",
|
||||
pathParameters(
|
||||
parameterWithName("storeIds").description("매장 고유 번호들")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
fieldWithPath("data[*].id").description("매장 고유 번호"),
|
||||
fieldWithPath("data[*].name").description("매장 이름"),
|
||||
fieldWithPath("data[*].phoneNumber").description("매장 휴대폰 번호")
|
||||
)
|
||||
))
|
||||
;
|
||||
}
|
||||
|
||||
private List<StoreDto> storesWillReturnDto(List<Long> storeIds) {
|
||||
List<StoreDto> stores = new ArrayList<>();
|
||||
for (Long storeId : storeIds) {
|
||||
StoreDto storeDto = StoreDto.builder()
|
||||
.id(storeId)
|
||||
.name("매장 이름" + storeId)
|
||||
.phoneNumber("010-1234-5678")
|
||||
.build();
|
||||
stores.add(storeDto);
|
||||
}
|
||||
return stores;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package com.justpickup.storeservice.domain.store.web;
|
||||
|
||||
import com.justpickup.storeservice.config.TestConfig;
|
||||
import com.justpickup.storeservice.domain.store.dto.StoreByUserIdDto;
|
||||
import com.justpickup.storeservice.domain.store.service.StoreService;
|
||||
import com.justpickup.storeservice.global.dto.Code;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.ResultActions;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName;
|
||||
import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders;
|
||||
import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
|
||||
import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
|
||||
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
|
||||
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
@WebMvcTest(StoreOwnerApiController.class)
|
||||
@Import(TestConfig.class)
|
||||
@AutoConfigureRestDocs(uriHost = "just-pickup.com", uriPort = 8000)
|
||||
class StoreOwnerApiControllerTest {
|
||||
|
||||
private final String url = "/api";
|
||||
|
||||
@Autowired
|
||||
MockMvc mockMvc;
|
||||
|
||||
@MockBean
|
||||
StoreService storeService;
|
||||
|
||||
@Test
|
||||
@DisplayName("[API] [GET] 회원 고유번호로 매장 정보 찾기")
|
||||
void getStoreByUserId() throws Exception {
|
||||
// GIVEN
|
||||
String userHeader = "1";
|
||||
Long userId = Long.valueOf(userHeader);
|
||||
StoreByUserIdDto willReturnDto = StoreByUserIdDto.builder().id(10L).name("한강커피").build();
|
||||
given(storeService.findStoreByUserId(userId)).willReturn(willReturnDto);
|
||||
|
||||
// THEN
|
||||
ResultActions actions = mockMvc.perform(get(url + "/owner/store")
|
||||
.header("user-id", userHeader)
|
||||
);
|
||||
|
||||
// WHEN
|
||||
actions.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("code").value(Code.SUCCESS.name()))
|
||||
.andExpect(jsonPath("data").exists())
|
||||
.andDo(print())
|
||||
.andDo(document("api-get-store-byUserId",
|
||||
requestHeaders(
|
||||
headerWithName("user-id").description("로그인한 유저 id")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
fieldWithPath("data.id").description("매장 고유번호"),
|
||||
fieldWithPath("data.name").description("매장 이름")
|
||||
)
|
||||
))
|
||||
;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -71,6 +71,8 @@ operation::customer-get-mypage[snippets='curl-request,http-request,http-response
|
||||
operation::customer-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
=== 회원 조회 (존재하지 않는 회원)
|
||||
operation::customer-get-notExistUserException[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
=== 회원 조회
|
||||
operation::customers-get[snippets='curl-request,http-request,http-response,path-parameters,response-fields']
|
||||
|
||||
== 점주
|
||||
=== 회원가입 - 점주
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
package com.justpickup.userservice;
|
||||
|
||||
import com.justpickup.userservice.domain.user.dto.StoreOwnerDto;
|
||||
import com.justpickup.userservice.domain.user.service.UserService;
|
||||
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.context.annotation.Bean;
|
||||
|
||||
@SpringBootApplication
|
||||
@EnableEurekaClient
|
||||
@@ -16,13 +12,4 @@ public class UserServiceApplication {
|
||||
SpringApplication.run(UserServiceApplication.class, args);
|
||||
}
|
||||
|
||||
@Bean
|
||||
CommandLineRunner run(UserService userService) {
|
||||
return args -> {
|
||||
StoreOwnerDto park = StoreOwnerDto.builder()
|
||||
.email("test@gmail.com").password("1234").name("Park").phoneNumber("010-1234-5678")
|
||||
.build();
|
||||
userService.saveStoreOwner(park);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package com.justpickup.userservice.domain.user.repository;
|
||||
|
||||
import com.justpickup.userservice.domain.user.entity.StoreOwner;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface StoreOwnerRepository extends JpaRepository<StoreOwner, Long> {
|
||||
}
|
||||
@@ -3,7 +3,10 @@ package com.justpickup.userservice.domain.user.service;
|
||||
import com.justpickup.userservice.domain.user.dto.CustomerDto;
|
||||
import com.justpickup.userservice.domain.user.dto.StoreOwnerDto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface UserService {
|
||||
CustomerDto findCustomerByUserId(Long userId);
|
||||
void saveStoreOwner(StoreOwnerDto storeOwnerDto);
|
||||
List<CustomerDto> findCustomerByUserIds(List<Long> userIds);
|
||||
}
|
||||
|
||||
@@ -22,10 +22,12 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Transactional(readOnly = true,propagation = Propagation.SUPPORTS)
|
||||
@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
|
||||
@Slf4j
|
||||
public class UserServiceImpl implements UserService, UserDetailsService {
|
||||
|
||||
@@ -64,7 +66,15 @@ public class UserServiceImpl implements UserService, UserDetailsService {
|
||||
StoreOwner storeOwner = new StoreOwner(email, encode, storeOwnerDto.getName(),
|
||||
storeOwnerDto.getPhoneNumber(), storeOwnerDto.getBusinessNumber());
|
||||
|
||||
StoreOwner save = userRepository.save(storeOwner);
|
||||
userRepository.save(storeOwner);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<CustomerDto> findCustomerByUserIds(List<Long> userIds) {
|
||||
return customerRepository.findAllById(userIds)
|
||||
.stream()
|
||||
.map(CustomerDto::new)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.Email;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@@ -52,7 +54,7 @@ public class UserController {
|
||||
|
||||
|
||||
@GetMapping("/customer/{userId}")
|
||||
public ResponseEntity getCustomer(@Valid @PathVariable("userId") Long userId) {
|
||||
public ResponseEntity getCustomer(@PathVariable("userId") Long userId) {
|
||||
|
||||
CustomerDto customerDto = userService.findCustomerByUserId(userId);
|
||||
|
||||
@@ -62,6 +64,19 @@ public class UserController {
|
||||
.body(Result.createSuccessResult(getCustomerResponse));
|
||||
}
|
||||
|
||||
@GetMapping("/customers/{userIds}")
|
||||
public ResponseEntity getCustomers(@PathVariable List<Long> userIds) {
|
||||
|
||||
List<CustomerDto> customers = userService.findCustomerByUserIds(userIds);
|
||||
|
||||
List<GetCustomerResponse> responses = customers
|
||||
.stream()
|
||||
.map(GetCustomerResponse::new)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return ResponseEntity.ok(Result.createSuccessResult(responses));
|
||||
}
|
||||
|
||||
@Data @NoArgsConstructor @AllArgsConstructor
|
||||
static class GetCustomerResponse {
|
||||
private Long userId;
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.justpickup.userservice.global;
|
||||
|
||||
import com.justpickup.userservice.domain.user.entity.AuthType;
|
||||
import com.justpickup.userservice.domain.user.entity.Customer;
|
||||
import com.justpickup.userservice.domain.user.entity.StoreOwner;
|
||||
import com.justpickup.userservice.domain.user.repository.CustomerRepository;
|
||||
import com.justpickup.userservice.domain.user.repository.StoreOwnerRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.boot.CommandLineRunner;
|
||||
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class SqlCommandLineRunner implements CommandLineRunner {
|
||||
|
||||
private final BCryptPasswordEncoder bCryptPasswordEncoder;
|
||||
private final StoreOwnerRepository storeOwnerRepository;
|
||||
private final CustomerRepository customerRepository;
|
||||
|
||||
@Override
|
||||
public void run(String... args) throws Exception {
|
||||
String encode = bCryptPasswordEncoder.encode("1234");
|
||||
|
||||
StoreOwner owner = new StoreOwner("owner@gmail.com", encode,
|
||||
"점주 테스트 계정", "010-9876-5432", null);
|
||||
storeOwnerRepository.save(owner);
|
||||
|
||||
Customer customer = new Customer("customer@gmail.com", encode,
|
||||
"고객 테스트 계정", "010-1234-5678", AuthType.NAVER);
|
||||
customerRepository.save(customer);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
server.port: 60000
|
||||
server.port: 0
|
||||
|
||||
spring:
|
||||
application:
|
||||
@@ -47,6 +47,7 @@ logging:
|
||||
decorator.datasource.p6spy:
|
||||
enable-logging: true
|
||||
|
||||
# 3600000
|
||||
token:
|
||||
access-expired-time: 3600000
|
||||
refresh-expired-time: 604800000
|
||||
|
||||
@@ -25,6 +25,10 @@ import org.springframework.restdocs.headers.HeaderDocumentation;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.ResultActions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.BDDMockito.given;
|
||||
import static org.mockito.BDDMockito.willThrow;
|
||||
@@ -248,4 +252,51 @@ class UserControllerTest {
|
||||
))
|
||||
;
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("[GET] 고객 리스트 조회")
|
||||
void getCustomers() throws Exception {
|
||||
// GIVEN
|
||||
List<Long> customerIds = List.of(1L, 2L, 3L);
|
||||
|
||||
given(userService.findCustomerByUserIds(customerIds))
|
||||
.willReturn(customerWillReturnDto(customerIds));
|
||||
|
||||
String customerIdsParam = customerIds.stream()
|
||||
.map(String::valueOf)
|
||||
.collect(Collectors.joining(","));
|
||||
// THEN
|
||||
ResultActions actions = mockMvc.perform(get("/customers/{customerIds}", customerIdsParam));
|
||||
// WHEN
|
||||
actions.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("code").value(Code.SUCCESS.name()))
|
||||
.andExpect(jsonPath("message").value(""))
|
||||
.andDo(print())
|
||||
.andDo(document("customers-get",
|
||||
pathParameters(
|
||||
parameterWithName("customerIds").description("회원 고유 번호들")
|
||||
),
|
||||
responseFields(
|
||||
fieldWithPath("code").description("결과 코드 SUCCESS/ERROR"),
|
||||
fieldWithPath("message").description("메시지"),
|
||||
fieldWithPath("data[*].userId").description("회원 고유 번호"),
|
||||
fieldWithPath("data[*].userName").description("회원 이름"),
|
||||
fieldWithPath("data[*].phoneNumber").description("회원 전화번호")
|
||||
)
|
||||
))
|
||||
;
|
||||
}
|
||||
|
||||
private List<CustomerDto> customerWillReturnDto(List<Long> customerIds) {
|
||||
List<CustomerDto> customerDtoList = new ArrayList<>();
|
||||
for (Long customerId : customerIds) {
|
||||
CustomerDto customerDto = CustomerDto.builder()
|
||||
.id(customerId)
|
||||
.name("이름" + customerId)
|
||||
.phoneNumber("010-1234-5678")
|
||||
.build();
|
||||
customerDtoList.add(customerDto);
|
||||
}
|
||||
return customerDtoList;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user