FIX: 더미 데이터 판별 시 status, category가 아닌 user로 판별

innovationacademy-kr · Oct 29, 2024 · e241438 · e241438
1 parent bf0cad6
commit e241438
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/backend/src/main/java/org/ftclub/cabinet/presentation/repository/PresentationRepository.java b/backend/src/main/java/org/ftclub/cabinet/presentation/repository/PresentationRepository.java
@@ -34,4 +34,13 @@ List<Presentation> findPresentationsWithinPeriod(
 			@Param("start") LocalDateTime start,
 			@Param("end") LocalDateTime end,
 			Pageable pageable);
+
+	@Query("SELECT p "
+			+ "FROM Presentation p "
+			+ "WHERE p.user IS NULL AND "
+			+ "p.dateTime BETWEEN :start AND :end")
+	List<Presentation> findDummiesWithinPeriod(
+			@Param("start") LocalDateTime start,
+			@Param("end") LocalDateTime end,
+			Pageable pageable);
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationQueryService.java b/backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationQueryService.java
@@ -72,10 +72,8 @@ public List<Presentation> getDummyDateBetweenMonth(
 	}
 
 	public List<Presentation> findPresentationsWithStatusWithinPeriod(
-			PresentationStatus status,
 			LocalDateTime start,
 			LocalDateTime end, PageRequest pageRequest) {
-		return presentationRepository.findPresentationsWithinPeriod(status,
-				start, end, pageRequest);
+		return presentationRepository.findDummiesWithinPeriod(start, end, pageRequest);
 	}
 }
diff --git a/backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationService.java b/backend/src/main/java/org/ftclub/cabinet/presentation/service/PresentationService.java
@@ -105,8 +105,8 @@ public List<Presentation> getLatestPastPresentations(int count) {
 		PageRequest pageRequest = PageRequest.of(DEFAULT_PAGE, count,
 				Sort.by(DATE_TIME).descending());
 
-		return presentationQueryService.findPresentationsWithStatusWithinPeriod(
-				PresentationStatus.DONE, start, limit, pageRequest);
+		return presentationQueryService.findPresentationsWithStatusWithinPeriod(start, limit,
+				pageRequest);
 	}
 
 	/**
@@ -122,8 +122,8 @@ public List<Presentation> getLatestUpcomingPresentationsByCount(int count) {
 		PageRequest pageRequest = PageRequest.of(DEFAULT_PAGE, count,
 				Sort.by(DATE_TIME).ascending());
 
-		return presentationQueryService.findPresentationsWithStatusWithinPeriod(
-				PresentationStatus.EXPECTED, start, end, pageRequest);
+		return presentationQueryService.findPresentationsWithStatusWithinPeriod(start, end,
+				pageRequest);
 	}
 
 	/**