Merge pull request #47 from nowgnas/fix/review-by-user-id

🐛 Fix: select review property change
lotteon2 · Dec 21, 2023 · 64a2046 · 64a2046
2 parents adb6f03 + cb7d042
commit 64a2046
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 143 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo'
     testImplementation 'org.mockito:mockito-core:4.8.0'
-    implementation 'io.github.lotteon-maven:blooming-blooms-utils:202312180340'
+    implementation 'io.github.lotteon-maven:blooming-blooms-utils:202312210138'
     testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
 
 }

diff --git a/src/main/java/kr/bb/product/common/dto/FlowerInformation.java b/src/main/java/kr/bb/product/common/dto/FlowerInformation.java
diff --git a/src/main/java/kr/bb/product/common/dto/IsProductPriceValid.java b/src/main/java/kr/bb/product/common/dto/IsProductPriceValid.java
diff --git a/src/main/java/kr/bb/product/common/dto/ProductInformation.java b/src/main/java/kr/bb/product/common/dto/ProductInformation.java
diff --git a/src/main/java/kr/bb/product/common/dto/ProductThumbnail.java b/src/main/java/kr/bb/product/common/dto/ProductThumbnail.java
diff --git a/src/main/java/kr/bb/product/common/dto/StoreSubscriptionProductId.java b/src/main/java/kr/bb/product/common/dto/StoreSubscriptionProductId.java
diff --git a/src/main/java/kr/bb/product/common/dto/SubscriptionProductInformation.java b/src/main/java/kr/bb/product/common/dto/SubscriptionProductInformation.java
diff --git a/src/main/java/kr/bb/product/domain/flower/adapter/in/client/FlowerFeignClientController.java b/src/main/java/kr/bb/product/domain/flower/adapter/in/client/FlowerFeignClientController.java
@@ -1,8 +1,8 @@
 package kr.bb.product.domain.flower.adapter.in.client;
 
+import bloomingblooms.domain.flower.FlowerInformation;
 import bloomingblooms.response.CommonResponse;
 import java.util.List;
-import kr.bb.product.common.dto.FlowerInformation;
 import kr.bb.product.domain.flower.application.usecase.FlowerQueryUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/src/main/java/kr/bb/product/domain/flower/application/port/in/FlowerQueryInputPort.java b/src/main/java/kr/bb/product/domain/flower/application/port/in/FlowerQueryInputPort.java
@@ -1,8 +1,8 @@
 package kr.bb.product.domain.flower.application.port.in;
 
+import bloomingblooms.domain.flower.FlowerInformation;
 import java.util.List;
 import java.util.stream.Collectors;
-import kr.bb.product.common.dto.FlowerInformation;
 import kr.bb.product.domain.flower.application.port.out.FlowerQueryOutPort;
 import kr.bb.product.domain.flower.application.usecase.FlowerQueryUseCase;
 import lombok.RequiredArgsConstructor;

diff --git a/src/main/java/kr/bb/product/domain/flower/application/usecase/FlowerQueryUseCase.java b/src/main/java/kr/bb/product/domain/flower/application/usecase/FlowerQueryUseCase.java
@@ -1,7 +1,7 @@
 package kr.bb.product.domain.flower.application.usecase;
 
+import bloomingblooms.domain.flower.FlowerInformation;
 import java.util.List;
