Merge pull request #10 from lotteon2/refactor

🩹 사용하지 않는 import 삭제

src/main/java/kr/bb/orderquery/domain/pickup/handler/PickupCreator.java

@@ -2,7 +2,6 @@
 
 import bloomingblooms.domain.pickup.PickupCreateDto;
 import bloomingblooms.domain.store.StoreNameAndAddressDto;
-import bloomingblooms.domain.product.ProductInfoDto;
 import kr.bb.orderquery.domain.pickup.entity.Pickup;
 import kr.bb.orderquery.domain.pickup.repository.PickupRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/kr/bb/orderquery/domain/subscription/controller/SubscriptionController.java

@@ -6,7 +6,6 @@
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionDetailDto;
 import kr.bb.orderquery.domain.subscription.facade.SubscriptionFacade;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDate;

src/main/java/kr/bb/orderquery/domain/subscription/facade/SubscriptionFacade.java

@@ -2,12 +2,9 @@
 
 import bloomingblooms.domain.StatusChangeDto;
 import bloomingblooms.domain.subscription.SubscriptionCreateDto;
-import bloomingblooms.domain.subscription.SubscriptionDateDto;
 import bloomingblooms.domain.subscription.SubscriptionDateDtoList;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import kr.bb.orderquery.client.ProductFeignClient;
-import bloomingblooms.domain.product.ProductInfoDto;
 import kr.bb.orderquery.domain.subscription.controller.response.SubscriptionsForDateResponse;
 import kr.bb.orderquery.domain.subscription.controller.response.SubscriptionsForMypageResponse;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionDetailDto;

src/main/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionCreator.java

@@ -1,7 +1,6 @@
 package kr.bb.orderquery.domain.subscription.handler;
 
 import bloomingblooms.domain.subscription.SubscriptionCreateDto;
-import bloomingblooms.domain.product.ProductInfoDto;
 import kr.bb.orderquery.domain.subscription.entity.Subscription;
 import kr.bb.orderquery.domain.subscription.repository.SubscriptionRepository;
 import lombok.RequiredArgsConstructor;

src/main/java/kr/bb/orderquery/domain/subscription/service/SubscriptionService.java

@@ -1,6 +1,5 @@
 package kr.bb.orderquery.domain.subscription.service;
 
-import bloomingblooms.domain.product.ProductInfoDto;
 import bloomingblooms.domain.subscription.SubscriptionCreateDto;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionDetailDto;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionForDateDto;

src/test/java/kr/bb/orderquery/AbstractContainer.java → src/test/java/kr/bb/orderquery/DynamoEnv.java

@@ -6,7 +6,7 @@
 import org.testcontainers.containers.GenericContainer;
 
 @ActiveProfiles("test")
