X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=51ed6a200a32eb1ec31bc5defbbf72795e3d8c4d;hb=972a1f2c248a51740091c1fdf3526f0eb676639e;hp=4aaf4f57789b468806c361d4550cc522bc7baa07;hpb=c91dacfc3c7b3764d7c5925a4fb327677a0eadbb;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 4aaf4f57..51ed6a20 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
@@ -1,19 +1,15 @@
 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.ChatRoom;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.MediaType;
+import org.springframework.http.codec.ServerSentEvent;
 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,26 +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.list().map(chatroom -> ChatRoomTo.from(chatroom));
+  }
+
+  @GetMapping("list/{chatroomId}")
+  public Flux<MessageTo> list(@PathVariable UUID chatroomId)
+  {
+    return chatHome
+        .getChatroom(chatroomId)
+        .flatMapMany(chatroom -> chatroom
+            .getMessages()
+            .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}")
@@ -53,12 +58,11 @@ public class ChatBackendController
     return
         chatHome
             .getChatroom(chatroomId)
-            .map(chatroom -> put(chatroom, username, messageId, text))
-            .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+            .flatMap(chatroom -> put(chatroom, username, messageId, text));
   }
 
   public Mono<MessageTo> put(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId,
       String text)
@@ -67,10 +71,8 @@ public class ChatBackendController
         chatroom
             .addMessage(
                 messageId,
-                LocalDateTime.now(clock),
                 username,
                 text)
-            .switchIfEmpty(chatroom.getMessage(username, messageId))
             .map(message -> MessageTo.from(message));
   }
 
@@ -83,12 +85,11 @@ public class ChatBackendController
     return
         chatHome
             .getChatroom(chatroomId)
-            .map(chatroom -> get(chatroom, username, messageId))
-            .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+            .flatMap(chatroom -> get(chatroom, username, messageId));
   }
 
   private Mono<MessageTo> get(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId)
   {
@@ -98,28 +99,31 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(
-      path = "listen/{chatroomId}",
-      produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-  public Flux<MessageTo> listen(@PathVariable UUID chatroomId)
+  @GetMapping(path = "listen/{chatroomId}")
+  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
   {
     return chatHome
         .getChatroom(chatroomId)
-        .map(chatroom -> listen(chatroom))
-        .orElseThrow(() -> new UnknownChatroomException(chatroomId));
+        .flatMapMany(chatroom -> listen(chatroom));
   }
 
-  private Flux<MessageTo> listen(Chatroom chatroom)
+  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
   {
     return chatroom
         .listen()
         .log()
-        .map(message -> MessageTo.from(message));
+        .map(message -> MessageTo.from(message))
+        .map(messageTo ->
+            ServerSentEvent
+                .builder(messageTo)
+                .id(messageTo.getSerial().toString())
+                .event("message")
+                .build());
   }
 
   @PostMapping("/store")
   public void store()
   {
-    storageStrategy.writeChatrooms(Flux.fromStream(chatHome.list()));
+    storageStrategy.writeChatrooms(chatHome.list());
   }
 }