-import kr.bb.product.common.dto.FlowerInformation;
 
 public interface FlowerQueryUseCase {
   List<FlowerInformation> getAllFlowers();

diff --git a/...ain/java/kr/bb/product/domain/product/adapter/in/client/ProductFeignClientController.java b/...ain/java/kr/bb/product/domain/product/adapter/in/client/ProductFeignClientController.java
@@ -1,12 +1,12 @@
 package kr.bb.product.domain.product.adapter.in.client;
 
+import bloomingblooms.domain.product.IsProductPriceValid;
+import bloomingblooms.domain.product.ProductInformation;
+import bloomingblooms.domain.product.ProductThumbnail;
+import bloomingblooms.domain.product.StoreSubscriptionProductId;
+import bloomingblooms.domain.product.SubscriptionProductInformation;
 import bloomingblooms.response.CommonResponse;
 import java.util.List;
-import kr.bb.product.common.dto.IsProductPriceValid;
-import kr.bb.product.common.dto.ProductInformation;
-import kr.bb.product.common.dto.ProductThumbnail;
-import kr.bb.product.common.dto.StoreSubscriptionProductId;
-import kr.bb.product.common.dto.SubscriptionProductInformation;
 import kr.bb.product.domain.product.application.usecase.ProductQueryUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

diff --git a/src/main/java/kr/bb/product/domain/product/adapter/out/mongo/ProductQueryRepository.java b/src/main/java/kr/bb/product/domain/product/adapter/out/mongo/ProductQueryRepository.java
@@ -1,9 +1,9 @@
 package kr.bb.product.domain.product.adapter.out.mongo;
 
+import bloomingblooms.domain.product.IsProductPriceValid;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import kr.bb.product.common.dto.IsProductPriceValid;
 import kr.bb.product.domain.product.application.port.out.ProductQueryOutPort;
 import kr.bb.product.domain.product.entity.Product;
 import kr.bb.product.domain.product.entity.ProductCommand.SelectOption;
@@ -159,4 +159,14 @@ public boolean findProductPriceValid(List<IsProductPriceValid> productPriceValid
     return productPriceValids.stream()
         .allMatch(item -> item.getPrice().equals(collect1.get(item.getProductId())));
   }
+
+  @Override
+  public Map<String, String> findProductNameByProductIdsForReviewByUserId(List<String> productIds) {
+
+    List<Product> products =
+        mongoTemplate.find(Query.query(Criteria.where("_id").in(productIds)), Product.class);
+
+    return products.stream()
+        .collect(Collectors.toMap(Product::getProductId, Product::getProductName));
+  }
 }
diff --git a/src/main/java/kr/bb/product/domain/product/application/port/in/ProductQueryInputPort.java b/src/main/java/kr/bb/product/domain/product/application/port/in/ProductQueryInputPort.java
@@ -1,13 +1,13 @@
 package kr.bb.product.domain.product.application.port.in;
 
+import bloomingblooms.domain.product.IsProductPriceValid;
+import bloomingblooms.domain.product.ProductInformation;
+import bloomingblooms.domain.product.ProductThumbnail;
+import bloomingblooms.domain.product.StoreSubscriptionProductId;
+import bloomingblooms.domain.product.SubscriptionProductInformation;
 import bloomingblooms.errors.EntityNotFoundException;
 import java.util.List;
 import java.util.stream.Collectors;
-import kr.bb.product.common.dto.IsProductPriceValid;
-import kr.bb.product.common.dto.ProductInformation;
-import kr.bb.product.common.dto.ProductThumbnail;
-import kr.bb.product.common.dto.StoreSubscriptionProductId;
-import kr.bb.product.common.dto.SubscriptionProductInformation;
 import kr.bb.product.domain.flower.adapter.out.jpa.FlowerJpaRepository;
 import kr.bb.product.domain.flower.application.port.out.FlowerQueryOutPort;
 import kr.bb.product.domain.flower.entity.Flower;
@@ -261,13 +261,13 @@ public SubscriptionProductForCustomer getSubscriptionProductDetail(Long storeId)
 
   @Override
   public ProductThumbnail getProductThumbnail(String productId) {
-    return ProductThumbnail.getData(productQueryOutPort.findByProductId(productId));
+    return ProductCommand.getProductThumbnailData(productQueryOutPort.findByProductId(productId));
   }
 
   @Override
   public List<ProductInformation> getProductInformation(List<String> productIds) {
     List<Product> productByProductIds = productQueryOutPort.findProductByProductIds(productIds);
-    return ProductInformation.getData(productByProductIds);
+    return ProductCommand.getProductInformationListData(productByProductIds);
   }
 
   @Override