-public abstract class AbstractContainer {
+public abstract class DynamoEnv {
     static final String DYNAMODB_IMAGE = "amazon/dynamodb-local:2.1.0";
 
     static final GenericContainer DYNAMODB_CONTAINER;

src/test/java/kr/bb/orderquery/domain/pickup/facade/PickupFacadeTest.java

@@ -6,7 +6,7 @@
 import com.amazonaws.services.dynamodbv2.model.Projection;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.util.TableUtils;
-import kr.bb.orderquery.AbstractContainer;
+import kr.bb.orderquery.DynamoEnv;
 import kr.bb.orderquery.domain.pickup.controller.response.PickAndSubResponse;
 import kr.bb.orderquery.domain.pickup.entity.Pickup;
 import kr.bb.orderquery.domain.pickup.repository.PickupRepository;
@@ -20,7 +20,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.aws.messaging.listener.SimpleMessageListenerContainer;
-import org.springframework.test.context.ActiveProfiles;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDate;
@@ -30,7 +29,7 @@
 
 @Testcontainers
 @SpringBootTest
-class PickupFacadeTest extends AbstractContainer {
+class PickupFacadeTest extends DynamoEnv {
     @MockBean
     SimpleMessageListenerContainer simpleMessageListenerContainer;
     @Autowired
@@ -125,6 +124,7 @@ private Subscription createSubscriptionWithStoreIdAndNextDeliveryDate(Long store
                 .actualPrice(10_200L)
                 .reviewStatus("REVIEW_READY")
                 .isUnsubscribed(false)
+                .productId("p1")
                 .build();
     }
 
@@ -153,6 +153,7 @@ private Pickup createPickupWithStoreIdAndPickupDate(Long storeId, LocalDate pick
                 .reservationStatus("RESERVATION_READY")
                 .reviewStatus("REVIEW_READY")
                 .cardStatus("CARD_READY")
+                .productId("p1")
                 .build();
     }
 

src/test/java/kr/bb/orderquery/domain/pickup/service/PickupServiceTest.java

@@ -8,8 +8,7 @@
 import com.amazonaws.services.dynamodbv2.model.Projection;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.util.TableUtils;
-import kr.bb.orderquery.AbstractContainer;
-import bloomingblooms.domain.product.ProductInfoDto;
+import kr.bb.orderquery.DynamoEnv;
 import kr.bb.orderquery.domain.pickup.dto.PickupDetailDto;
 import kr.bb.orderquery.domain.pickup.dto.PickupsForDateDto;
 import kr.bb.orderquery.domain.pickup.dto.PickupsInMypageDto;
@@ -41,7 +40,7 @@
 @Testcontainers
 @SpringBootTest
 @ActiveProfiles("test")
-class PickupServiceTest extends AbstractContainer {
+class PickupServiceTest extends DynamoEnv {
     @MockBean
     SimpleMessageListenerContainer simpleMessageListenerContainer;
     @Autowired

src/test/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionReaderTest.java

@@ -6,7 +6,7 @@
 import com.amazonaws.services.dynamodbv2.model.Projection;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.util.TableUtils;
-import kr.bb.orderquery.AbstractContainer;
+import kr.bb.orderquery.DynamoEnv;
 import kr.bb.orderquery.domain.subscription.entity.Subscription;
 import kr.bb.orderquery.domain.subscription.repository.SubscriptionRepository;
 import org.junit.jupiter.api.AfterEach;
@@ -17,7 +17,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.cloud.aws.messaging.listener.SimpleMessageListenerContainer;
-import org.springframework.test.context.ActiveProfiles;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDate;
@@ -29,7 +28,7 @@
 
 @Testcontainers
 @SpringBootTest
-class SubscriptionReaderTest extends AbstractContainer {
+class SubscriptionReaderTest extends DynamoEnv {
     @MockBean
     SimpleMessageListenerContainer simpleMessageListenerContainer;
     @Autowired

src/test/java/kr/bb/orderquery/domain/subscription/service/SubscriptionServiceTest.java

@@ -7,8 +7,7 @@
 import com.amazonaws.services.dynamodbv2.model.Projection;
 import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;
 import com.amazonaws.services.dynamodbv2.util.TableUtils;
-import kr.bb.orderquery.AbstractContainer;
-import bloomingblooms.domain.product.ProductInfoDto;
+import kr.bb.orderquery.DynamoEnv;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionDetailDto;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionForDateDto;
 import kr.bb.orderquery.domain.subscription.dto.SubscriptionForUserDto;
@@ -37,7 +36,7 @@
 @Testcontainers
 @SpringBootTest
 @ActiveProfiles("test")
-class SubscriptionServiceTest extends AbstractContainer {
+class SubscriptionServiceTest extends DynamoEnv {
     @MockBean
     SimpleMessageListenerContainer simpleMessageListenerContainer;
     @Autowired

src/test/resources/application.yml

@@ -26,6 +26,6 @@ endpoint:
   store-service: ""
 
 aws:
-  region: ""
+  region: "ap-northeast-2"
   dynamodb:
-    endpoint: ""
+    endpoint: "dynamodb.ap-northeast-2.amazonaws.com"