From 033eae0ebf5c322fe7f3f6b397a47b2b6631bac9 Mon Sep 17 00:00:00 2001
From: wonie <119565449+wonies@users.noreply.github.com>
Date: Thu, 27 Feb 2025 18:50:52 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20[Fix]=20=EC=A0=84?=
 =?UTF-8?q?=EC=B2=B4=EC=9D=BC=EC=A0=95=EC=97=90=EC=84=9C=20status=20delete?=
 =?UTF-8?q?=20=EC=9D=BC=20=EB=95=8C=20=EC=A0=9C=EC=99=B8=ED=95=9C=20api=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?#1176=20(#1177)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: wonie <wonies@github.com>
---
 .../publicschedule/service/PublicScheduleService.java      | 4 ++--
 .../java/gg/repo/calendar/PublicScheduleRepository.java    | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java b/gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java
index a3664abd7..ca6e0430f 100644
--- a/gg-calendar-api/src/main/java/gg/calendar/api/user/schedule/publicschedule/service/PublicScheduleService.java
+++ b/gg-calendar-api/src/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
index a70df974c..4d0194504 100644
--- 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);