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=385c95c813fd8d30f1c44a620ea51889a8e0f00f;hpb=8e11510f956a4370044ef5819a53664df6ad1dcd;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 385c95c8..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
@@ -1,16 +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.domain.ChatRoomFactory;
+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.Collection;
 import java.util.UUID;
 
 
@@ -19,47 +18,74 @@ import java.util.UUID;
 public class ChatBackendController
 {
   private final ChatHome chatHome;
-  private final Clock clock;
+  private final ChatRoomFactory factory;
+  private final StorageStrategy storageStrategy;
 
 
   @PostMapping("create")
-  public Chatroom create(@RequestBody String name)
+  public Mono<ChatRoomInfoTo> create(@RequestBody String name)
   {
-    return chatHome.createChatroom(name);
+    UUID chatRoomId = UUID.randomUUID();
+    return factory
+        .createChatRoom(chatRoomId, name)
+        .map(ChatRoomInfoTo::from);
   }
 
   @GetMapping("list")
-  public Collection<Chatroom> list()
+  public Flux<ChatRoomInfoTo> list()
   {
-    return chatHome.list();
+    return chatHome
+        .getChatRooms()
+        .map(chatroom -> ChatRoomInfoTo.from(chatroom));
+  }
+
+  @GetMapping("{chatroomId}/list")
+  public Flux<MessageTo> list(@PathVariable UUID chatroomId)
+  {
+    return chatHome
+        .getChatRoom(chatroomId)
+        .flatMapMany(chatroom -> chatroom
+            .getMessages()
+            .map(MessageTo::from));
   }
 
-  @GetMapping("get/{chatroomId}")
-  public Chatroom get(@PathVariable UUID chatroomId)
+  @GetMapping("{chatroomId}")
+  public Mono<ChatRoomInfoTo> get(@PathVariable UUID chatroomId)
   {
-    return chatHome.getChatroom(chatroomId);
+    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,
       @PathVariable Long messageId,
       @RequestBody String text)
   {
-    Chatroom chatroom = chatHome.getChatroom(chatroomId);
+    return
+        chatHome
+            .getChatRoom(chatroomId)
+            .flatMap(chatroom -> put(chatroom, username, messageId, text));
+  }
+
+  private Mono<MessageTo> put(
+      ChatRoom chatroom,
+      String username,
+      Long messageId,
+      String text)
+  {
     return
         chatroom
             .addMessage(
                 messageId,
-                LocalDateTime.now(clock),
                 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,
@@ -67,20 +93,46 @@ public class ChatBackendController
   {
     return
         chatHome
-            .getChatroom(chatroomId)
+            .getChatRoom(chatroomId)
+            .flatMap(chatroom -> get(chatroom, username, messageId));
+  }
+
+  private Mono<MessageTo> get(
+      ChatRoom chatroom,
+      String username,
+      Long messageId)
+  {
+    return
+        chatroom
             .getMessage(username, messageId)
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping(
-      path = "listen/{chatroomId}",
-      produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-  public Flux<MessageTo> listen(@PathVariable UUID chatroomId)
+  @GetMapping(path = "{chatroomId}/listen")
+  public Flux<ServerSentEvent<MessageTo>> listen(@PathVariable UUID chatroomId)
   {
     return chatHome
-        .getChatroom(chatroomId)
+        .getChatRoom(chatroomId)
+        .flatMapMany(chatroom -> listen(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.write(chatHome.getChatRooms());
   }
 }