[BE] FIX : delete 테스트 완료

innovationacademy-kr · Nov 29, 2023 · bc01334 · bc01334
1 parent 5b726b5
commit bc01334
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/backend/src/main/java/org/ftclub/cabinet/user/repository/LentExtensionOptionalFetcher.java b/backend/src/main/java/org/ftclub/cabinet/user/repository/LentExtensionOptionalFetcher.java
@@ -28,13 +28,15 @@ public Page<LentExtension> findAllLentExtension(PageRequest pageable) {
 
 	@Transactional(readOnly = true)
 	public Page<LentExtension> findAllNotExpired(PageRequest pageable) {
-		return lentExtensionRepository.findAllNotExpired(pageable);
+		return lentExtensionRepository.findAllNotExpired(pageable)
+				.stream().filter(e -> !e.isUsed() && !e.isDeleted())
+				.collect(Collectors.collectingAndThen(Collectors.toList(), PageImpl::new));
 	}
 
 	@Transactional(readOnly = true)
 	public List<LentExtension> findAllNotExpired() {
 		return lentExtensionRepository.findAll()
-				.stream().filter(e -> !e.isUsed())
+				.stream().filter(e -> !e.isUsed() && !e.isDeleted())
 				.collect(Collectors.toList());
 	}