어제18시부터 18시전까지 조회

7th-UMC-Hackathon-TeamV · Jan 11, 2025 · f8dac76 · f8dac76
1 parent cd725fe
commit f8dac76
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/src/main/java/banban/springboot/repository/NewsRepository.java b/src/main/java/banban/springboot/repository/NewsRepository.java
@@ -31,5 +31,7 @@ public interface NewsRepository extends JpaRepository<News,Long> {
 
     List<News> findByTeamGroupAndCreatedAtBetween(TeamGroup teamGroup, LocalDateTime start, LocalDateTime end);
     void deleteByCreatedAtBefore(LocalDateTime dateTime);
+
+
 }
 
diff --git a/src/main/java/banban/springboot/service/NewsService.java b/src/main/java/banban/springboot/service/NewsService.java
@@ -202,4 +202,28 @@ public void deleteOldNews() {
                 .withHour(18).withMinute(0).withSecond(0);
         newsRepository.deleteByCreatedAtBefore(yesterdayAt6PM);
     }
+
+    /***
+     * 어제 18시부터 작성한 글에서 오늘 18시전까지 작성한 글 목록 조회
+     */
+    public List<NewsResponseDTO.NewsReadResponseDTO> getNewsBetweenYesterday18ToToday18(String groupKey) {
+        // 그룹 확인
+        TeamGroup teamGroup = groupRepository.findByGroupKey(groupKey)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.TEAMGROUP_NOT_FOUND));
+
+        // 현재 시간
+        LocalDateTime now = getCurrentTime();
+
+        // 어제 18시부터 오늘 18시전까지
+        LocalDateTime yesterdayAt6PM = now.minusDays(1).withHour(18).withMinute(0).withSecond(0);
+        LocalDateTime todayAt6PM = now.withHour(17).withMinute(59).withSecond(59);
+
+        // 뉴스 조회
+        List<News> newsList = newsRepository.findByTeamGroupAndCreatedAtBetween(teamGroup, yesterdayAt6PM, todayAt6PM);
+
+        // 뉴스 -> DTO 변환
+        return newsList.stream()
+                .map(NewsResponseDTO.NewsReadResponseDTO::from)
+                .toList();
+    }
 }
diff --git a/src/main/java/banban/springboot/web/controller/NewsController.java b/src/main/java/banban/springboot/web/controller/NewsController.java
@@ -125,4 +125,15 @@ public ApiResponse<List<NewsResponseDTO.NewsYesterdayResponseDTO>> getYesterdayN
         List<NewsResponseDTO.NewsYesterdayResponseDTO> yesterdayNews = newsService.getYesterdayNews(groupKey, memberId);
         return ApiResponse.onSuccess(yesterdayNews);
     }
+
+    @GetMapping("/{groupKey}/news/yesterday-today")
+    @Operation(summary = "어제 18시부터 오늘 18시 전까지 뉴스 조회")
+    @Parameters({
+            @Parameter(name = "groupKey", description = "그룹 키")
+    })
+    public ApiResponse<List<NewsResponseDTO.NewsReadResponseDTO>> getNewsBetweenYesterday18ToToday18(
+            @PathVariable String groupKey) {
+        List<NewsResponseDTO.NewsReadResponseDTO> newsList = newsService.getNewsBetweenYesterday18ToToday18(groupKey);
+        return ApiResponse.onSuccess(newsList);
+    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,5 +31,7 @@ public interface NewsRepository extends JpaRepository<News,Long> {

		List<News> findByTeamGroupAndCreatedAtBetween(TeamGroup teamGroup, LocalDateTime start, LocalDateTime end);
		void deleteByCreatedAtBefore(LocalDateTime dateTime);


		}