fix: date type 변경

EWHA-LUX · Mar 6, 2024 · 38cfad9 · 38cfad9
1 parent b7432a3
commit 38cfad9
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/main/java/ewha/lux/once/domain/home/service/HomeService.java b/src/main/java/ewha/lux/once/domain/home/service/HomeService.java
@@ -15,8 +15,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.LocalDate;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -186,29 +185,29 @@ public void getPayCardHistory(Users nowUser, Long chatId) throws CustomException
     public AnnounceListDto getAnnounce(Users nowUser) throws CustomException {
         String nickname = nowUser.getNickname();
 
-        LocalDateTime today = LocalDateTime.now().atZone(ZoneId.of("Asia/Seoul")).toLocalDateTime();
-        LocalDateTime thisWeek = today.minusDays(7);
+        LocalDate today = LocalDate.now();
+        LocalDate thisWeek = today.minusDays(7);
 
         List<Announcement> announcementList = announcementRepository.findAnnouncementByUsers(nowUser);
 
         // 오늘 생성된 알림
         List<AnnounceDto> todayAnnounceDto = announcementList.stream()
-                .filter(announcement -> announcement.getCreatedAt().isEqual(today))
+                .filter(announcement -> announcement.getCreatedAt().toLocalDate().isEqual(today))
                 .sorted(Comparator.comparing(Announcement::getCreatedAt).reversed())
                 .map(AnnounceDto::new)
                 .collect(Collectors.toList());
 
         // 7일 이내에 생성된 알림 (오늘 제외)
         List<AnnounceDto> recentAnnounceDto = announcementList.stream()
-                .filter(announcement -> !announcement.getCreatedAt().isEqual(today)
-                        && announcement.getCreatedAt().isAfter(thisWeek))
+                .filter(announcement -> !announcement.getCreatedAt().toLocalDate().isEqual(today)
+                        && announcement.getCreatedAt().toLocalDate().isAfter(thisWeek))
                 .sorted(Comparator.comparing(Announcement::getCreatedAt).reversed())
                 .map(AnnounceDto::new)
                 .collect(Collectors.toList());
 
         long uncheckedcnt = announcementList.stream()
                 .filter(announcement -> !announcement.isHasCheck()
-                        && announcement.getCreatedAt().isAfter(thisWeek))
+                        && announcement.getCreatedAt().toLocalDate().isAfter(thisWeek))
                 .count();
 
         return new AnnounceListDto(nickname, uncheckedcnt, todayAnnounceDto, recentAnnounceDto);
@@ -222,4 +221,4 @@ public AnnounceDetailDto getAnnounceDetail(Long announceId) throws CustomExcepti
         announcementRepository.save(announcement);
         return new AnnounceDetailDto(announcement);
     }
-}
+}