[fix] FCM 메세지 분류용 messageType 필드 추가

src/main/java/com/kustacks/kuring/admin/adapter/in/web/AdminCommandApiV2.java

@@ -1,6 +1,7 @@
 package com.kustacks.kuring.admin.adapter.in.web;
 
 import com.google.firebase.database.annotations.NotNull;
+import com.kustacks.kuring.admin.adapter.in.web.dto.AcademicTestNotificationRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.AdminAlertCreateRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.RealNotificationRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.TestNotificationRequest;
@@ -38,6 +39,7 @@
 
 import static com.kustacks.kuring.common.dto.ResponseCodeAndMessages.ADMIN_EMBEDDING_NOTICE_SUCCESS;
 import static com.kustacks.kuring.common.dto.ResponseCodeAndMessages.ADMIN_REAL_NOTICE_CREATE_SUCCESS;
+import static com.kustacks.kuring.common.dto.ResponseCodeAndMessages.ADMIN_TEST_ACADEMIC_CREATE_SUCCESS;
 import static com.kustacks.kuring.common.dto.ResponseCodeAndMessages.ADMIN_TEST_NOTICE_CREATE_SUCCESS;
 
 @Tag(name = "Admin-Command", description = "관리자가 주체가 되는 정보 수정")
@@ -75,6 +77,18 @@ public ResponseEntity<BaseResponse<String>> createRealNotice(
         return ResponseEntity.ok().body(new BaseResponse<>(ADMIN_REAL_NOTICE_CREATE_SUCCESS, null));
     }
 
+    @Operation(summary = "테스트 학사일정 알림 전송", description = "테스트 학사일정 알림을 전송합니다, 실제 운영시 사용하지 않습니다")
+    @SecurityRequirement(name = "JWT")
+    @Secured(AdminRole.ROLE_ROOT)
+    @PostMapping("/academic/dev")
+    public ResponseEntity<BaseResponse<String>> sendAcademicTest(
+            @RequestBody AcademicTestNotificationRequest request
+    ) {
+        adminCommandUseCase.createAcademicTestNotification(request.toCommand());
+        return ResponseEntity.ok().body(new BaseResponse<>(ADMIN_TEST_ACADEMIC_CREATE_SUCCESS, null));
+    }
+
+
     @Operation(summary = "예약 알림 등록", description = "서버에 알림 시간을 yyyy-MM-dd HH:mm:ss 형태로 요청시 예약 알림을 등록한다")
     @SecurityRequirement(name = "JWT")
     @Secured(AdminRole.ROLE_ROOT)

src/main/java/com/kustacks/kuring/admin/adapter/in/web/dto/AcademicTestNotificationRequest.java

@@ -0,0 +1,12 @@
+package com.kustacks.kuring.admin.adapter.in.web.dto;
+
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
+
+public record AcademicTestNotificationRequest(
+        String title,
+        String body
+) {
+    public AcademicTestNotificationCommand toCommand() {
+        return new AcademicTestNotificationCommand(title, body);
+    }
+}

src/main/java/com/kustacks/kuring/admin/adapter/out/event/AdminFirebaseMessageAdapter.java

@@ -2,6 +2,7 @@
 
 import com.kustacks.kuring.admin.application.port.out.AdminEventPort;
 import com.kustacks.kuring.common.domain.Events;
+import com.kustacks.kuring.message.adapter.in.event.dto.AcademicTestNotificationEvent;
 import com.kustacks.kuring.message.adapter.in.event.dto.AdminNotificationEvent;
 import com.kustacks.kuring.message.adapter.in.event.dto.AdminTestNotificationEvent;
 import com.kustacks.kuring.message.application.service.exception.FirebaseMessageSendException;
@@ -37,4 +38,9 @@ public void sendTestNotificationByAdmin(
                         .build()
         );
     }
