From a3a43fe7a0bb39e0d722f9cefd73b731bfc2436a Mon Sep 17 00:00:00 2001
From: lynxwq2 <kolav628@gmail.com>
Date: Thu, 27 Nov 2025 18:45:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/nto/entity/Booking.java  |  1 -
 .../nto/repository/BookingRepository.java     |  5 ++-
 .../example/nto/service/BookingService.java   |  8 +++-
 .../nto/service/impl/BookingServiceImpl.java  | 42 ++++++++++---------
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/example/nto/entity/Booking.java b/src/main/java/com/example/nto/entity/Booking.java
index a7f38cf..d15b740 100644
--- a/src/main/java/com/example/nto/entity/Booking.java
+++ b/src/main/java/com/example/nto/entity/Booking.java
@@ -5,7 +5,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
 
 import java.time.LocalDate;
 
diff --git a/src/main/java/com/example/nto/repository/BookingRepository.java b/src/main/java/com/example/nto/repository/BookingRepository.java
index ca90213..edf53ea 100644
--- a/src/main/java/com/example/nto/repository/BookingRepository.java
+++ b/src/main/java/com/example/nto/repository/BookingRepository.java
@@ -3,7 +3,9 @@ package com.example.nto.repository;
 import com.example.nto.entity.Booking;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
 
+import java.sql.Date;
 import java.util.Optional;
 
 /**
@@ -12,7 +14,8 @@ import java.util.Optional;
  * МОЖНО: Добавлять методы, аннотации, зависимости
  * НЕЛЬЗЯ: Изменять название класса и пакета
  */
+@Service
 @Repository
 public interface BookingRepository extends JpaRepository<Booking, Long> {
-    Optional<Booking> findByName(String name);
+    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 3c10024..c500134 100644
--- a/src/main/java/com/example/nto/service/BookingService.java
+++ b/src/main/java/com/example/nto/service/BookingService.java
@@ -1,6 +1,10 @@
 package com.example.nto.service;
 
 import com.example.nto.entity.Booking;
+import com.example.nto.entity.Employee;
+
+import java.util.List;
+import java.util.Optional;
 
 /**
  * TODO: ДОРАБОТАТЬ в рамках задания
@@ -9,5 +13,7 @@ import com.example.nto.entity.Booking;
  * НЕЛЬЗЯ: Изменять название класса и пакета
  */
 public interface BookingService {
-    Booking getBooking(String name);
+    List<Booking> getAll();
+    Optional<Booking> getById(long id);
+
 }
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 b3c31cc..a25620f 100644
--- a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
+++ b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
@@ -3,8 +3,11 @@ package com.example.nto.service.impl;
 import com.example.nto.entity.Booking;
 import com.example.nto.repository.BookingRepository;
 import com.example.nto.service.BookingService;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * TODO: ДОРАБОТАТЬ в рамках задания
@@ -12,23 +15,24 @@ import java.util.List;
  * МОЖНО: Добавлять методы, аннотации, зависимости
  * НЕЛЬЗЯ: Изменять название класса и пакета
  */
-//public class BookingServiceImpl implements BookingService {
-//
-//
-//    private final BookingRepository bookingRepository;
-//
-//    public BookingServiceImpl(BookingRepository bookingRepository) {
-//        this.bookingRepository = bookingRepository;
-//    }
-//
-//    @Override
-//    public List<Booking> getAll() {
-//        return bookingRepository.findAll();
-//    }
-//
-//    @Override
-//    public Booking getByName(String name) {
-//        return bookingRepository.findByName(name);
-//    }
+@Component
+@Service
+public class BookingServiceImpl implements BookingService {
 
-//}
+    private final BookingRepository bookingRepository;
+
+    public BookingServiceImpl(BookingRepository bookingRepository) {
+        this.bookingRepository = bookingRepository;
+    }
+
+    @Override
+    public List<Booking> getAll() {
+        return bookingRepository.findAll();
+    }
+
+    @Override
+    public Optional<Booking> getById(long id) {
+        return bookingRepository.findById(id);
+    }
+
+}