From d25522c0d3d1b34aefecf8e0b79c86db00697ad1 Mon Sep 17 00:00:00 2001
From: ekzot1212 <ekzot1212@gmail.com>
Date: Mon, 22 Jul 2024 21:26:56 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Fix=20:=20=EB=8C=93=EA=B8=80=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EA=B8=B0=EB=8A=A5,=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 댓글 알림 미설정인 경우 FCM토큰 검사하지 않도록 변경
- 알림 내역 시간 한국 표준시로 변경
---
 .../java/nbdream/alarm/dto/AlarmHistoryListResDto.java   | 9 ++++++---
 src/main/java/nbdream/alarm/service/AlarmService.java    | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java b/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java
index 758cf02..3c47a48 100644
--- 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;
 
@@ -26,7 +29,7 @@ public static AlarmHistoryListResDto from(List<AlarmHistory> alarmHistories) {
                         alarmHistory.getTitle(),
                         alarmHistory.getContent(),
                         alarmHistory.isChecked(),
-                        alarmHistory.getCreatedDate()
+                        alarmHistory.getCreatedDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
                 ))
                 .collect(Collectors.toList());
 
@@ -43,7 +46,7 @@ class AlarmHistoryResDto {
     private String title;
     private String content;
     private boolean checked;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    private LocalDateTime createdDate;
+    private String createdDate;
+
 
 }
diff --git a/src/main/java/nbdream/alarm/service/AlarmService.java b/src/main/java/nbdream/alarm/service/AlarmService.java
index 6adf7e7..eca27aa 100644
--- 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);

From 03917e93f1ccdb23e7ab4f240cdd2f23929a6da4 Mon Sep 17 00:00:00 2001
From: ekzot1212 <ekzot1212@gmail.com>
Date: Mon, 22 Jul 2024 21:40:08 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Fix=20:=20=EC=95=8C=EB=A6=BC=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=EA=B0=84=EB=8C=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix : 알림 내역 조회 시간대 수정
---
 .../alarm/dto/AlarmHistoryListResDto.java      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java b/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java
index 3c47a48..eae70c0 100644
--- a/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java
+++ b/src/main/java/nbdream/alarm/dto/AlarmHistoryListResDto.java
@@ -29,7 +29,7 @@ public static AlarmHistoryListResDto from(List<AlarmHistory> alarmHistories) {
                         alarmHistory.getTitle(),
                         alarmHistory.getContent(),
                         alarmHistory.isChecked(),
-                        alarmHistory.getCreatedDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+                        alarmHistory.getCreatedDate()
                 ))
                 .collect(Collectors.toList());
 
@@ -39,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;
-    private String createdDate;
-
+    @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();
+    }
 
 }