Skip to content

Commit 3835d0d

Browse files
committed
refactor: reorganize package structure for ReservationService and ReservationRepository
1 parent 9276b85 commit 3835d0d

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/main/java/com/example/SorokinSpringBoot/controllers/ReservationController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.SorokinSpringBoot.controllers;
22

3-
import com.example.SorokinSpringBoot.ReservationService;
3+
import com.example.SorokinSpringBoot.services.ReservationService;
44
import com.example.SorokinSpringBoot.models.Reservation;
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;

src/main/java/com/example/SorokinSpringBoot/ReservationRepository.java renamed to src/main/java/com/example/SorokinSpringBoot/repositories/ReservationRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.SorokinSpringBoot;
1+
package com.example.SorokinSpringBoot.repositories;
22

33
import com.example.SorokinSpringBoot.models.ReservationEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/example/SorokinSpringBoot/ReservationService.java renamed to src/main/java/com/example/SorokinSpringBoot/services/ReservationService.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.example.SorokinSpringBoot;
1+
package com.example.SorokinSpringBoot.services;
22

33
import com.example.SorokinSpringBoot.enums.ReservationStatus;
44
import com.example.SorokinSpringBoot.models.ReservationEntity;
55
import com.example.SorokinSpringBoot.models.Reservation;
6+
import com.example.SorokinSpringBoot.repositories.ReservationRepository;
67
import jakarta.persistence.EntityNotFoundException;
78
import org.springframework.stereotype.Service;
89

9-
import java.util.HashMap;
1010
import java.util.List;
11-
import java.util.Map;
1211
import java.util.NoSuchElementException;
1312
import 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;

0 commit comments

Comments
 (0)