From 888284602028b8ec5733a80513b53d108fb832c4 Mon Sep 17 00:00:00 2001
From: lynxwq2 <kolav628@gmail.com>
Date: Thu, 4 Dec 2025 16:40:11 +0300
Subject: [PATCH] =?UTF-8?q?+=D0=B1=D1=83=D0=BA=D0=B8=D0=BD=D0=B3=20(=D0=BF?=
 =?UTF-8?q?=D0=BE=D1=87=D1=82=D0=B8=20=D0=B1=D0=B5=D0=B7=20=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA)=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/nto/repository/BookingRepository.java  | 4 ++--
 src/main/java/com/example/nto/service/BookingService.java   | 2 +-
 .../com/example/nto/service/impl/BookingServiceImpl.java    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/nto/repository/BookingRepository.java b/src/main/java/com/example/nto/repository/BookingRepository.java
index 64e730e..83d3958 100644
--- a/src/main/java/com/example/nto/repository/BookingRepository.java
+++ b/src/main/java/com/example/nto/repository/BookingRepository.java
@@ -19,7 +19,7 @@ import java.util.Optional;
 @Service
 @Repository
 public interface BookingRepository extends JpaRepository<Booking, Long> {
-    List<Booking> findByDateAndEmployeeByCode(List<LocalDate> dates, String code);
+    List<Booking> findByDateInAndEmployee_Code(List<LocalDate> dates, String code);
 
-    Optional<Booking> findById(String code);
+    Optional<Booking> findById(Long id);
 }
diff --git a/src/main/java/com/example/nto/service/BookingService.java b/src/main/java/com/example/nto/service/BookingService.java
index 206b655..3488d55 100644
--- a/src/main/java/com/example/nto/service/BookingService.java
+++ b/src/main/java/com/example/nto/service/BookingService.java
@@ -15,7 +15,7 @@ import java.util.Optional;
  */
 public interface BookingService {
     List<Booking> getAll();
-    Optional<Booking> getBookingById(String code);
+    Optional<Booking> getBookingById(Long id);
 
     Map<String, List<Booking.AvailablePlaceDto>> getAvailablePlaces(String code);
 }
diff --git a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
index 3051a96..8cd4d52 100644
--- a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
+++ b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
@@ -35,8 +35,8 @@ public class BookingServiceImpl implements BookingService {
     }
 
     @Override
-    public Optional<Booking> getBookingById(String code) {
-        return bookingRepository.findById(code);
+    public Optional<Booking> getBookingById(Long id) {
+        return bookingRepository.findById(id);
     }
 
     @Autowired
@@ -64,7 +64,7 @@ public class BookingServiceImpl implements BookingService {
         List<Place> allPlaces = placeRepository.findAll();
 
         // 4. Находим все бронирования на целевые даты
-        List<Booking> bookings = bookingRepository.findByDateAndEmployeeByCode(targetDates, employeeCode);
+        List<Booking> bookings = bookingRepository.findByDateInAndEmployee_Code(targetDates, employeeCode);
 
         // 5. Группируем бронирования по датам
         Map<LocalDate, List<Booking>> bookingsByDate = bookings.stream()