File tree Expand file tree Collapse file tree
src/main/java/com/example/SorokinSpringBoot Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11package com .example .SorokinSpringBoot .controllers ;
22
3- import com .example .SorokinSpringBoot .ReservationService ;
3+ import com .example .SorokinSpringBoot .services . ReservationService ;
44import com .example .SorokinSpringBoot .models .Reservation ;
55import org .slf4j .Logger ;
66import org .slf4j .LoggerFactory ;
Original file line number Diff line number Diff line change 1- package com .example .SorokinSpringBoot ;
1+ package com .example .SorokinSpringBoot . repositories ;
22
33import com .example .SorokinSpringBoot .models .ReservationEntity ;
44import org .springframework .data .jpa .repository .JpaRepository ;
Original file line number Diff line number Diff line change 1- package com .example .SorokinSpringBoot ;
1+ package com .example .SorokinSpringBoot . services ;
22
33import com .example .SorokinSpringBoot .enums .ReservationStatus ;
44import com .example .SorokinSpringBoot .models .ReservationEntity ;
55import com .example .SorokinSpringBoot .models .Reservation ;
6+ import com .example .SorokinSpringBoot .repositories .ReservationRepository ;
67import jakarta .persistence .EntityNotFoundException ;
78import org .springframework .stereotype .Service ;
89
9- import java .util .HashMap ;
1010import java .util .List ;
11- import java .util .Map ;
1211import java .util .NoSuchElementException ;
1312import java .util .concurrent .atomic .AtomicLong ;
1413
@@ -110,8 +109,8 @@ private boolean isReservationConflict(ReservationEntity reservation){
110109 var allReservations = repository .findAll ();
111110 for (ReservationEntity existingReservation : allReservations ){
112111 if (reservation .getId ().equals (existingReservation .getId ())) continue ;
113- if (reservation .getRoomId ().equals (existingReservation .getRoomId ())) continue ;
114- if (existingReservation .getStatus (). equals ( ReservationStatus .CONFIRMED ) ) continue ;
112+ if (! reservation .getRoomId ().equals (existingReservation .getRoomId ())) continue ;
113+ if (existingReservation .getStatus () != ReservationStatus .CONFIRMED ) continue ;
115114 if (reservation .getStartDate ().isBefore (existingReservation .getEndDate ())
116115 && existingReservation .getStartDate ().isBefore (reservation .getEndDate ()))
117116 return true ;
You can’t perform that action at this time.
0 commit comments