X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendController.java;h=31a2035c78df0d249eb8eab33fdfe9430151dbc6;hb=2e9c772ba87cb848babce496dc3a044f8d5e9ccc;hp=4ce98b2c26fe2692bd01e583a128ec6a523baf36;hpb=96a99d5525135668b37d88f807c8c6f0a929f94f;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 4ce98b2c..31a2035c 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,17 +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.UnknownChatroomException;
 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;
@@ -22,26 +20,36 @@ 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 ChatRoomTo create(@RequestBody String name)
   {
-    return ChatroomTo.from(chatHome.createChatroom(name));
+    return ChatRoomTo.from(chatHome.createChatroom(name));
   }
 
   @GetMapping("list")
-  public Stream<ChatroomTo> list()
+  public Stream<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)
+        .map(chatroom -> chatroom
+            .getMessages()
+            .map(MessageTo::from))
+        .get();
   }
 
   @GetMapping("get/{chatroomId}")
-  public Optional<ChatroomTo> get(@PathVariable UUID chatroomId)
+  public Optional<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}")
@@ -59,7 +67,7 @@ public class ChatBackendController
   }
 
   public Mono<MessageTo> put(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId,
       String text)
@@ -68,7 +76,6 @@ public class ChatBackendController
         chatroom
             .addMessage(
                 messageId,
-                LocalDateTime.now(clock),
                 username,
                 text)
             .switchIfEmpty(chatroom.getMessage(username, messageId))
@@ -89,7 +96,7 @@ public class ChatBackendController
   }
 
   private Mono<MessageTo> get(
-      Chatroom chatroom,
+      ChatRoom chatroom,
       String username,
       Long messageId)
   {
@@ -108,7 +115,7 @@ public class ChatBackendController
         .orElseThrow(() -> new UnknownChatroomException(chatroomId));
   }
 
-  private Flux<ServerSentEvent<MessageTo>> listen(Chatroom chatroom)
+  private Flux<ServerSentEvent<MessageTo>> listen(ChatRoom chatroom)
   {
     return chatroom
         .listen()