Olympic/NTO-2025-Backend-TeamTask
8
0
Fork 25
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

main #9

Closed
student-20690 wants to merge 26 commits from (deleted):main into main
pull from: (deleted):main
merge into: Olympic:main
Conversation 0 Commits 26 Files Changed 16 +2 -2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit efbe78f118 - Show all commits

2
src/main/java/com/example/nto/repository/BookingRepository.java
View File

@@ -19,7 +19,7 @@ import java.util.Optional;
@Service @Service
@Repository @Repository
public interface BookingRepository extends JpaRepository<Booking, Long> { public interface BookingRepository extends JpaRepository<Booking, Long> {
List<Booking> findByDateInAndEmployee_Code(List<LocalDate> dates, String code); List<Booking> findByDateIn(List<LocalDate> dates);
Optional<Booking> findById(Long id); Optional<Booking> findById(Long id);
} }

2
src/main/java/com/example/nto/service/impl/BookingServiceImpl.java
View File

@@ -64,7 +64,7 @@ public class BookingServiceImpl implements BookingService {
List<Place> allPlaces = placeRepository.findAll(); List<Place> allPlaces = placeRepository.findAll();
// 4. Находим все бронирования на целевые даты // 4. Находим все бронирования на целевые даты
List<Booking> bookings = bookingRepository.findByDateInAndEmployee_Code(targetDates, employeeCode); List<Booking> bookings = bookingRepository.findByDateIn(targetDates);
// 5. Группируем бронирования по датам // 5. Группируем бронирования по датам
Map<LocalDate, List<Booking>> bookingsByDate = bookings.stream() Map<LocalDate, List<Booking>> bookingsByDate = bookings.stream()