From 8d9a8378f84dfd231d7e613e794005f2c85ca2b8 Mon Sep 17 00:00:00 2001 From: qwerty1434 Date: Wed, 10 Jan 2024 12:52:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?:wrench:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 0ad4c61..18f257e 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -26,6 +26,6 @@ endpoint: store-service: "" aws: - region: "" + region: "ap-northeast-2" dynamodb: - endpoint: "" \ No newline at end of file + endpoint: "dynamodb.ap-northeast-2.amazonaws.com" \ No newline at end of file From aced78b495d0321824039d6580469596a8499ff7 Mon Sep 17 00:00:00 2001 From: qwerty1434 Date: Wed, 10 Jan 2024 12:54:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?:adhesive=5Fbandage:=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bb/orderquery/domain/pickup/handler/PickupCreator.java | 1 - .../subscription/controller/SubscriptionController.java | 1 - .../domain/subscription/facade/SubscriptionFacade.java | 3 --- .../domain/subscription/handler/SubscriptionCreator.java | 1 - .../domain/subscription/service/SubscriptionService.java | 1 - .../orderquery/{AbstractContainer.java => DynamoEnv.java} | 2 +- .../orderquery/domain/pickup/facade/PickupFacadeTest.java | 7 ++++--- .../domain/pickup/service/PickupServiceTest.java | 5 ++--- .../subscription/handler/SubscriptionReaderTest.java | 5 ++--- .../subscription/service/SubscriptionServiceTest.java | 5 ++--- 10 files changed, 11 insertions(+), 20 deletions(-) rename src/test/java/kr/bb/orderquery/{AbstractContainer.java => DynamoEnv.java} (96%) diff --git a/src/main/java/kr/bb/orderquery/domain/pickup/handler/PickupCreator.java b/src/main/java/kr/bb/orderquery/domain/pickup/handler/PickupCreator.java index 7a42c1e..91a43da 100644 --- a/src/main/java/kr/bb/orderquery/domain/pickup/handler/PickupCreator.java +++ b/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; diff --git a/src/main/java/kr/bb/orderquery/domain/subscription/controller/SubscriptionController.java b/src/main/java/kr/bb/orderquery/domain/subscription/controller/SubscriptionController.java index b7b73fe..b03d060 100644 --- a/src/main/java/kr/bb/orderquery/domain/subscription/controller/SubscriptionController.java +++ b/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; diff --git a/src/main/java/kr/bb/orderquery/domain/subscription/facade/SubscriptionFacade.java b/src/main/java/kr/bb/orderquery/domain/subscription/facade/SubscriptionFacade.java index ebb3b5d..aba490e 100644 --- a/src/main/java/kr/bb/orderquery/domain/subscription/facade/SubscriptionFacade.java +++ b/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; diff --git a/src/main/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionCreator.java b/src/main/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionCreator.java index 147df34..697969e 100644 --- a/src/main/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionCreator.java +++ b/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; diff --git a/src/main/java/kr/bb/orderquery/domain/subscription/service/SubscriptionService.java b/src/main/java/kr/bb/orderquery/domain/subscription/service/SubscriptionService.java index 47977da..99d0fae 100644 --- a/src/main/java/kr/bb/orderquery/domain/subscription/service/SubscriptionService.java +++ b/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; diff --git a/src/test/java/kr/bb/orderquery/AbstractContainer.java b/src/test/java/kr/bb/orderquery/DynamoEnv.java similarity index 96% rename from src/test/java/kr/bb/orderquery/AbstractContainer.java rename to src/test/java/kr/bb/orderquery/DynamoEnv.java index fabaa57..6362a6b 100644 --- a/src/test/java/kr/bb/orderquery/AbstractContainer.java +++ b/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; diff --git a/src/test/java/kr/bb/orderquery/domain/pickup/facade/PickupFacadeTest.java b/src/test/java/kr/bb/orderquery/domain/pickup/facade/PickupFacadeTest.java index b52d781..eb13724 100644 --- a/src/test/java/kr/bb/orderquery/domain/pickup/facade/PickupFacadeTest.java +++ b/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(); } diff --git a/src/test/java/kr/bb/orderquery/domain/pickup/service/PickupServiceTest.java b/src/test/java/kr/bb/orderquery/domain/pickup/service/PickupServiceTest.java index fea45e0..d44e728 100644 --- a/src/test/java/kr/bb/orderquery/domain/pickup/service/PickupServiceTest.java +++ b/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 diff --git a/src/test/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionReaderTest.java b/src/test/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionReaderTest.java index 99e1221..a3554bd 100644 --- a/src/test/java/kr/bb/orderquery/domain/subscription/handler/SubscriptionReaderTest.java +++ b/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 diff --git a/src/test/java/kr/bb/orderquery/domain/subscription/service/SubscriptionServiceTest.java b/src/test/java/kr/bb/orderquery/domain/subscription/service/SubscriptionServiceTest.java index 02c5bd3..856d56f 100644 --- a/src/test/java/kr/bb/orderquery/domain/subscription/service/SubscriptionServiceTest.java +++ b/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