#198 신규주문에 대한 메시지 Publish 기능 어플리케이션에 추가 (#203)

* Build : configuration * Test : * Chore : format 탭 수정 * Chore : google java format 적용 * Format : Google Java Format * Feat : RabbitMQ 프로듀서의 MessageConverter 오버라이드 * Feat : 신규주문 MessageProducer부터 > RabbitMQ 까지테스트 * Feat : MessageProducer 빈등록 + 생성방법 변경 * Format : Google Java Format * Feat : RabbitMQ 테스트컨테이너 활용 * Feat : formatting * Format : Google Java Format * Refactor : 미사용 설정정보 삭제 * Fix : 임시주석 * Format : Google Java Format * Fix : syntax error * Fix : 잘못된 static import any() * Format : Google Java Format Co-authored-by: github-actions <>
f-lab-edu · Mar 17, 2022 · 21c2359 · 21c2359
1 parent 187e27b
commit 21c2359
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 31 deletions.
diff --git a/...src/integrationTest/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImplTest.java b/...src/integrationTest/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImplTest.java
@@ -0,0 +1,91 @@
+package com.inbobwetrust.publisher;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+
+import com.inbobwetrust.domain.Delivery;
+import com.inbobwetrust.repository.DeliveryRepository;
+import java.time.LocalDateTime;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import org.testcontainers.containers.RabbitMQContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@AutoConfigureWebTestClient
+@Testcontainers
+@ContextConfiguration
+public class DeliveryMessagePublisherImplTest {
+
+ @Value("messageQueue.exchange.shop")
+ private String shopExchange;
+
+ @Value("messageQueue.exchange.agency")
+ private String agencyExchange;
+
+ @Autowired WebTestClient webTestClient;
+
+ @Autowired DeliveryRepository deliveryRepository;
+
+ @Container
+ static RabbitMQContainer container = new RabbitMQContainer("rabbitmq:3.7.25-management-alpine");
+
+ @SpyBean AmqpTemplate amqpTemplate;
+
+ @DynamicPropertySource
+ static void configure(DynamicPropertyRegistry registry) {
+ registry.add("spring.rabbitmq.host", container::getContainerIpAddress);
+ registry.add("spring.rabbitmq.port", container::getAmqpPort);
+ }
+
+ @Test
+ void sendAddDeliveryEventTest() throws InterruptedException {
+ // given
+ var delivery = makeValidDelivery();
+ // when
+ var resBody =
+ this.webTestClient
+ .post()
+ .uri("/api/delivery")
+ .bodyValue(delivery)
+ .exchange()
+ .expectStatus()
+ .isOk()
+ .expectBody(Delivery.class)
+ .returnResult()
+ .getResponseBody();
+
+ Thread.sleep(1000L);
+ // then
+ var savedDelivery = deliveryRepository.findAll().blockLast();
+ delivery.setId(savedDelivery.getId());
+ assertTrue(delivery.getShopId().equals(savedDelivery.getShopId()));
+ assertTrue(delivery.getCustomerId().equals(savedDelivery.getCustomerId()));
+ Mockito.verify(amqpTemplate, times(1))
+ .convertAndSend(ArgumentMatchers.eq(shopExchange), any(Delivery.class));
+ }
+
+ private Delivery makeValidDelivery() {
+ return Delivery.builder()
+ .shopId("shop1234")
+ .orderId("order-1234")
+ .customerId("customer-1234")
+ .address("서울시 강남구 삼성동 봉은사로 12-41")
+ .phoneNumber("01031583212")
+ .orderTime(LocalDateTime.now())
+ .build();
+ }
+}
diff --git a/delivery-info-service/src/main/java/com/inbobwetrust/config/Jack2JsonConfiguration.java b/delivery-info-service/src/main/java/com/inbobwetrust/config/Jack2JsonConfiguration.java
@@ -0,0 +1,17 @@
+package com.inbobwetrust.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class Jack2JsonConfiguration {
+
+ @Bean
+ public Jackson2JsonMessageConverter jsonMessageConverter() {
+ return new Jackson2JsonMessageConverter(
+ new ObjectMapper().registerModule(new JavaTimeModule()));
+ }
+}
diff --git a/...y-info-service/src/main/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImpl.java b/...y-info-service/src/main/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImpl.java
@@ -1,32 +1,23 @@
 package com.inbobwetrust.publisher;
 
 import com.inbobwetrust.domain.Delivery;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.stereotype.Component;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
 
