[FEAT] 스케줄링 요청을 위한 ScheduleDto 추가 #93

Team-Umbba · Aug 14, 2023 · cf4fcb7 · cf4fcb7
1 parent e0e494e
commit cf4fcb7
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 32 deletions.
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/notification/NotificationService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/notification/NotificationService.java
@@ -7,7 +7,10 @@
 import sopt.org.umbba.api.config.sqs.producer.SqsProducer;
 import sopt.org.umbba.common.exception.ErrorType;
 import sopt.org.umbba.common.exception.model.CustomException;
+import sopt.org.umbba.common.sqs.MessageType;
 import sopt.org.umbba.common.sqs.dto.FCMPushRequestDto;
+import sopt.org.umbba.common.sqs.dto.MessageDto;
+import sopt.org.umbba.common.sqs.dto.ScheduleDto;
 import sopt.org.umbba.common.sqs.dto.SlackDto;
 import sopt.org.umbba.domain.domain.user.User;
 import sopt.org.umbba.domain.domain.user.repository.UserRepository;
@@ -47,4 +50,8 @@ public void pushOpponentReply(String question, Long userId) {
             throw new CustomException(ErrorType.FAIL_TO_SEND_PUSH_ALARM);
         }*/
     }
+
+    public void activateTodayQna() {
+        sqsProducer.produce(ScheduleDto.of());
+    }
 }
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/parentchild/ParentchildService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/parentchild/ParentchildService.java
@@ -11,6 +11,7 @@
 import sopt.org.umbba.api.controller.parentchild.dto.response.InviteResultResponseDto;
 import sopt.org.umbba.api.controller.parentchild.dto.response.OnboardingInviteResponseDto;
 import sopt.org.umbba.api.controller.parentchild.dto.response.OnboardingReceiveResponseDto;
+import sopt.org.umbba.api.service.notification.NotificationService;
 import sopt.org.umbba.common.exception.ErrorType;
 import sopt.org.umbba.common.exception.model.CustomException;
 import sopt.org.umbba.domain.domain.parentchild.Parentchild;
@@ -34,7 +35,7 @@ public class ParentchildService {
     private final ParentchildRepository parentchildRepository;
     private final UserRepository userRepository;
     private final ParentchildDao parentchildDao;
-//    private final FCMScheduler fcmScheduler; TODO ⭐️SQS로 변경
+    private final NotificationService notificationService;
 
     // [발신] 초대하는 측의 온보딩 정보 입력
     @Transactional
@@ -120,7 +121,8 @@ public OnboardingReceiveResponseDto onboardReceive(Long userId, OnboardingReceiv
         /*if (!ParentchildRelation.validate(parentChildUsers, parentchild.getRelation())) {
             throw new CustomException(ErrorType.INVALID_PARENT_CHILD_RELATION);
         }*/
-        // TODO ⭐️SQS로 변경
+
+        notificationService.activateTodayQna();
 //        ScheduleConfig.resetScheduler();
 //        fcmScheduler.pushTodayQna();
 

diff --git a/umbba-common/src/main/java/sopt/org/umbba/common/sqs/MessageType.java b/umbba-common/src/main/java/sopt/org/umbba/common/sqs/MessageType.java
@@ -8,5 +8,6 @@ public final class MessageType {
 
 	public static final String MESSAGE_TYPE_HEADER = "TYPE";
 	public static final String FIREBASE = "FIREBASE";
+	public static final String SCHEDULE = "SCHEDULE";
 	public static final String SLACK = "SLACK";
 }
diff --git a/umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/FirebaseDto.java b/umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/FirebaseDto.java
diff --git a/umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/ScheduleDto.java b/umbba-common/src/main/java/sopt/org/umbba/common/sqs/dto/ScheduleDto.java
@@ -0,0 +1,23 @@
+package sopt.org.umbba.common.sqs.dto;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.slf4j.Slf4j;
+import sopt.org.umbba.common.sqs.MessageType;
+
+@Slf4j
+@Getter
+@SuperBuilder
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ScheduleDto extends MessageDto{
+
+    public static ScheduleDto of() {
+        return ScheduleDto.builder()
+                .type(MessageType.SCHEDULE)
+                .build();
+    }
+}
diff --git a/...tification/src/main/java/sopt/org/umbba/notification/config/sqs/consumer/SqsConsumer.java b/...tification/src/main/java/sopt/org/umbba/notification/config/sqs/consumer/SqsConsumer.java
@@ -13,12 +13,10 @@
 import sopt.org.umbba.common.sqs.MessageType;
 import sopt.org.umbba.common.sqs.MessageUtils;
 import sopt.org.umbba.common.sqs.dto.FCMPushRequestDto;
-import sopt.org.umbba.common.sqs.dto.FirebaseDto;
 import sopt.org.umbba.common.sqs.dto.SlackDto;
 import sopt.org.umbba.notification.service.fcm.FCMService;
 import sopt.org.umbba.notification.service.slack.SlackApi;
 
-import javax.websocket.SendResult;
 import java.util.Map;
 
 /**

diff --git a/...otification/src/main/java/sopt/org/umbba/notification/service/scheduler/FCMScheduler.java b/...otification/src/main/java/sopt/org/umbba/notification/service/scheduler/FCMScheduler.java
@@ -46,8 +46,7 @@ public String pushTodayQna()  {
 //                String cronExpression = String.format("*/20 * * * * *");
                 log.info("cron: {}", cronExpression);
                 fcmService.schedulePushAlarm(cronExpression, pc.getId());
-            })
-                ;
+            });
         return "Today QnA messages were sent successfully";
     }