diff --git a/src/main/java/com/example/nto/controller/BookingController.java b/src/main/java/com/example/nto/controller/BookingController.java index 98820e7..bbb10e3 100644 --- a/src/main/java/com/example/nto/controller/BookingController.java +++ b/src/main/java/com/example/nto/controller/BookingController.java @@ -28,7 +28,7 @@ public class BookingController { @GetMapping("/{code}/booking") public ResponseEntity>> getAvailablePlaces(@PathVariable String code) { - return ResponseEntity.noContent().build(); + return ResponseEntity.ok(bookingService.getAvailablePlaces(code)); } @PostMapping("/{code}/book") diff --git a/src/main/java/com/example/nto/service/BookingService.java b/src/main/java/com/example/nto/service/BookingService.java index 72488ec..c6159ff 100644 --- a/src/main/java/com/example/nto/service/BookingService.java +++ b/src/main/java/com/example/nto/service/BookingService.java @@ -13,6 +13,6 @@ import java.util.Map; * НЕЛЬЗЯ: Изменять название класса и пакета */ public interface BookingService { - Map> getAvailablePlaces(); + Map> getAvailablePlaces(String code); void createBooking(CreateBookingDTO createBookingDTO, 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 6e23f9d..2705dc8 100644 --- a/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java +++ b/src/main/java/com/example/nto/service/impl/BookingServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -34,8 +35,21 @@ public class BookingServiceImpl implements BookingService { EmployeeRepository employeeRepository; @Override - public Map> getAvailablePlaces() { - return Map.of(); + public Map> getAvailablePlaces(String code) { + employeeService.codeExists(code); + + LocalDate startDate = LocalDate.now(); + LocalDate endDate = startDate.plusDays(3); + + List allPlaces = placeRepository.findAll(); + List allBookings = bookingRepository.findByDateBetween(startDate, endDate); + + Map> result = new LinkedHashMap<>(); + + for (LocalDate date = startDate; !date.isAfter(endDate); date = date.plusDays(1)) { + + } + return result; } @Override