projects
/
demos
/
kafka
/
chat
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: `UnknownChatroomException` records shard and owned shards
[demos/kafka/chat]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
chat
/
backend
/
api
/
ChatBackendController.java
diff --git
a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
index
68c53d5
..
339451a
100644
(file)
--- a/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
+++ b/
src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
@@
-2,6
+2,7
@@
package de.juplo.kafka.chat.backend.api;
import de.juplo.kafka.chat.backend.domain.ChatHome;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
import de.juplo.kafka.chat.backend.domain.ChatHome;
import de.juplo.kafka.chat.backend.domain.ChatRoom;
+import de.juplo.kafka.chat.backend.domain.ChatRoomFactory;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import org.springframework.http.codec.ServerSentEvent;
import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
import lombok.RequiredArgsConstructor;
import org.springframework.http.codec.ServerSentEvent;
@@
-9,11
+10,7
@@
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.Optional;
import java.util.UUID;
import java.util.UUID;
-import java.util.stream.Stream;
@RestController
@RestController
@@
-21,40
+18,46
@@
import java.util.stream.Stream;
public class ChatBackendController
{
private final ChatHome chatHome;
public class ChatBackendController
{
private final ChatHome chatHome;
- private final C
lock clock
;
+ private final C
hatRoomFactory factory
;
private final StorageStrategy storageStrategy;
@PostMapping("create")
private final StorageStrategy storageStrategy;
@PostMapping("create")
- public
ChatRoomTo
create(@RequestBody String name)
+ public
Mono<ChatRoomInfoTo>
create(@RequestBody String name)
{
{
- return ChatRoomTo.from(chatHome.createChatroom(name));
+ UUID chatRoomId = UUID.randomUUID();
+ return factory
+ .createChatRoom(chatRoomId, name)
+ .map(ChatRoomInfoTo::from);
}
@GetMapping("list")
}
@GetMapping("list")
- public
Stream<ChatRoom
To> list()
+ public
Flux<ChatRoomInfo
To> list()
{
{
- return chatHome.list().map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome
+ .getChatRooms()
+ .map(chatroom -> ChatRoomInfoTo.from(chatroom));
}
}
- @GetMapping("
list/{chatroomId}
")
+ @GetMapping("
{chatroomId}/list
")
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
public Flux<MessageTo> list(@PathVariable UUID chatroomId)
{
return chatHome
- .getChat
r
oom(chatroomId)
- .
map
(chatroom -> chatroom
+ .getChat
R
oom(chatroomId)
+ .
flatMapMany
(chatroom -> chatroom
.getMessages()
.getMessages()
- .map(MessageTo::from))
- .get();
+ .map(MessageTo::from));
}
}
- @GetMapping("
get/
{chatroomId}")
- public
Optional<ChatRoom
To> get(@PathVariable UUID chatroomId)
+ @GetMapping("{chatroomId}")
+ public
Mono<ChatRoomInfo
To> get(@PathVariable UUID chatroomId)
{
{
- return chatHome.getChatroom(chatroomId).map(chatroom -> ChatRoomTo.from(chatroom));
+ return chatHome
+ .getChatRoom(chatroomId)
+ .map(chatroom -> ChatRoomInfoTo.from(chatroom));
}
}
- @PutMapping("
put/
{chatroomId}/{username}/{messageId}")
+ @PutMapping("{chatroomId}/{username}/{messageId}")
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
public Mono<MessageTo> put(
@PathVariable UUID chatroomId,
@PathVariable String username,
@@
-63,12
+66,11
@@
public class ChatBackendController
{
return
chatHome
{
return
chatHome
- .getChatroom(chatroomId)
- .map(chatroom -> put(chatroom, username, messageId, text))
- .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+ .getChatRoom(chatroomId)
+ .flatMap(chatroom -> put(chatroom, username, messageId, text));
}
}
- p
ublic
Mono<MessageTo> put(
+ p
rivate
Mono<MessageTo> put(
ChatRoom chatroom,
String username,
Long messageId,
ChatRoom chatroom,
String username,
Long messageId,
@@
-78,14
+80,12
@@
public class ChatBackendController
chatroom
.addMessage(
messageId,
chatroom
.addMessage(
messageId,
- LocalDateTime.now(clock),
username,
text)
username,
text)
- .switchIfEmpty(chatroom.getMessage(username, messageId))
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
- @GetMapping("
get/
{chatroomId}/{username}/{messageId}")
+ @GetMapping("{chatroomId}/{username}/{messageId}")
public Mono<MessageTo> get(
@PathVariable UUID chatroomId,
@PathVariable String username,
public Mono<MessageTo> get(
@PathVariable UUID chatroomId,
@PathVariable String username,
@@
-93,9
+93,8
@@
public class ChatBackendController
{
return
chatHome
{
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(
}
private Mono<MessageTo> get(
@@
-109,13
+108,12
@@
public class ChatBackendController
.map(message -> MessageTo.from(message));
}
.map(message -> MessageTo.from(message));
}
- @GetMapping(path = "
listen/{chatroomId}
")
+ @GetMapping(path = "
{chatroomId}/listen
")
public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
{
return chatHome
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)
}
private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
@@
-135,6
+133,6
@@
public class ChatBackendController
@PostMapping("/store")
public void store()
{
@PostMapping("/store")
public void store()
{
- storageStrategy.write
Chatrooms(Flux.fromStream(chatHome.list()
));
+ storageStrategy.write
(chatHome.getChatRooms(
));
}
}
}
}