+
+    @Override
+    public void sendAcademicTestNotification(String title, String body) {
+        Events.raise(new AcademicTestNotificationEvent(title, body));
+    }
 }

src/main/java/com/kustacks/kuring/admin/application/port/in/AdminCommandUseCase.java

@@ -4,6 +4,7 @@
 import com.kustacks.kuring.admin.application.port.in.dto.TestNotificationCommand;
 import com.kustacks.kuring.alert.application.port.in.dto.AlertCreateCommand;
 import com.kustacks.kuring.alert.application.port.in.dto.DataEmbeddingCommand;
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
 
 public interface AdminCommandUseCase {
 
@@ -18,4 +19,7 @@ public interface AdminCommandUseCase {
     void embeddingCustomData(DataEmbeddingCommand command);
 
     void resubscribeAllUsersToTopics();
+
+    void createAcademicTestNotification(AcademicTestNotificationCommand command);
+
 }

src/main/java/com/kustacks/kuring/admin/application/port/out/AdminEventPort.java

@@ -13,4 +13,7 @@ void sendTestNotificationByAdmin(
             String korName,
             String url
     ) throws FirebaseMessageSendException;
+
+    void sendAcademicTestNotification(String title, String body);
+
 }

src/main/java/com/kustacks/kuring/admin/application/service/AdminCommandService.java

@@ -12,6 +12,7 @@
 import com.kustacks.kuring.auth.userdetails.UserDetailsServicePort;
 import com.kustacks.kuring.common.annotation.UseCase;
 import com.kustacks.kuring.common.properties.ServerProperties;
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
 import com.kustacks.kuring.message.application.port.out.FirebaseSubscribePort;
 import com.kustacks.kuring.notice.domain.CategoryName;
 import com.kustacks.kuring.user.application.port.out.UserQueryPort;
@@ -82,6 +83,14 @@ public void createRealNoticeForAllUser(RealNotificationCommand command) {
         adminEventPort.sendNotificationByAdmin(command.title(), command.body(), command.url());
     }
 
+    @Override
+    public void createAcademicTestNotification(AcademicTestNotificationCommand command) {
+        adminEventPort.sendAcademicTestNotification(
+                command.title(),
+                command.body()
+        );
+    }
+
     @Override
     public void addAlertSchedule(AlertCreateCommand command) {
         adminAlertEventPort.addAlertSchedule(command.title(), command.content(), command.alertTime());

src/main/java/com/kustacks/kuring/calendar/application/service/AcademicEventNotificationService.java

@@ -99,6 +99,7 @@ private Message makeMessage(String title, String body) {
                 .setTopic(serverProperties.ifDevThenAddSuffix(ACADEMIC_EVENT_TOPIC))
                 .putData("title", title)
                 .putData("body", body)
+                .putData("messageType", "academic")
                 .build();
     }
 }

src/main/java/com/kustacks/kuring/common/dto/ResponseCodeAndMessages.java

