From de7df58ef1822407af65e7fc38e6e11a37aea083 Mon Sep 17 00:00:00 2001 From: LavashGms Date: Thu, 11 Dec 2025 20:42:44 +0700 Subject: [PATCH] Commit changes 2 --- .../nto/repository/BookingRepository.java | 1 + .../nto/repository/PlaceRepository.java | 1 + .../nto/service/impl/EmployeeServiceImpl.java | 24 ++++++++----------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/nto/repository/BookingRepository.java b/src/main/java/com/example/nto/repository/BookingRepository.java index 0eb71da..7b09f54 100644 --- a/src/main/java/com/example/nto/repository/BookingRepository.java +++ b/src/main/java/com/example/nto/repository/BookingRepository.java @@ -4,6 +4,7 @@ import com.example.nto.entity.Booking; import org.springframework.data.jpa.repository.JpaRepository; import java.time.LocalDate; +import java.util.List; import java.util.Optional; /** diff --git a/src/main/java/com/example/nto/repository/PlaceRepository.java b/src/main/java/com/example/nto/repository/PlaceRepository.java index aff1a7c..d6c7b32 100644 --- a/src/main/java/com/example/nto/repository/PlaceRepository.java +++ b/src/main/java/com/example/nto/repository/PlaceRepository.java @@ -10,4 +10,5 @@ import org.springframework.data.jpa.repository.JpaRepository; * НЕЛЬЗЯ: Изменять название класса и пакета */ public interface PlaceRepository extends JpaRepository { + Place findById(long placeId); } diff --git a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java index 7dd7638..98a5572 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -101,20 +101,16 @@ public class EmployeeServiceImpl implements EmployeeService { if (!CheckAuthorization(code)) return new ResponseEntity<>("кода не существует", HttpStatus.UNAUTHORIZED); - Map> freePlacesMap = GetFreeBookings(code); - if (!freePlacesMap.containsKey(bookingInfo.date.toString())) - return new ResponseEntity<>("что-то пошло не так", HttpStatus.BAD_REQUEST); - List freePlaces = freePlacesMap.get(bookingInfo.date.toString()); - for (int i = 0; i < freePlaces.size(); i++) { - if (freePlaces.get(i).getId() == bookingInfo.placeId) { - bookingRepository.save(Booking.builder() - .date(bookingInfo.date) - .place(freePlaces.get(i)) - .employee(employeeRepository.findByCode(code).get()) - .build()); - return new ResponseEntity<>("бронирование успешно создано", HttpStatus.CREATED); - } + List allBookings = bookingRepository.findAll(); + for (int i = 0; i < allBookings.size(); i++) { + if (allBookings.get(i).getDate().toString().equals(bookingInfo.date.toString()) && allBookings.get(i).getPlace().getId() == bookingInfo.placeId) + return new ResponseEntity<>("уже забронировано", HttpStatus.CONFLICT); } - return new ResponseEntity<>("уже забронировано", HttpStatus.CONFLICT); + bookingRepository.save(Booking.builder() + .date(bookingInfo.date) + .place(placeRepository.findById(bookingInfo.placeId)) + .employee(employeeRepository.findByCode(code).get()) + .build()); + return new ResponseEntity<>("бронирование успешно создано", HttpStatus.CREATED); } } \ No newline at end of file