diff --git a/src/main/java/com/example/nto/controller/BookingController.java b/src/main/java/com/example/nto/controller/BookingController.java index 8b62191..e1dd017 100644 --- a/src/main/java/com/example/nto/controller/BookingController.java +++ b/src/main/java/com/example/nto/controller/BookingController.java @@ -9,13 +9,11 @@ import com.example.nto.repository.PlaceRepository; import com.example.nto.service.BookingService; import com.example.nto.service.EmployeeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/com/example/nto/controller/EmployeeController.java b/src/main/java/com/example/nto/controller/EmployeeController.java index 6dc674c..ae01a9a 100644 --- a/src/main/java/com/example/nto/controller/EmployeeController.java +++ b/src/main/java/com/example/nto/controller/EmployeeController.java @@ -1,20 +1,12 @@ package com.example.nto.controller; - -import com.example.nto.entity.Booking; import com.example.nto.entity.Employee; import com.example.nto.excepation.EmployeeNotFoundException; -import com.example.nto.repository.BookingRepository; -import com.example.nto.repository.EmployeeRepository; import com.example.nto.service.EmployeeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * TODO: ДОРАБОТАТЬ в рамках задания * ================================= diff --git a/src/main/java/com/example/nto/excepation/ConflictException.java b/src/main/java/com/example/nto/excepation/ConflictException.java deleted file mode 100644 index 2c6ad3b..0000000 --- a/src/main/java/com/example/nto/excepation/ConflictException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.nto.excepation; - -public class ConflictException extends RuntimeException { - public ConflictException(String message) { - super(message); - } -} diff --git a/src/main/java/com/example/nto/service/BookingService.java b/src/main/java/com/example/nto/service/BookingService.java index 6629e95..c1c7d39 100644 --- a/src/main/java/com/example/nto/service/BookingService.java +++ b/src/main/java/com/example/nto/service/BookingService.java @@ -1,8 +1,6 @@ package com.example.nto.service; import org.springframework.stereotype.Service; - -import java.util.List; import java.util.Map; @Service diff --git a/src/main/java/com/example/nto/service/PlaceServise.java b/src/main/java/com/example/nto/service/PlaceServise.java index 4ee1351..782f312 100644 --- a/src/main/java/com/example/nto/service/PlaceServise.java +++ b/src/main/java/com/example/nto/service/PlaceServise.java @@ -7,7 +7,6 @@ import org.springframework.stereotype.Service; @Service public class PlaceServise { private final PlaceRepository placeRepository; - public PlaceServise(PlaceRepository placeRepository) { this.placeRepository = placeRepository; } 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 341abcf..c9c83c7 100644 --- a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java @@ -35,7 +35,6 @@ public class BookingServiceImpl implements BookingService { if (employee == null) { throw new EmployeeNotFoundException("Employee not found with code: " + employeeCode); } - LocalDate today = LocalDate.now(); LocalDate endDate = today.plusDays(3); List bookings = bookingRepository.findByDateBetween(today, endDate); 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 8b330fc..0557b00 100644 --- a/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/EmployeeServiceImpl.java @@ -1,5 +1,4 @@ package com.example.nto.service.impl; -import com.example.nto.entity.Booking; import com.example.nto.entity.Employee; import com.example.nto.excepation.EmployeeNotFoundException; import com.example.nto.repository.BookingRepository; @@ -8,8 +7,6 @@ import com.example.nto.service.EmployeeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * TODO: ДОРАБОТАТЬ в рамках задания @@ -19,13 +16,8 @@ import java.util.List; */ @Service public class EmployeeServiceImpl implements EmployeeService { - @Autowired private EmployeeRepository employeeRepository; - - @Autowired - private BookingRepository bookingRepository; - @Override public Employee getEmployeeWithBookings(String code) { if (code == null || code.isEmpty()) {