Merge branch 'dev' of https://github.com/WDTT-CodingClub/NBDream-Server…

… into dev
WDTT-CodingClub · Jul 22, 2024 · 7395ac8 · 7395ac8
2 parents 2169a5a + 03917e9
commit 7395ac8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java b/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java
@@ -8,6 +8,9 @@
 import nbdream.alarm.domain.AlarmHistory;
 
 import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -36,14 +39,24 @@ public static AlarmHistoryListResDto from(List<AlarmHistory> alarmHistories) {
 
 @Getter
 @NoArgsConstructor
-@AllArgsConstructor
 class AlarmHistoryResDto {
  private Long id;
  private String alarmType;
  private String title;
  private String content;
  private boolean checked;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
  private LocalDateTime createdDate;
 
+ public AlarmHistoryResDto(Long id, String alarmType, String title, String content, boolean checked, LocalDateTime createdDate) {
+ this.id = id;
+ this.alarmType = alarmType;
+ this.title = title;
+ this.content = content;
+ this.checked = checked;
+ this.createdDate = ZonedDateTime.of(createdDate, ZoneId.of("UTC"))
+ .withZoneSameInstant(ZoneId.of("Asia/Seoul"))
+ .toLocalDateTime();
+ }
+
 }
diff --git a/src/main/java/nbdream/alarm/service/AlarmService.java b/src/main/java/nbdream/alarm/service/AlarmService.java
@@ -67,10 +67,10 @@ public void deleteFcmToken(Long memberId) {
  public void sendCommentAlarm(Bulletin bulletin, String nickname) {
  Alarm alarm = alarmRepository.findByMemberId(bulletin.getAuthor().getId());
  isAlarmValid(alarm);
- hasToken(alarm);
  if(!alarm.isCommentAlarm()){
  return;
  }
+ hasToken(alarm);
  try {
  String body = "\"" + nickname + "\"" + "님이 게시글에 새 댓글을 달았습니다.";
  FcmSendDto fcmSendDto = new FcmSendDto(alarm.getFcmToken(), "농부의 꿈", body, bulletin.getId(), AlarmType.COMMENT);