feat(): 디바이스 플랫폼 추가 (#293)

* feat: 유저 디바이스 테이블에 플랫폼 필드 추가

* feat: 유저 디바이스 api에 플랫폼 필드 추가

* feat: 플랫폼 추가에 따른 비즈니스 로직 및 리포지토리 수정

* feat: 알림 설정 도메인의 api에도 플랫폼 필드 추가

* fix: 바뀐 커맨드에 맞게 매퍼도 수정

* feat: fcm 발송에 안드로이드 설정 추가

* test: 플랫폼 필드 추가를 반영한 테스트 수정

Author: pizzazoa

src/main/java/org/devkor/apu/saerok_server/domain/notification/api/NotificationSettingController.java

@@ -14,6 +14,7 @@
 import org.devkor.apu.saerok_server.domain.notification.api.dto.response.ToggleNotificationResponse;
 import org.devkor.apu.saerok_server.domain.notification.application.NotificationSettingCommandService;
 import org.devkor.apu.saerok_server.domain.notification.application.NotificationSettingQueryService;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.mapper.NotificationSettingWebMapper;
 import org.devkor.apu.saerok_server.global.security.principal.UserPrincipal;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,9 +46,11 @@ public class NotificationSettingController {
     public NotificationSettingsResponse getNotificationSettings(
             @AuthenticationPrincipal UserPrincipal userPrincipal,
             @Parameter(description = "디바이스 ID", required = true, example = "device-123")
-            @RequestParam String deviceId
+            @RequestParam String deviceId,
+            @Parameter(description = "디바이스 플랫폼", required = true, example = "IOS")
+            @RequestParam DevicePlatform platform
     ) {
-        return notificationSettingQueryService.getNotificationSettings(userPrincipal.getId(), deviceId);
+        return notificationSettingQueryService.getNotificationSettings(userPrincipal.getId(), deviceId, platform);
     }
 
     @PatchMapping("/toggle")

src/main/java/org/devkor/apu/saerok_server/domain/notification/api/UserDeviceController.java

@@ -11,6 +11,7 @@
 import org.devkor.apu.saerok_server.domain.notification.api.dto.request.RegisterTokenRequest;
 import org.devkor.apu.saerok_server.domain.notification.api.dto.response.RegisterUserDeviceResponse;
 import org.devkor.apu.saerok_server.domain.notification.application.UserDeviceCommandService;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.mapper.UserDeviceWebMapper;
 import org.devkor.apu.saerok_server.global.security.principal.UserPrincipal;
 import org.springframework.http.HttpStatus;
@@ -71,9 +72,10 @@ public RegisterUserDeviceResponse registerUserDevice(
     )
     public void deleteDevice(
             @AuthenticationPrincipal UserPrincipal userPrincipal,
-            @PathVariable String deviceId
+            @PathVariable String deviceId,
+            @RequestParam DevicePlatform platform
     ) {
-        userDeviceCommandService.deleteDevice(userPrincipal.getId(), deviceId);
+        userDeviceCommandService.deleteDevice(userPrincipal.getId(), deviceId, platform);
     }
 
     @Hidden

src/main/java/org/devkor/apu/saerok_server/domain/notification/api/dto/request/RegisterTokenRequest.java

@@ -1,13 +1,17 @@
 package org.devkor.apu.saerok_server.domain.notification.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 
 @Schema(description = "사용자 디바이스 등록/갱신 요청 DTO")
 public record RegisterTokenRequest(
     @Schema(description = "디바이스 고유 식별자", example = "device-123", requiredMode = Schema.RequiredMode.REQUIRED)
     String deviceId,
 
     @Schema(description = "푸시 알림 수신용 토큰 (FCM 토큰)", example = "fGKdE...", requiredMode = Schema.RequiredMode.REQUIRED)
-    String token
+    String token,
+
+    @Schema(description = "디바이스 플랫폼", example = "IOS", requiredMode = Schema.RequiredMode.REQUIRED)
+    DevicePlatform platform
 ) {
 }

src/main/java/org/devkor/apu/saerok_server/domain/notification/api/dto/request/ToggleNotificationRequest.java

@@ -1,13 +1,17 @@
 package org.devkor.apu.saerok_server.domain.notification.api.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.core.entity.NotificationType;
 
 /** 알림 설정 토글 요청 (type 기반) */
 public record ToggleNotificationRequest(
         @Schema(description = "디바이스 식별자", example = "device-123")
         String deviceId,
 
+        @Schema(description = "디바이스 플랫폼", example = "IOS")
+        DevicePlatform platform,
+
         @Schema(description = "알림 식별자", example = "LIKED_ON_COLLECTION")
         NotificationType type
 ) {}

src/main/java/org/devkor/apu/saerok_server/domain/notification/application/NotificationSettingCommandService.java

@@ -24,7 +24,7 @@ public class NotificationSettingCommandService {
     private final NotificationSettingWebMapper notificationSettingWebMapper;
 
     public ToggleNotificationResponse toggleNotificationSetting(ToggleNotificationSettingCommand command) {
-        UserDevice device = userDeviceRepository.findByUserIdAndDeviceId(command.userId(), command.deviceId())
+        UserDevice device = userDeviceRepository.findByUserIdAndDeviceIdAndPlatform(command.userId(), command.deviceId(), command.platform())
                 .orElseThrow(() -> new NotFoundException("해당 디바이스를 찾을 수 없어요"));
 
         backfillService.ensureDefaults(device);

src/main/java/org/devkor/apu/saerok_server/domain/notification/application/NotificationSettingQueryService.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.devkor.apu.saerok_server.domain.notification.api.dto.response.NotificationSettingsResponse;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.core.entity.NotificationSetting;
 import org.devkor.apu.saerok_server.domain.notification.core.entity.UserDevice;
 import org.devkor.apu.saerok_server.domain.notification.core.repository.NotificationSettingRepository;
@@ -24,8 +25,8 @@ public class NotificationSettingQueryService {
     private final NotificationSettingBackfillService backfillService;
     private final NotificationSettingWebMapper mapper;
 
-    public NotificationSettingsResponse getNotificationSettings(Long userId, String deviceId) {
-        UserDevice userDevice = userDeviceRepository.findByUserIdAndDeviceId(userId, deviceId)
+    public NotificationSettingsResponse getNotificationSettings(Long userId, String deviceId, DevicePlatform platform) {
+        UserDevice userDevice = userDeviceRepository.findByUserIdAndDeviceIdAndPlatform(userId, deviceId, platform)
                 .orElseThrow(() -> new NotFoundException("해당 디바이스를 찾을 수 없어요"));
 
         // 쓰기 가능한 독립 트랜잭션에서 처리

src/main/java/org/devkor/apu/saerok_server/domain/notification/application/UserDeviceCommandService.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.devkor.apu.saerok_server.domain.notification.api.dto.response.RegisterUserDeviceResponse;
 import org.devkor.apu.saerok_server.domain.notification.application.dto.RegisterUserDeviceCommand;
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.core.entity.UserDevice;
 import org.devkor.apu.saerok_server.domain.notification.core.repository.UserDeviceRepository;
 import org.devkor.apu.saerok_server.domain.notification.core.repository.NotificationSettingRepository;
@@ -31,18 +32,19 @@ public RegisterUserDeviceResponse registerUserDevice(RegisterUserDeviceCommand c
                 .orElseThrow(() -> new NotFoundException("존재하지 않는 사용자 id예요"));
 
         if (command.deviceId() == null || command.deviceId().isEmpty()
-                || command.token() == null || command.token().isEmpty()) {
-            throw new BadRequestException("deviceId와 token은 필수입니다");
+                || command.token() == null || command.token().isEmpty()
+                || command.platform() == null) {
+            throw new BadRequestException("deviceId, token, platform은 필수입니다");
         }
 
         UserDevice userDevice = userDeviceRepository
-                .findByUserIdAndDeviceId(command.userId(), command.deviceId())
+                .findByUserIdAndDeviceIdAndPlatform(command.userId(), command.deviceId(), command.platform())
                 .map(existing -> {
                     existing.updateToken(command.token());
                     return existing;
                 })
                 .orElseGet(() -> {
-                    UserDevice newDevice = UserDevice.create(user, command.deviceId(), command.token());
+                    UserDevice newDevice = UserDevice.create(user, command.deviceId(), command.token(), command.platform());
                     userDeviceRepository.save(newDevice);
                     userDeviceRepository.flush();
                     return newDevice;
@@ -53,11 +55,12 @@ public RegisterUserDeviceResponse registerUserDevice(RegisterUserDeviceCommand c
         return userDeviceWebMapper.toRegisterUserDeviceResponse(command, true);
     }
 
-    public void deleteDevice(Long userId, String deviceId) {
+    public void deleteDevice(Long userId, String deviceId, DevicePlatform platform) {
         userRepository.findById(userId).orElseThrow(() -> new NotFoundException("존재하지 않는 사용자 id예요"));
-        userDeviceRepository.findByUserIdAndDeviceId(userId, deviceId).orElseThrow(() -> new NotFoundException("해당 디바이스를 찾을 수 없어요"));
+        userDeviceRepository.findByUserIdAndDeviceIdAndPlatform(userId, deviceId, platform)
+                .orElseThrow(() -> new NotFoundException("해당 디바이스를 찾을 수 없어요"));
 
-        userDeviceRepository.deleteByUserIdAndDeviceId(userId, deviceId);
+        userDeviceRepository.deleteByUserIdAndDeviceIdAndPlatform(userId, deviceId, platform);
     }
 
     public void deleteAllTokens(Long userId) {

src/main/java/org/devkor/apu/saerok_server/domain/notification/application/dto/RegisterUserDeviceCommand.java

@@ -1,7 +1,10 @@
 package org.devkor.apu.saerok_server.domain.notification.application.dto;
 
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
+
 public record RegisterUserDeviceCommand(
         Long userId,
         String deviceId,
-        String token
+        String token,
+        DevicePlatform platform
 ) {}

src/main/java/org/devkor/apu/saerok_server/domain/notification/application/dto/ToggleNotificationSettingCommand.java

@@ -1,9 +1,11 @@
 package org.devkor.apu.saerok_server.domain.notification.application.dto;
 
+import org.devkor.apu.saerok_server.domain.notification.core.entity.DevicePlatform;
 import org.devkor.apu.saerok_server.domain.notification.core.entity.NotificationType;
 
 public record ToggleNotificationSettingCommand(
         Long userId,
         String deviceId,
+        DevicePlatform platform,
         NotificationType type
 ) {}

src/main/java/org/devkor/apu/saerok_server/domain/notification/core/entity/DevicePlatform.java

@@ -0,0 +1,11 @@
+package org.devkor.apu.saerok_server.domain.notification.core.entity;
+
+/**
+ * 디바이스 플랫폼 타입.
+ *
+ * <p>푸시 알림 발송 시 플랫폼별로 다른 설정을 적용하기 위해 사용됩니다.</p>
+ */
+public enum DevicePlatform {
+    IOS,
+    ANDROID
+}