🛠️ [Fix] 전체일정에서 status delete 일 때 제외한 api 추가 로직 수정 #1176 (#1177)

Co-authored-by: wonie <[email protected]>
42organization · Feb 27, 2025 · 033eae0 · 033eae0
1 parent 7cc6f7e
commit 033eae0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java b/...main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java
@@ -101,8 +101,8 @@ public List<PublicSchedulePeriodRetrieveResDto> retrieveNonPrivateSchedulePeriod
 		LocalDateTime end) {
 		validateTimeRange(start, end);
 		List<PublicSchedule> nonPrivateSchedules = publicScheduleRepository
-			.findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNot(
-				start, end, DetailClassification.PRIVATE_SCHEDULE);
+			.findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNotAndStatusNot(
+				start, end, DetailClassification.PRIVATE_SCHEDULE, ScheduleStatus.DELETE);
 		return nonPrivateSchedules.stream().map(PublicSchedulePeriodRetrieveResDto::toDto).collect(Collectors.toList());
 	}
 

diff --git a/gg-repo/src/main/java/gg/repo/calendar/PublicScheduleRepository.java b/gg-repo/src/main/java/gg/repo/calendar/PublicScheduleRepository.java
@@ -23,11 +23,8 @@ public interface PublicScheduleRepository extends JpaRepository<PublicSchedule,
 	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqual(LocalDateTime startTime,
 		LocalDateTime endTime);
 
-	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassification(
-		LocalDateTime startTime, LocalDateTime endTime, DetailClassification classification);
-
-	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNot(
-		LocalDateTime start, LocalDateTime end, DetailClassification classification);
+	List<PublicSchedule> findByEndTimeGreaterThanEqualAndStartTimeLessThanEqualAndClassificationNotAndStatusNot(
+		LocalDateTime start, LocalDateTime end, DetailClassification classification, ScheduleStatus scheduleStatus);
 
 	Optional<PublicSchedule> findByIdAndStatusNot(Long id, ScheduleStatus status);