+букинг (почти без ошибок) v2
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user