@@ -30,6 +30,7 @@ public enum ResponseCodeAndMessages {
     ADMIN_LOAD_BAD_WORDS(HttpStatus.OK.value(), "금칙어 로드에 성공했습니다."),
     ADMIN_LOAD_WHITELIST_WORDS(HttpStatus.OK.value(), "허용 단어 로드에 성공했습니다."),
     ADMIN_USER_SUBSCRIPTION_UPDATE_SUCCESS(HttpStatus.OK.value(), "사용자들의 구독 정보를 성공적으로 재설정했습니다."),
+    ADMIN_TEST_ACADEMIC_CREATE_SUCCESS(HttpStatus.OK.value(), "테스트 학사일정 알림 생성에 성공하였습니다"),
 
     /* User */
     USER_REGISTER_SUCCESS(HttpStatus.OK.value(), "회원가입에 성공하였습니다"),
@@ -52,7 +53,7 @@ public enum ResponseCodeAndMessages {
 
     /* Email */
     EMAIL_SEND_SUCCESS(HttpStatus.OK.value(), "이메일 전송에 성공했습니다."),
-    EMAIL_CODE_VERIFY_SUCCESS(HttpStatus.OK.value(),"인증에 성공했습니다."),
+    EMAIL_CODE_VERIFY_SUCCESS(HttpStatus.OK.value(), "인증에 성공했습니다."),
 
     REPORT_SEARCH_SUCCESS(HttpStatus.OK.value(), "신고 목록 조회에 성공하였습니다"),
     REPORT_COMMENT_SUCCESS(HttpStatus.CREATED.value(), "댓글 신고에 성공했습니다"),

src/main/java/com/kustacks/kuring/message/adapter/in/event/MessageAdminEventListener.java

@@ -1,5 +1,6 @@
 package com.kustacks.kuring.message.adapter.in.event;
 
+import com.kustacks.kuring.message.adapter.in.event.dto.AcademicTestNotificationEvent;
 import com.kustacks.kuring.message.adapter.in.event.dto.AdminNotificationEvent;
 import com.kustacks.kuring.message.adapter.in.event.dto.AdminTestNotificationEvent;
 import com.kustacks.kuring.message.adapter.in.event.dto.AlertSendEvent;
@@ -37,4 +38,13 @@ public void sendAlertEvent(
     ) {
         firebaseWithAdminUseCase.sendNotificationByAdmin(event.toCommand());
     }
+
+    @Async
+    @EventListener
+    public void sendAcademicTestNotificationEvent(
+            AcademicTestNotificationEvent event
+    ) {
+        firebaseWithAdminUseCase.sendAcademicTestNotification(event.toCommand());
+    }
+
 }

src/main/java/com/kustacks/kuring/message/adapter/in/event/dto/AcademicTestNotificationEvent.java

@@ -0,0 +1,12 @@
+package com.kustacks.kuring.message.adapter.in.event.dto;
+
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
+
+public record AcademicTestNotificationEvent(
+        String title,
+        String body
+) {
+    public AcademicTestNotificationCommand toCommand() {
+        return new AcademicTestNotificationCommand(title, body);
+    }
+}

src/main/java/com/kustacks/kuring/message/application/port/in/FirebaseWithAdminUseCase.java

@@ -1,9 +1,14 @@
 package com.kustacks.kuring.message.application.port.in;
 
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
 import com.kustacks.kuring.message.application.port.in.dto.AdminNotificationCommand;
 import com.kustacks.kuring.message.application.port.in.dto.AdminTestNotificationCommand;
 
 public interface FirebaseWithAdminUseCase {
     void sendNotificationByAdmin(AdminNotificationCommand command);
+
     void sendTestNotificationByAdmin(AdminTestNotificationCommand command);
+
+    void sendAcademicTestNotification(AcademicTestNotificationCommand command);
+
 }

src/main/java/com/kustacks/kuring/message/application/port/in/dto/AcademicTestNotificationCommand.java

@@ -0,0 +1,7 @@
+package com.kustacks.kuring.message.application.port.in.dto;
+
+public record AcademicTestNotificationCommand(
+        String title,
+        String body
+) {
+}

src/main/java/com/kustacks/kuring/message/application/service/FirebaseNotificationService.java

@@ -9,6 +9,7 @@
 import com.kustacks.kuring.common.exception.code.ErrorCode;
 import com.kustacks.kuring.common.properties.ServerProperties;
 import com.kustacks.kuring.message.application.port.in.FirebaseWithAdminUseCase;
+import com.kustacks.kuring.message.application.port.in.dto.AcademicTestNotificationCommand;
 import com.kustacks.kuring.message.application.port.in.dto.AdminNotificationCommand;
 import com.kustacks.kuring.message.application.port.in.dto.AdminTestNotificationCommand;
 import com.kustacks.kuring.message.application.port.out.FirebaseMessagingPort;
@@ -22,6 +23,7 @@
 import java.util.Map;
 import java.util.function.UnaryOperator;
 
+import static com.kustacks.kuring.message.application.service.FirebaseSubscribeService.ACADEMIC_EVENT_TOPIC;
 import static com.kustacks.kuring.message.application.service.FirebaseSubscribeService.ALL_DEVICE_SUBSCRIBED_TOPIC;
 
 @Slf4j
@@ -62,6 +64,29 @@
         sendNotices(notificationDtoList);
     }
 
