X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=339451a8da61bf970a0adcdd8c90e5b24cc4848a;hb=b4bdcb0fca725eeb32b0215240aa9db18809f7d6;hp=31a2035c78df0d249eb8eab33fdfe9430151dbc6;hpb=2e9c772ba87cb848babce496dc3a044f8d5e9ccc;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 31a2035c..339451a8 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
@@ -2,7 +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.UnknownChatroomException;
+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;
@@ -10,9 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import java.util.Optional;
 import java.util.UUID;
-import java.util.stream.Stream;
 
 
 @RestController
@@ -20,39 +18,46 @@ import java.util.stream.Stream;
 public class ChatBackendController
 {
   private final ChatHome chatHome;
+  private final ChatRoomFactory factory;
   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")
-  public Stream<ChatRoomTo> list()
+  public Flux<ChatRoomInfoTo> 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
-        .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)
+  @GetMapping("{chatroomId}")
+  public Mono<ChatRoomInfoTo> 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,
@@ -61,12 +66,11 @@ 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(
+  private Mono<MessageTo> put(
       ChatRoom chatroom,
       String username,
       Long messageId,
@@ -78,11 +82,10 @@ public class ChatBackendController
                 messageId,
                 username,
                 text)
-            .switchIfEmpty(chatroom.getMessage(username, messageId))
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping("get/{chatroomId}/{username}/{messageId}")
+  @GetMapping("{chatroomId}/{username}/{messageId}")
   public Mono<MessageTo> get(
       @PathVariable UUID chatroomId,
       @PathVariable String username,
@@ -90,9 +93,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(
@@ -106,13 +108,12 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(path = "listen/{chatroomId}")
+  @GetMapping(path = "{chatroomId}/listen")
   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)
@@ -132,6 +133,6 @@ public class ChatBackendController
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.writeChatrooms(Flux.fromStream(chatHome.list()));
+    storageStrategy.write(chatHome.getChatRooms());
   }
 }