refactor: jpa query method로 인기 행사 리스트 조회 구현

src/main/java/com/efub/dhs/domain/program/repository/ProgramRepository.java

@@ -22,5 +22,5 @@ List<Program> findTop3ByCategoryAndIsOpenAndDeadlineAfterAndProgramIdNotOrderByD
 	@Query(value = "select p from Program p join fetch Heart h on h.program=p where h.member=?1")
 	Page<Program> findAllProgramLiked(Member member, Pageable pageable);
 
-	List<Program> findAllByIsOpenOrderByLikeNumberDesc(Boolean isOpen);
+	List<Program> findTop5ByIsOpenAndDeadlineAfterOrderByLikeNumberDesc(Boolean isOpen, LocalDateTime deadline);
 }

src/main/java/com/efub/dhs/domain/program/service/ProgramService.java

@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.time.Period;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -192,25 +191,9 @@ public ProgramListResponseDto findProgramList(int page, ProgramListRequestDto re
 	}
 
 	public List<ProgramOutlineResponseDto> findProgramPopular() {
-		List<Program> popularProgramList = programRepository.findAllByIsOpenOrderByLikeNumberDesc(true);
-		List<Program> filteredPopularProgramList = getProgramByRemainingDays(popularProgramList, 5);
-		return convertToProgramOutlineResponseDtoList(filteredPopularProgramList, null);
-	}
-
-	public List<Program> getProgramByRemainingDays(List<Program> programList, int size) {
-		List<Program> filteredList = new ArrayList<>();
-
-		programList.forEach(program -> {
-			if (filteredList.size() == size) {
-				return;
-			}
-			Integer remainingDays = calculateRemainingDays(program.getDeadline());
-			if (remainingDays >= 0) {
-				filteredList.add(program);
-			}
-		});
-
-		return filteredList;
+		List<Program> popularProgramList =
+			programRepository.findTop5ByIsOpenAndDeadlineAfterOrderByLikeNumberDesc(true, LocalDateTime.now());
+		return convertToProgramOutlineResponseDtoList(popularProgramList, null);
 	}
 
 	public Member isLoggedIn(String username) {