+@Component
+@RequiredArgsConstructor
+@Slf4j
 public class DeliveryMessagePublisherImpl implements DeliveryPublisher {
 
  private final AmqpTemplate messageQueue;
 
- private String shopExchange;
+ private final String shopExchange = "messageQueue.exchange.shop";
 
- private String agencyExchange;
-
- public DeliveryMessagePublisherImpl(
- AmqpTemplate messageQueue, String shopExchange, String agencyExchange) {
- this.messageQueue = messageQueue;
- this.shopExchange = shopExchange;
- this.agencyExchange = agencyExchange;
- }
-
- public void setShopExchange(String shopExchange) {
- this.shopExchange = shopExchange;
- }
-
- public void setAgencyExchange(String agencyExchange) {
- this.agencyExchange = agencyExchange;
- }
+ private final String agencyExchange = "messageQueue.exchange.agency";
 
  @Override
  public Mono<Delivery> sendAddDeliveryEvent(Delivery delivery) {

diff --git a/delivery-info-service/src/main/java/com/inbobwetrust/publisher/DeliveryPublisherImpl.java b/delivery-info-service/src/main/java/com/inbobwetrust/publisher/DeliveryPublisherImpl.java
@@ -7,12 +7,10 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
-@Component
 @RequiredArgsConstructor
 @Slf4j
 public class DeliveryPublisherImpl implements DeliveryPublisher {
@@ -39,7 +37,6 @@ public Mono<Delivery> sendAddDeliveryEvent(Delivery delivery) {
  .bodyToMono(Delivery.class);
  }
 
- @Override
  public Mono<Delivery> sendSetRiderEvent(Delivery delivery) {
  return webClient
  .post()

diff --git a/delivery-info-service/src/main/java/com/inbobwetrust/service/DeliveryServiceImpl.java b/delivery-info-service/src/main/java/com/inbobwetrust/service/DeliveryServiceImpl.java
@@ -10,15 +10,13 @@
 import com.inbobwetrust.repository.DeliveryRepository;
 import java.util.Objects;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.RetryBackoffSpec;
 
-@Service
-@Slf4j
+@Component
 @RequiredArgsConstructor
 public class DeliveryServiceImpl implements DeliveryService {
  private final DeliveryRepository deliveryRepository;

diff --git a/...fo-service/src/test/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImplTest.java b/...fo-service/src/test/java/com/inbobwetrust/publisher/DeliveryMessagePublisherImplTest.java
@@ -1,15 +1,14 @@
 package com.inbobwetrust.publisher;
 
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 
 import com.inbobwetrust.domain.Delivery;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.amqp.core.AmqpTemplate;
@@ -18,18 +17,18 @@
 @ExtendWith(MockitoExtension.class)
 class DeliveryMessagePublisherImplTest {
 
- @InjectMocks DeliveryMessagePublisherImpl deliveryPublisher;
+ DeliveryMessagePublisherImpl deliveryPublisher;
 
- @Mock AmqpTemplate amqpTemplate;
+ AmqpTemplate amqpTemplate;
 
  private final String SHOP_EXCHANGE = "shop-exchange";
 
  private final String AGENCY_EXCHANGE = "agency-exchange";
 
  @BeforeEach
  void setUp() {
- deliveryPublisher.setShopExchange("shop-exchange");
- deliveryPublisher.setAgencyExchange("agency-exchange");
+ amqpTemplate = Mockito.mock(AmqpTemplate.class);
+ deliveryPublisher = new DeliveryMessagePublisherImpl(amqpTemplate);
  }
 
  @Test