mindol1004/spring-jwt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(order): StoreClient 중복 클래스 삭제

Browse Source
This commit is contained in:
bum12ark
2022-03-18 15:57:46 +09:00
parent 68018d4501
commit 84fb514e24
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
order-service/src/main/java/com/justpickup/orderservice/domain/order/service/OrderServiceImpl.java
View File

@@ -10,7 +10,7 @@ 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.GetItemResponse;
import com.justpickup.orderservice.global.client.store.GetStoreReseponse;
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.UserClient;
@@ -186,7 +186,7 @@ public class OrderServiceImpl implements OrderService {
public FetchOrderDto fetchOrder(Long userId) {
Order order = orderRepositoryCustom.fetchOrderBasket(userId)
.orElseThrow(() -> new OrderException("장바구니 정보를 찾을 수 없습니다."));
GetStoreReseponse store = storeClient.getStore(String.valueOf(order.getStoreId())).getData();
GetStoreResponse store = storeClient.getStore(String.valueOf(order.getStoreId())).getData();
List<GetItemResponse> data = storeClient.getItemAndItemOptions(order.getOrderItems().stream()
.map(OrderItem::getItemId)
@@ -209,14 +209,12 @@ public class OrderServiceImpl implements OrderService {
,orderItem))
.collect(Collectors.toList());
FetchOrderDto fetchOrderDto = FetchOrderDto.builder()
return FetchOrderDto.builder()
.userId(order.getUserId())
.orderPrice(order.getOrderPrice())
.storeName(store.getName())
.orderItemDtoList(orderItemDtoList)
.build();
return fetchOrderDto;
}
@Override

14
order-service/src/main/java/com/justpickup/orderservice/global/client/store/GetStoreReseponse.java
View File

@@ -1,14 +0,0 @@
package com.justpickup.orderservice.global.client.store;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class GetStoreReseponse {
private Long id;
private String name;
private String phoneNumber;
}

5
order-service/src/main/java/com/justpickup/orderservice/global/client/store/StoreClient.java
View File

@@ -29,18 +29,17 @@ public interface StoreClient {
Result<List<GetStoreResponse>> getStoreAllById(@PathVariable("storeId") Iterable<Long> storeIds);
@GetMapping("/store/{storeId}")
Result<GetStoreReseponse> getStore(@PathVariable(value = "storeId") String storeId);
Result<GetStoreResponse> getStore(@PathVariable(value = "storeId") String storeId);
@GetMapping("/api/customer/items/{itemId}")
Result<List<GetItemResponse>> getItemAndItemOptions(@PathVariable(value = "itemId") List<Long> itemIds);
default Map<Long, String> getStoreNameMap(Set<Long> storeIds) {
List<GetStoreResponse> storeResponses = this.getStoreAllById(storeIds).getData();
Map<Long, String> storeMap = storeResponses.stream()
return storeResponses.stream()
.collect(
toMap(GetStoreResponse::getId, GetStoreResponse::getName)
);
return storeMap;
}
default Map<Long, String> getItemNameMap(Iterable<Long> itemIds) {