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

main #8

Closed
student-18211 wants to merge 22 commits from student-18211/NTO-2025-Backend-TeamTask:main into main
pull from: student-18211/NTO-2025-Backend-TeamTask:main
merge into: Olympic:main
Conversation 0 Commits 22 Files Changed 16 +2 -9
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c3ef45d78 - Show all commits

11
src/main/java/com/example/nto/controller/EmployeeController.java
View File

@@ -52,13 +52,7 @@ public class EmployeeController {
} }
Employee employee = employeeService.getEmployeeByCode(code); Employee employee = employeeService.getEmployeeByCode(code);
List<Booking> bookings = bookingRepository.findByEmployeeId(employee.getId()); List<Booking> bookings = bookingRepository.findByEmployeeId(employee.getId());
Map<String, Map<String, Object>> bookingMap = new LinkedHashMap<>(); Map<String, List<Map<String, Object>>> bookingMap = bookings.stream().collect(Collectors.groupingBy(b -> b.getDate().toString(),LinkedHashMap::new,Collectors.mapping(b -> Map.of("id", b.getId(),"place", b.getPlace().getPlace()), Collectors.toList())));
for (Booking b : bookings) {
bookingMap.put(
b.getDate().toString(),
Map.of("id", b.getId(), "place", b.getPlace().getPlace()));
}
Map<String, Object> response = new LinkedHashMap<>(); Map<String, Object> response = new LinkedHashMap<>();
response.put("name", employee.getName()); response.put("name", employee.getName());
response.put("photoUrl", employee.getPhotoUrl()); response.put("photoUrl", employee.getPhotoUrl());
@@ -73,5 +67,4 @@ public class EmployeeController {
.body("Unexpected error"); .body("Unexpected error");
} }
} }
}
}