@@ -278,13 +278,14 @@ public void getProductPriceValidation(List<IsProductPriceValid> productPriceVali
 
   @Override
   public StoreSubscriptionProductId getStoreSubscriptionProductId(Long storeId) {
-    return StoreSubscriptionProductId.getData(
+    return ProductCommand.getStoreSubscriptionProductIdData(
         productQueryOutPort.findSubscriptionProductByStoreId(storeId));
   }
 
   @Override
   public SubscriptionProductInformation getSubscriptionProductInformation(String productId) {
-    return SubscriptionProductInformation.getData(productQueryOutPort.findByProductId(productId));
+    return ProductCommand.getSubscriptionProductInformationData(
+        productQueryOutPort.findByProductId(productId));
   }
 
   /**

diff --git a/src/main/java/kr/bb/product/domain/product/application/port/out/ProductQueryOutPort.java b/src/main/java/kr/bb/product/domain/product/application/port/out/ProductQueryOutPort.java
@@ -1,7 +1,8 @@
 package kr.bb.product.domain.product.application.port.out;
 
+import bloomingblooms.domain.product.IsProductPriceValid;
 import java.util.List;
-import kr.bb.product.common.dto.IsProductPriceValid;
+import java.util.Map;
 import kr.bb.product.domain.product.entity.Product;
 import kr.bb.product.domain.product.entity.ProductCommand;
 import kr.bb.product.domain.product.entity.ProductSaleStatus;
@@ -31,4 +32,6 @@ Page<Product> findStoreProducts(
   List<Product> findProductByProductIds(List<String> productIds);
 
   boolean findProductPriceValid(List<IsProductPriceValid> productPriceValids);
+
+  Map<String, String> findProductNameByProductIdsForReviewByUserId(List<String> productIds);
 }
diff --git a/src/main/java/kr/bb/product/domain/product/application/usecase/ProductQueryUseCase.java b/src/main/java/kr/bb/product/domain/product/application/usecase/ProductQueryUseCase.java
@@ -1,11 +1,11 @@
 package kr.bb.product.domain.product.application.usecase;
 
+import bloomingblooms.domain.product.IsProductPriceValid;
+import bloomingblooms.domain.product.ProductInformation;
+import bloomingblooms.domain.product.ProductThumbnail;
+import bloomingblooms.domain.product.StoreSubscriptionProductId;
+import bloomingblooms.domain.product.SubscriptionProductInformation;
 import java.util.List;
-import kr.bb.product.common.dto.IsProductPriceValid;
-import kr.bb.product.common.dto.ProductInformation;
-import kr.bb.product.common.dto.ProductThumbnail;
-import kr.bb.product.common.dto.StoreSubscriptionProductId;
-import kr.bb.product.common.dto.SubscriptionProductInformation;
 import kr.bb.product.domain.product.entity.ProductCommand;
 import kr.bb.product.domain.product.entity.ProductCommand.ProductList;
 import kr.bb.product.domain.product.entity.ProductCommand.SortOption;

diff --git a/src/main/java/kr/bb/product/domain/product/entity/ProductCommand.java b/src/main/java/kr/bb/product/domain/product/entity/ProductCommand.java
@@ -1,5 +1,9 @@
 package kr.bb.product.domain.product.entity;
 
+import bloomingblooms.domain.product.ProductInformation;
+import bloomingblooms.domain.product.ProductThumbnail;
+import bloomingblooms.domain.product.StoreSubscriptionProductId;
+import bloomingblooms.domain.product.SubscriptionProductInformation;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -450,4 +454,32 @@ public void setLiked(Boolean liked) {
       isLiked = liked;
     }
   }
+    public static List<ProductInformation> getProductInformationListData(List<Product> productByProductIds) {
+    return productByProductIds.stream()
+        .map(
+            item ->
+                ProductInformation.builder()
+                    .productId(item.getProductId())
+                    .productName(item.getProductName())
+                    .productThumbnail(item.getProductThumbnail())
+                    .build())
+        .collect(Collectors.toList());
+  }
+    public static ProductThumbnail getProductThumbnailData(Product byProductId) {
+    return ProductThumbnail.builder().productThumbnail(byProductId.getProductThumbnail()).build();
+  }
+    public static StoreSubscriptionProductId getStoreSubscriptionProductIdData(Product subscriptionProductByStoreId) {
+    return StoreSubscriptionProductId.builder()
+        .subscriptionProductId(subscriptionProductByStoreId.getProductId())
+        .build();
+  }
+    public static SubscriptionProductInformation getSubscriptionProductInformationData(Product product) {
+    return SubscriptionProductInformation.builder()
+        .productName(product.getProductName())
+        .productThumbnail(product.getProductThumbnail())
+        .unitPrice(product.getProductPrice())
+        .storeId(product.getStoreId())
+        .build();
+  }
+
 }
diff --git a/src/main/java/kr/bb/product/domain/product/infrastructure/client/WishlistServiceClient.java b/src/main/java/kr/bb/product/domain/product/infrastructure/client/WishlistServiceClient.java
@@ -17,12 +17,12 @@
 public interface WishlistServiceClient {
 
   @CircuitBreaker(name = "getProductsMemberLikesFallback", fallbackMethod = "getProductsMemberLikesFallback")
-  @PostMapping("/likes/{userId}")
+  @PostMapping("/client/likes/{userId}")
   CommonResponse<List<String>> getProductsMemberLikes(
       @PathVariable Long userId, List<String> productIds);
 
   @CircuitBreaker(name = "getProductDetailLikesFallback", fallbackMethod = "getProductDetailLikesFallback")
-  @GetMapping("/likes/{userId}/product/{productId}")
+  @GetMapping("/client/likes/{userId}/product/{productId}")
   CommonResponse<ProductDetailLike> getProductDetailLikes(
       @PathVariable String productId, @PathVariable Long userId);
 

diff --git a/src/main/java/kr/bb/product/domain/review/application/port/in/ReviewQueryInputPort.java b/src/main/java/kr/bb/product/domain/review/application/port/in/ReviewQueryInputPort.java
@@ -78,7 +78,13 @@ public ReviewCommand.ProductDetailReviewList findReviewsByProductId(
   @Override
   public ReviewList findReviewsByUserId(Long userId, Pageable pageable, SortOption sortOption) {
     Pageable pageRequest = getPageable(pageable, sortOption);
+    Page<Review> reviewsByUserId = reviewQueryOutPort.findReviewsByUserId(userId, pageRequest);
+    List<String> productIds =
+        reviewsByUserId.getContent().stream()
+            .map(Review::getProductId)
+            .collect(Collectors.toList());
     return ReviewCommand.ReviewList.getData(
-        reviewQueryOutPort.findReviewsByUserId(userId, pageRequest));
+        reviewsByUserId,
+        productQueryOutPort.findProductNameByProductIdsForReviewByUserId(productIds));
   }
 }
diff --git a/src/main/java/kr/bb/product/domain/review/entity/ReviewCommand.java b/src/main/java/kr/bb/product/domain/review/entity/ReviewCommand.java
@@ -142,6 +142,7 @@ public static class ReviewItem {
     private List<String> reviewImages;
     private String nickname;
     private String profileImage;
+    private String productName;
   }
 
   @Getter
@@ -150,7 +151,8 @@ public static class ReviewList {
     private List<ReviewItem> reviews;
     private int totalCnt;
 
-    public static ReviewList getData(Page<Review> reviewsByUserId) {
+    public static ReviewList getData(
+        Page<Review> reviewsByUserId, Map<String, String> productNames) {
       return ReviewList.builder()
           .reviews(
               reviewsByUserId.getContent().stream()
@@ -160,6 +162,7 @@ public static ReviewList getData(Page<Review> reviewsByUserId) {
                               .reviewId(item.getReviewId())
                               .createdAt(item.getCreatedAt())
                               .nickname(item.getNickname())
+                              .productName(productNames.get(item.getProductId()))
                               .profileImage(item.getProfileImage())
                               .reviewContent(item.getReviewContent())
                               .reviewImages(

diff --git a/src/test/java/kr/bb/product/config/mock/MockingApi.java b/src/test/java/kr/bb/product/config/mock/MockingApi.java
@@ -8,7 +8,7 @@
 public class MockingApi {
   public static void setUpProductDetailLikes(WireMockServer mockCacheApi) {
     mockCacheApi.stubFor(
-        WireMock.get(WireMock.urlMatching("/likes/1/product/123"))
+        WireMock.get(WireMock.urlMatching("/client/likes/1/product/123"))
             .willReturn(
                 WireMock.aResponse()
                     .withStatus(HttpStatus.OK.value())
@@ -17,7 +17,7 @@ public static void setUpProductDetailLikes(WireMockServer mockCacheApi) {
   }
   public static void setUpProductsLikes(WireMockServer mockCacheApi) {
     mockCacheApi.stubFor(
-        WireMock.post(WireMock.urlMatching("/likes/1"))
+        WireMock.post(WireMock.urlMatching("/client/likes/1"))
             .willReturn(
                 WireMock.aResponse()
                     .withStatus(HttpStatus.OK.value())