X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=3b8fc84229f19dfb50be27e096dfc3fa649c7642;hb=fad1a04e738182403490b11575653e3a1130fd48;hp=68c53d558edf5ca7c24e2eae60644d388da7867b;hpb=aa01a85ce5552d7a849bc09a80cac0860e5e8c93;p=demos%2Fkafka%2Fchat

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 68c53d55..3b8fc842 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/api/ChatBackendController.java
@@ -9,11 +9,7 @@ import org.springframework.web.bind.annotation.*;
 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.stream.Stream;
 
 
 @RestController
@@ -21,37 +17,35 @@ import java.util.stream.Stream;
 public class ChatBackendController
 {
   private final ChatHome chatHome;
-  private final Clock clock;
   private final StorageStrategy storageStrategy;
 
 
   @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}")
@@ -63,9 +57,8 @@ public class ChatBackendController
   {
     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(
@@ -78,10 +71,8 @@ public class ChatBackendController
         chatroom
             .addMessage(
                 messageId,
-                LocalDateTime.now(clock),
                 username,
                 text)
-            .switchIfEmpty(chatroom.getMessage(username, messageId))
             .map(message -> MessageTo.from(message));
   }
 
@@ -93,9 +84,8 @@ public class ChatBackendController
   {
     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(
@@ -113,9 +103,8 @@ public class ChatBackendController
   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)
@@ -135,6 +124,6 @@ public class ChatBackendController
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.writeChatrooms(Flux.fromStream(chatHome.list()));
+    storageStrategy.write(chatHome.getChatRooms());
   }
 }