Merge pull request #92 from HanaFun/dev

Dev
HanaFun · Jul 8, 2024 · 6ba2c1b · 6ba2c1b
2 parents 380969c + 1749265
commit 6ba2c1b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/com/hanaro/hanafun/reservation/service/impl/ReservationServiceImpl.java b/src/main/java/com/hanaro/hanafun/reservation/service/impl/ReservationServiceImpl.java
@@ -110,6 +110,7 @@ public List<MyScheduleResDto> mySchedules(Long userId, MyScheduleReqDto mySchedu
         List<ReservationEntity> reservations = reservationRepository.findReservationEntitiesByUserEntity(user);
 
         List<MyScheduleResDto> mySchedules = reservations.stream()
+                .filter(reservation -> !reservation.isDeleted())
                 .filter(reservation -> {
                     LocalDate date = reservation.getLessonDateEntity().getDate();
                     return date.getYear() == myScheduleReqDto.getYear() && date.getMonthValue() == myScheduleReqDto.getMonth();
@@ -144,6 +145,7 @@ public LessonDateDetailResDto lessonDateDetail(LessonDateDetailReqDto lessonDate
         int capacity = lessonDate.getLessonEntity().getCapacity();  // 모집인원
 
         List<ReservationPerson> people = reservations.stream()
+                .filter(reservation -> !reservation.isDeleted())
                 .map(reservation -> {
                     ReservationPerson person = ReservationPerson.builder()
                             .startTime(lessonDate.getStartTime())