Merge remote-tracking branch 'refs/remotes/origin/LF1-687-delivery-st…

…atus-change-done' into LF1-687-delivery-status-change-done

build.gradle

@@ -94,7 +94,7 @@ test {
                      "**/handler/**",
                      "**/common/**",
                      "**/api/**",
-                    "**/emitter/**"
+                     "**/emitter/**"
         ]
     }
     useJUnitPlatform()

src/main/java/kr/bb/notification/domain/notification/application/NotificationCommandService.java

@@ -8,6 +8,7 @@
 import kr.bb.notification.domain.notification.entity.MemberNotificationCommand;
 import kr.bb.notification.domain.notification.entity.Notification;
 import kr.bb.notification.domain.notification.entity.NotificationCommand;
+import kr.bb.notification.domain.notification.repository.MemberNotificationJpaRepository;
 import kr.bb.notification.domain.notification.repository.NotificationJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -37,6 +38,7 @@ public void saveResaleNotification(NotificationData<ResaleNotificationList> rest
   }
 
   public void saveSingleNotification(PublishNotificationInformation publishInformation, Long id) {
-    notificationJpaRepository.save(getNotification(publishInformation, id));
+    Notification notification = getNotification(publishInformation, id);
+    notificationJpaRepository.save(notification);
   }
 }

src/main/java/kr/bb/notification/domain/notification/helper/NotificationActionHelper.java

@@ -9,6 +9,8 @@
 import kr.bb.notification.domain.notification.application.NotificationCommandService;
 import kr.bb.notification.domain.notification.entity.NotificationCommand.NotificationInformation;
 import kr.bb.notification.domain.notification.infrastructure.dto.OrderCancelNotification;
+import kr.bb.notification.domain.notification.infrastructure.dto.SettlementNotification;
+import kr.bb.notification.domain.notification.infrastructure.dto.OutOfStockNotification;
 import kr.bb.notification.domain.notification.infrastructure.sms.SendSMS;
 import kr.bb.notification.domain.notification.infrastructure.sse.SendSSE;
 import lombok.RequiredArgsConstructor;
@@ -67,9 +69,21 @@ public void publishNewOrderNotification(NotificationData<NewOrderNotification> n
         notification.getPublishInformation(), notification.getWhoToNotify().getStoreId());
   }
 
+  public void publishOutOfStockNotification(
+      NotificationData<OutOfStockNotification> outOfStockNotification) {
+    NotificationInformation sseData =
+        NotificationInformation.getSSEData(
+            outOfStockNotification.getPublishInformation(),
+            outOfStockNotification.getWhoToNotify().getStoreId());
+    sse.publishCustomer(sseData);
+
+    notificationCommandService.saveSingleNotification(
+        outOfStockNotification.getPublishInformation(),
+        outOfStockNotification.getWhoToNotify().getStoreId());
+  }
+
   public void publishDeliveryStartNotification(
       NotificationData<DeliveryNotification> notificationData) {
-
     NotificationInformation notifyData =
         NotificationInformation.getDeliveryNotificationData(notificationData);
     sse.publishCustomer(notifyData);
@@ -80,8 +94,20 @@ public void publishDeliveryStartNotification(
         notificationData.getPublishInformation(), notificationData.getWhoToNotify().getUserId());
   }
 
