#399 [Merge] dev 변경사항을 main에 반영 (v2.0.33)

.github/workflows/deploy.yml

@@ -2,9 +2,9 @@ name: Java CI for Picke
 
 on:
   push:
-    branches: [ "develop", "main" ]
+    branches: [ "dev", "main" ]
   pull_request:
-    branches: [ "develop", "main" ]
+    branches: [ "dev", "main" ]
 
 jobs:
   build:
@@ -21,6 +21,9 @@ jobs:
           distribution: 'temurin'
           cache: gradle # 1. 빌드 속도를 획기적으로 줄이기 위해 그래들 캐시 적용
 
+      - name: Install ffmpeg
+        run: sudo apt-get update && sudo apt-get install -y ffmpeg
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 

src/main/java/com/swyp/picke/domain/admin/controller/AdminNotificationController.java

@@ -1,10 +1,12 @@
 package com.swyp.picke.domain.admin.controller;
 
 import com.swyp.picke.domain.admin.dto.notification.request.AdminNoticeCreateRequest;
+import com.swyp.picke.domain.admin.dto.notification.request.AdminNotificationTestRequest;
 import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeDetailResponse;
 import com.swyp.picke.domain.admin.dto.notification.response.AdminNoticeListResponse;
 import com.swyp.picke.domain.admin.service.AdminNotificationService;
 import com.swyp.picke.domain.notification.enums.NotificationCategory;
+import com.swyp.picke.domain.notification.service.NotificationDispatchService;
 import com.swyp.picke.global.common.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +29,7 @@
 public class AdminNotificationController {
 
     private final AdminNotificationService adminNotificationService;
+    private final NotificationDispatchService notificationDispatchService;
 
     @Operation(summary = "공지사항 작성")
     @PostMapping
@@ -51,4 +54,13 @@ public ApiResponse<AdminNoticeListResponse> getNotices(
     public ApiResponse<AdminNoticeDetailResponse> getNoticeDetail(@PathVariable Long noticeId) {
         return ApiResponse.onSuccess(adminNotificationService.getNoticeDetail(noticeId));
     }
+
+    @Operation(summary = "푸시 알림 발송 테스트", description = "특정 유저의 등록된 디바이스로 알림 설정(ON/OFF) 무관하게 즉시 테스트 푸시를 발송한다.")
+    @PostMapping("/test")
+    public ApiResponse<Void> sendTestPush(
+            @RequestBody @Valid AdminNotificationTestRequest request
+    ) {
+        notificationDispatchService.sendTestPush(request.userId(), request.title(), request.body());
+        return ApiResponse.onSuccess(null);
+    }
 }

src/main/java/com/swyp/picke/domain/admin/dto/notification/request/AdminNotificationTestRequest.java

@@ -0,0 +1,10 @@
+package com.swyp.picke.domain.admin.dto.notification.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record AdminNotificationTestRequest(
+        @NotNull Long userId,
+        @NotBlank String title,
+        @NotBlank String body
+) {}

src/main/java/com/swyp/picke/domain/notification/scheduler/NotificationScheduleDispatcher.java

@@ -5,9 +5,9 @@
 import com.swyp.picke.domain.notification.repository.NotificationScheduleRepository;
 import com.swyp.picke.domain.notification.service.NotificationDispatchService;
 import com.swyp.picke.domain.notification.service.NotificationService;
+import java.time.Clock;
 import java.time.LocalDate;
 import java.time.LocalTime;
-import java.time.ZoneId;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,17 +24,16 @@
 @RequiredArgsConstructor
 public class NotificationScheduleDispatcher {
 
-    private static final ZoneId SEOUL_ZONE = ZoneId.of("Asia/Seoul");
-
     private final NotificationScheduleRepository notificationScheduleRepository;
     private final NotificationService notificationService;
     private final NotificationDispatchService notificationDispatchService;
+    private final Clock clock;
 
     @Scheduled(cron = "0 * * * * *", zone = "Asia/Seoul")
     @Transactional
     public void dispatchDueSchedules() {
-        LocalTime now = LocalTime.now(SEOUL_ZONE);
-        LocalDate today = LocalDate.now(SEOUL_ZONE);
+        LocalTime now = LocalTime.now(clock);
+        LocalDate today = LocalDate.now(clock);
 
         List<NotificationSchedule> dueSchedules = notificationScheduleRepository.findAllByEnabledTrue().stream()
                 .filter(schedule -> schedule.isDue(now, today))

src/main/java/com/swyp/picke/domain/notification/service/NotificationDispatchService.java

@@ -94,6 +94,17 @@ public void notifyAdminNotice(NotificationDetailCode detailCode, String title, S
         }
     }
 
+    /**
+     * 관리자가 특정 유저에게 알림 설정(ON/OFF) 체크 없이 즉시 테스트 푸시를 발송한다.
+     */
+    public void sendTestPush(Long userId, String title, String body) {
+        Map<String, String> data = Map.of("type", "TEST");
+
+        for (UserDevice device : userDeviceRepository.findAllByUserId(userId)) {
+            sendPush(device, title, body, data);
+        }
+    }
+
     /**
      * 유저의 알림 ON/OFF 설정을 확인한다. 설정이 없는 경우(레거시 유저 등) 기본값은 true.
      */

src/main/java/com/swyp/picke/global/config/SchedulerConfig.java

@@ -1,5 +1,7 @@
 package com.swyp.picke.global.config;
 
+import java.time.Clock;
+import java.time.ZoneId;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -20,4 +22,9 @@ public ThreadPoolTaskScheduler taskScheduler() {
         scheduler.setThreadNamePrefix("credit-scheduler-");
         return scheduler;
     }
+
+    @Bean
+    public Clock clock() {
+        return Clock.system(ZoneId.of("Asia/Seoul"));
+    }
 }

src/main/java/com/swyp/picke/global/infra/fcm/service/FcmPushService.java

@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Slf4j
@@ -23,9 +24,13 @@ public class FcmPushService {
      * iOS는 FCM을 거치지 않고 ApnsPushService가 APNs로 직접 발송한다.
      */
     public void send(UserDevice device, String title, String body, Map<String, String> data) {
+        Map<String, String> payload = new HashMap<>(data);
+        payload.put("title", title);
+        payload.put("body", body);
+
         Message message = Message.builder()
                 .setToken(device.getFcmToken())
-                .putAllData(data)
+                .putAllData(payload)
                 .setAndroidConfig(AndroidConfig.builder()
                         .setPriority(AndroidConfig.Priority.HIGH)
                         .build())