+    @Override
+    public void sendAcademicTestNotification(AcademicTestNotificationCommand command) {
+        try {
+            Message newMessage = Message.builder()
+                    .setNotification(Notification.builder()
+                            .setTitle(command.title())
+                            .setBody(command.body())
+                            .build())
+                    .putAllData(Map.of(
+                            "title", command.title(),
+                            "body", command.body()
+                    ))
+                    .putData("messageType", "academic")
+                    .setTopic(serverProperties.addDevSuffix(ACADEMIC_EVENT_TOPIC))
+                    .build();
+
+            firebaseMessagingPort.send(newMessage);
+        } catch (FirebaseMessagingException exception) {
+            throw new FirebaseMessageSendException();
+        }
+    }
+
+
     private void sendNotices(List<NoticeMessageDto> notificationDtoList) {
         try {
             loggingNoticeSendInfo(notificationDtoList);
@@ -127,6 +152,7 @@
                         .setBody(command.body())
                         .build())
                 .putAllData(objectMapper.convertValue(command, Map.class))
+                .putData("messageType", "admin")
                 .setTopic(serverProperties.ifDevThenAddSuffix(ALL_DEVICE_SUBSCRIBED_TOPIC))
                 .build();
     }
@@ -139,6 +165,7 @@
                         .setBody(messageDto.getSubject())
                         .build())
                 .putAllData(objectMapper.convertValue(messageDto, Map.class))
+                .putData("messageType", "notice")
                 .setTopic(suffixUtil.apply(messageDto.getCategory()))
                 .build();
     }

src/test/java/com/kustacks/kuring/acceptance/AdminAcceptanceTest.java

@@ -1,5 +1,6 @@
 package com.kustacks.kuring.acceptance;
 
+import com.kustacks.kuring.admin.adapter.in.web.dto.AcademicTestNotificationRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.AdminAlertCreateRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.RealNotificationRequest;
 import com.kustacks.kuring.admin.adapter.in.web.dto.TestNotificationRequest;
@@ -150,6 +151,33 @@ void role_root_admin_create_real_notification() {
         );
     }
 
+    @DisplayName("[v2] 테스트 학사일정 알림 발송")
+    @Test
+    void role_root_admin_send_academic_test_notification() {
+        // given
+        String accessToken = 로그인_되어_있음(ADMIN_LOGIN_ID, ADMIN_PASSWORD);
+
+        // when
+        var response = RestAssured
+                .given().log().all()
+                .header("Authorization", "Bearer " + accessToken)
+                .contentType(MediaType.APPLICATION_JSON_VALUE)
+                .accept(MediaType.APPLICATION_JSON_VALUE)
+                .body(new AcademicTestNotificationRequest("테스트-수강신청 일정", "오늘은 수강신청 일정이 있어요"))
+                .when().post("/api/v2/admin/academic/dev")
+                .then().log().all()
+                .extract();
+
+        // then
+        assertAll(
+                () -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value()),
+                () -> assertThat(response.jsonPath().getInt("code")).isEqualTo(200),
+                () -> assertThat(response.jsonPath().getString("message"))
+                        .isEqualTo("테스트 학사일정 알림 생성에 성공하였습니다"),
+                () -> assertThat(response.jsonPath().getString("data")).isNull()
+        );
+    }
+
     /**
      * Given : 등록된 ROLE_ROOT의 Admin이 있다.
      * When : 원하는 시간에 예약 알림을 등록한다