-  public void publishOrderCancelNotification(NotificationData<OrderCancelNotification> notification) {
-    NotificationInformation sseData = NotificationInformation.getSSEData(
+  public void publishSettlementNotification(NotificationData<SettlementNotification> notification) {
+    NotificationInformation sseData =
+        NotificationInformation.getSSEData(
+            notification.getPublishInformation(), notification.getWhoToNotify().getStoreId());
+    sse.publishCustomer(sseData);
+
+    notificationCommandService.saveSingleNotification(
+        notification.getPublishInformation(), notification.getWhoToNotify().getStoreId());
+  }
+
+  public void publishOrderCancelNotification(
+      NotificationData<OrderCancelNotification> notification) {
+    NotificationInformation sseData =
+        NotificationInformation.getSSEData(
             notification.getPublishInformation(), notification.getWhoToNotify().getStoreId());
     sse.publishCustomer(sseData);
 

src/main/java/kr/bb/notification/domain/notification/infrastructure/dto/OutOfStockNotification.java

@@ -0,0 +1,10 @@
+package kr.bb.notification.domain.notification.infrastructure.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class OutOfStockNotification {
+    private Long storeId;
+}

src/main/java/kr/bb/notification/domain/notification/infrastructure/dto/SettlementNotification.java

@@ -0,0 +1,11 @@
+package kr.bb.notification.domain.notification.infrastructure.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class SettlementNotification {
+  // TODO: 정산 알림 가게 id를 어떻게 받을지 정의 필요
+  private Long storeId;
+}

src/main/java/kr/bb/notification/domain/notification/infrastructure/message/NotificationSQSListener.java

@@ -13,6 +13,8 @@
 import java.util.Map;
 import kr.bb.notification.domain.notification.helper.NotificationActionHelper;
 import kr.bb.notification.domain.notification.infrastructure.dto.OrderCancelNotification;
+import kr.bb.notification.domain.notification.infrastructure.dto.OutOfStockNotification;
+import kr.bb.notification.domain.notification.infrastructure.dto.SettlementNotification;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cloud.aws.messaging.listener.Acknowledgment;
 import org.springframework.cloud.aws.messaging.listener.SqsMessageDeletionPolicy;
@@ -182,6 +184,48 @@ public void consumeDeliveryStartNotificationQueue(
     ack.acknowledge();
   }
 
+  @SqsListener(
+      value = "${cloud.aws.sqs.settlement-notification-queue.name}",
+      deletionPolicy = SqsMessageDeletionPolicy.NEVER)
+  public void consumeSettlementNotificationQueue(
+      @Payload String message, @Headers Map<String, String> headers, Acknowledgment ack)
+      throws JsonProcessingException {
+    NotificationData<SettlementNotification> settlement =
+        objectMapper.readValue(
+            message,
+            objectMapper
+                .getTypeFactory()
+                .constructParametricType(NotificationData.class, SettlementNotification.class));
+    NotificationData<SettlementNotification> notification =
+        NotificationData.notifyData(
+            settlement.getWhoToNotify(),
+            PublishNotificationInformation.updateRole(
+                settlement.getPublishInformation(), Role.MANAGER));
+    // call facade
+    notificationActionHelper.publishSettlementNotification(notification);
+  }
+
+  @SqsListener(
+      value = "${cloud.aws.sqs.out-of-stock-notification-queue.name}",
+      deletionPolicy = SqsMessageDeletionPolicy.NEVER)
+  public void consumeOutOfStockNotificationQueue(
+      @Payload String message, @Headers Map<String, String> headers, Acknowledgment ack)
+      throws JsonProcessingException {
+    NotificationData<OutOfStockNotification> outOfStock =
+        objectMapper.readValue(
+            message,
+            objectMapper
+                .getTypeFactory()
+                .constructParametricType(NotificationData.class, OutOfStockNotification.class));
+    NotificationData<OutOfStockNotification> notification =
+        NotificationData.notifyData(
+            outOfStock.getWhoToNotify(),
+            PublishNotificationInformation.updateRole(
+                outOfStock.getPublishInformation(), Role.MANAGER));
+    // call facade
+    notificationActionHelper.publishOutOfStockNotification(notification);
+  }
+
   @SqsListener(
       value = "${cloud.aws.sqs.order-cancel-notification-queue.name}",
       deletionPolicy = SqsMessageDeletionPolicy.NEVER)

src/test/resources/application.yml

@@ -55,6 +55,12 @@ cloud:
       delivery-status-update-notification-queue:
         name: ""
         url: ""
+      settlement-notification-queue:
+        name: ""
+        url: ""
+      out-of-stock-notification-queue:
+        name: ""
+        url: ""
       order-cancel-notification-queue:
         name: ""
         url: ""