@Override
public Flux<ChatRoomInfo> readChatRoomInfo()
{
- return Flux
- .fromIterable(chatRoomRepository.findAll())
+ return chatRoomRepository.findAll()
.map(chatRoomTo ->
{
UUID chatRoomId = UUID.fromString(chatRoomTo.getId());
- return new ChatRoomInfo(chatRoomId, chatRoomTo.getName());
+ return new ChatRoomInfo(chatRoomId, chatRoomTo.getName(), null);
});
}
@Override
public Flux<Message> readChatRoomData(UUID chatRoomId)
{
- return Flux
- .fromIterable(messageRepository.findByChatRoomIdOrderBySerialAsc(chatRoomId.toString()))
+ return messageRepository.findByChatRoomIdOrderBySerialAsc(chatRoomId.toString())
.map(messageTo -> messageTo.toMessage());
}
}