import de.juplo.kafka.chat.backend.domain.ChatHome;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
-import de.juplo.kafka.chat.backend.domain.UnknownChatroomException;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import org.springframework.http.codec.ServerSentEvent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import java.util.Optional;
import java.util.UUID;
-import java.util.stream.Stream;
@RestController
@PostMapping("create")
- public ChatRoomTo create(@RequestBody String name)
+ public Mono<ChatRoomTo> create(@RequestBody String name)
{
- return ChatRoomTo.from(chatHome.createChatroom(name));
+ return chatHome.createChatroom(name).map(ChatRoomTo::from);
}
@GetMapping("list")
- public Stream<ChatRoomTo> list()
+ public Flux<ChatRoomTo> list()
{
- return chatHome.list().map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.getChatRooms().map(chatroom -> ChatRoomTo.from(chatroom));
}
@GetMapping("list/{chatroomId}")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> chatroom
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> chatroom
.getMessages()
- .map(MessageTo::from))
- .get();
+ .map(MessageTo::from));
}
@GetMapping("get/{chatroomId}")
- public Optional<ChatRoomTo> get(@PathVariable UUID chatroomId)
+ public Mono<ChatRoomTo> get(@PathVariable UUID chatroomId)
{
- return chatHome.getChatroom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome.getChatRoom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
}
@PutMapping("put/{chatroomId}/{username}/{messageId}")
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> put(chatroom, username, messageId, text))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> put(chatroom, username, messageId, text));
}
public Mono<MessageTo> put(
messageId,
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> get(chatroom, username, messageId))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> get(chatroom, username, messageId));
}
private Mono<MessageTo> get(
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> listen(chatroom))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMapMany(chatroom -> listen(chatroom));
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
@PostMapping("/store")
public void store()
{
- storageStrategy.writeChatrooms(Flux.fromStream(chatHome.list()));
+ storageStrategy.writeChatrooms(chatHome.getChatRooms());
}
}