Merge pull request #59 from DropThe8bit/feat/alarm

[refactor] 알림 조회 응답 데이터 포맷 수정

Author: s2eojeong

src/main/java/everTale/everTale_be/domain/alarm/dto/AlarmSummary.java

@@ -20,14 +20,27 @@ public class AlarmSummary {
     @Schema(description = "스토리 ID", example = "12")
     private Long storyId;
 
+    @Schema(description = "알림 메시지", example = "「용과 마음의 열쇠」 ― 숨은 메세지가 도착했어요. 지금 확인해보세요!")
+    private String message;
+
     @Schema(description = "읽음 여부", example = "0")
     private boolean isRead;
 
     public static AlarmSummary from(Alarm alarm){
+        String message;
+        String storyTitle = alarm.getStory().getTitle();
+
+        if (alarm.getAlarmType() == AlarmType.EASTEREGG_VOICE) {
+            message = String.format("「%s」 ― 숨은 메세지가 도착했어요. 지금 확인해보세요!", storyTitle);
+        } else {
+            message = String.format("「%s」 ― 사랑의 편지가 도착했어요. 지금 확인해보세요!", storyTitle);
+        }
+
         return AlarmSummary.builder()
                 .alarmId(alarm.getId())
                 .alarmType(alarm.getAlarmType())
                 .storyId(alarm.getStory().getId())
+                .message(message)
                 .isRead(alarm.isRead())
                 .build();
     }

src/main/java/everTale/everTale_be/domain/alarm/dto/response/AlarmListResponseDto.java

@@ -17,6 +17,9 @@ public class AlarmListResponseDto {
     @Schema(description = "알림 요약 리스트")
     private List<AlarmSummary> alarmSummaries;
 
+    @Schema(description = "읽지 않은 알림 개수", example = "3")
+    private long unreadCount;
+
     @Schema(description = "현재 페이지 번호 (0부터 시작)", example = "0")
     private int currentPage;
 
@@ -27,8 +30,13 @@ public class AlarmListResponseDto {
     private long totalCount;
 
     public static AlarmListResponseDto from(Page<Alarm> alarms){
+        long unreadCount = alarms.stream()
+                .filter(alarm -> !alarm.isRead())
+                .count();
+
         return AlarmListResponseDto.builder()
                 .alarmSummaries(alarms.stream().map(AlarmSummary::from).toList())
+                .unreadCount(unreadCount)
                 .currentPage(alarms.getNumber())
                 .totalPage(alarms.getTotalPages())
                 .totalCount(alarms.getTotalElements())

src/main/java/everTale/everTale_be/domain/alarm/service/AlarmService.java

@@ -7,6 +7,7 @@
 import everTale.everTale_be.domain.profile.entity.Profile;
 import everTale.everTale_be.domain.profile.util.ProfileHelper;
 import everTale.everTale_be.domain.story.entity.Story;
+import everTale.everTale_be.domain.story.repository.StoryRepository;
 import everTale.everTale_be.global.apiPayload.code.status.ErrorStatus;
 import everTale.everTale_be.global.apiPayload.exception.handler.UnAuthorizedHandler;
 import lombok.AllArgsConstructor;
@@ -21,6 +22,7 @@
 public class AlarmService {
 
     private final AlarmRepository alarmRepository;
+    private final StoryRepository storyRepository;
     private final ProfileHelper profileHelper;
 
     @Transactional