Skip to content
Snippets Groups Projects

Resolve "room image improvements"

Files

@@ -17,8 +17,7 @@
@@ -17,8 +17,7 @@
*/
*/
package nl.tudelft.queue.cache;
package nl.tudelft.queue.cache;
import java.util.List;
import java.util.*;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +36,16 @@ public class RoomCacheManager extends CoreCacheManager<Long, RoomDetailsDTO> {
@@ -37,10 +36,16 @@ public class RoomCacheManager extends CoreCacheManager<Long, RoomDetailsDTO> {
private RoomControllerApi api;
private RoomControllerApi api;
public List<RoomDetailsDTO> getAll() {
public List<RoomDetailsDTO> getAll() {
var rooms = api.getAllRoomsById(api.getAllRooms().collectList().block().stream()
List<RoomDetailsDTO> rooms = api.getAllRoomsById(api.getAllRooms().collectList().block().stream()
.map(RoomSummaryDTO::getId).collect(Collectors.toList())).collectList().block();
.map(RoomSummaryDTO::getId).collect(Collectors.toList())).collectList().block();
register(rooms);
register(rooms);
 
rooms = new ArrayList<>(rooms);
 
 
rooms.sort(Comparator
 
.comparing((RoomDetailsDTO r) -> r.getBuilding().getName())
 
.thenComparing(RoomDetailsDTO::getName));
 
return rooms;
return rooms;
}
}
Loading