Merge pull request #197 from Hrr-HabbitRoutineResult/feat/196-notification-response-fields

[Feat] 알림 목록 조회 API 응답 필드 추가 및 변환 로직 개선

Author: yangjiae12

src/main/java/com/hrr/backend/domain/notification/converter/NotificationConverter.java

@@ -1,12 +1,56 @@
 package com.hrr.backend.domain.notification.converter;
 
 import com.hrr.backend.domain.notification.dto.NotificationResponseDto;
+import com.hrr.backend.domain.notification.entity.NotificationDelivery;
+import com.hrr.backend.domain.notification.entity.NotificationEvent;
 import com.hrr.backend.domain.notification.entity.NotificationSetting;
+import com.hrr.backend.global.exception.GlobalException;
+import com.hrr.backend.global.response.ErrorCode;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+@Slf4j
 @Component
 public class NotificationConverter {
 
+    // 알림 목록 정보 DTO 변환
+    public NotificationResponseDto.InfoDto toInfoDto(NotificationDelivery delivery, String imageUrl) {
+        // 전달받은 배달 객체가 null인 경우
+        if (delivery == null) {
+            log.error("[Critical] NotificationDelivery is null during conversion process");
+            throw new GlobalException(ErrorCode._INTERNAL_SERVER_ERROR);
+        }
+
+        NotificationEvent event = delivery.getEvent();
+
+        // 연결된 이벤트 정보가 없는 경우
+        if (event == null) {
+            log.error("[Data Integrity Error] NotificationDelivery(ID: {}) has no associated NotificationEvent", delivery.getId());
+            throw new GlobalException(ErrorCode._INTERNAL_SERVER_ERROR);
+        }
+
+        // 알림 타입이 없는 경우
+        if (event.getType() == null) {
+            log.error("[Data Integrity Error] NotificationEvent(ID: {}) has no associated NotificationType", event.getId());
+            throw new GlobalException(ErrorCode._INTERNAL_SERVER_ERROR);
+        }
+
+        return NotificationResponseDto.InfoDto.builder()
+                .id(delivery.getId())
+                .title(event.getTitle())
+                .message(event.getMessage())
+                .imageUrl(imageUrl)
+                .category(event.getCategory())
+                .type(event.getType().getTypeName())
+                .targetType(event.getTargetType())
+                .targetId(event.getTargetId())
+                .contextType(event.getContextType())
+                .contextId(event.getContextId())
+                .isRead(delivery.getIsRead())
+                .createdAt(delivery.getCreatedAt())
+                .build();
+    }
+
     public NotificationResponseDto.SettingInfoDto toSettingInfoDto(NotificationSetting setting) {
         return NotificationResponseDto.SettingInfoDto.builder()
                 .isAllPaused(setting.isAllPaused())

src/main/java/com/hrr/backend/domain/notification/dto/NotificationResponseDto.java

@@ -3,6 +3,8 @@
 import com.hrr.backend.domain.notification.entity.NotificationDelivery;
 import com.hrr.backend.domain.notification.entity.NotificationEvent;
 import com.hrr.backend.domain.notification.entity.enums.NotificationCategory;
+import com.hrr.backend.domain.notification.entity.enums.NotificationTypeName;
+import com.hrr.backend.domain.notification.entity.enums.ResourceType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -16,7 +18,7 @@ public class NotificationResponseDto {
     @AllArgsConstructor
     @Schema(description = "알림 목록 정보 DTO")
     public static class InfoDto {
-        @Schema(description = "알림 배달 ID", example = "1")
+        @Schema(description = "알림 ID", example = "1")
         private Long id;
 
         @Schema(description = "알림 제목", example = "내 인증에 댓글이 달렸어요")
@@ -25,34 +27,32 @@ public static class InfoDto {
         @Schema(description = "알림 메시지", example = "어 저랑 같은 문제 풀었는데...")
         private String message;
 
+        @Schema(description = "알림 썸네일 이미지 URL", example = "https://example/image.jpg")
+        private String imageUrl;
+
         @Schema(description = "알림 카테고리", example = "VERIFICATION")
         private NotificationCategory category;
 
-        @Schema(description = "이동 대상 타입", example = "COMMENT")
-        private String targetType;
+        @Schema(description = "알림 상세 타입 (프론트 분기 처리용)", example = "CHALLENGE_EXTENSION")
+        private NotificationTypeName type;
+
+        @Schema(description = "이동 대상 타입", example = "CHALLENGE")
+        private ResourceType targetType;
 
-        @Schema(description = "이동 대상 ID", example = "501")
+        @Schema(description = "이동 대상 ID", example = "2")
         private Long targetId;
 
+        @Schema(description = "추가 컨텍스트 타입", example = "ROUND")
+        private ResourceType contextType;
+
+        @Schema(description = "추가 컨텍스트 ID", example = "3")
+        private Long contextId;
+
         @Schema(description = "읽음 여부 (true: 읽음, false: 안읽음-NEW)", example = "false")
         private Boolean isRead;
 
         @Schema(description = "알림 발생 시간", example = "2025-12-25T14:30:00")
         private LocalDateTime createdAt;
-
-        public static InfoDto from(NotificationDelivery delivery) {
-            NotificationEvent event = delivery.getEvent();
-            return InfoDto.builder()
-                    .id(delivery.getId())
-                    .title(event.getTitle())
-                    .message(event.getMessage())
-                    .category(event.getCategory())
-                    .targetType(event.getTargetType().name())
-                    .targetId(event.getTargetId())
-                    .isRead(delivery.getIsRead())
-                    .createdAt(delivery.getCreatedAt())
-                    .build();
-        }
     }
 
     @Getter
@@ -62,7 +62,7 @@ public static InfoDto from(NotificationDelivery delivery) {
     @Schema(description = "알림 읽음 처리 결과 DTO")
     public static class ReadResultDto {
 
-        @Schema(description = "알림 배달 ID", example = "1")
+        @Schema(description = "알림 ID", example = "1")
         private Long notificationId;
 
         @Schema(description = "읽음 여부", example = "true")

src/main/java/com/hrr/backend/domain/notification/service/NotificationServiceImpl.java

@@ -12,6 +12,7 @@
 import com.hrr.backend.global.exception.GlobalException;
 import com.hrr.backend.global.response.ErrorCode;
 import com.hrr.backend.global.response.SliceResponseDto;
+import com.hrr.backend.global.s3.S3UrlUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -28,6 +29,8 @@ public class NotificationServiceImpl implements NotificationService {
     private final NotificationSettingRepository notificationSettingRepository;
     private final NotificationConverter notificationConverter;
 
+    private final S3UrlUtil s3UrlUtil;
+
     @Override
     public SliceResponseDto<NotificationResponseDto.InfoDto> getNotificationList(
             User user, NotificationCategory category, int page, int size) {
@@ -41,7 +44,10 @@ public SliceResponseDto<NotificationResponseDto.InfoDto> getNotificationList(
 
         // Slice 내부의 엔티티를 DTO로 변환
         Slice<NotificationResponseDto.InfoDto> dtoSlice = deliverySlice
-                .map(NotificationResponseDto.InfoDto::from);
+                .map(delivery -> {
+                    String fullUrl = s3UrlUtil.toFullUrl(delivery.getEvent().getImageKey());
+                    return notificationConverter.toInfoDto(delivery, fullUrl);
+                });
 
         return new SliceResponseDto<>(dtoSlice);
     }