WIP

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / api / ChatBackendController.java

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 3b8fc84..339451a 100644 (file)
--- 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,6 +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.ChatRoomFactory;
 import de.juplo.kafka.chat.backend.persistence.StorageStrategy;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.codec.ServerSentEvent;
@@ -17,22 +18,28 @@ import java.util.UUID;
 public class ChatBackendController
 {
   private final ChatHome chatHome;
+  private final ChatRoomFactory factory;
   private final StorageStrategy storageStrategy;
 
 
   @PostMapping("create")
-  public Mono<ChatRoomTo> create(@RequestBody String name)
+  public Mono<ChatRoomInfoTo> create(@RequestBody String name)
   {
-    return chatHome.createChatroom(name).map(ChatRoomTo::from);
+    UUID chatRoomId = UUID.randomUUID();
+    return factory
+        .createChatRoom(chatRoomId, name)
+        .map(ChatRoomInfoTo::from);
   }
 
   @GetMapping("list")
-  public Flux<ChatRoomTo> list()
+  public Flux<ChatRoomInfoTo> list()
   {
-    return chatHome.getChatRooms().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
@@ -42,13 +49,15 @@ public class ChatBackendController
             .map(MessageTo::from));
   }
 
-  @GetMapping("get/{chatroomId}")
-  public Mono<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,7 +70,7 @@ public class ChatBackendController
             .flatMap(chatroom -> put(chatroom, username, messageId, text));
   }
 
-  public Mono<MessageTo> put(
+  private Mono<MessageTo> put(
       ChatRoom chatroom,
       String username,
       Long messageId,
@@ -76,7 +85,7 @@ public class ChatBackendController
             .map(message -> MessageTo.from(message));
   }
 
-  @GetMapping("get/{chatroomId}/{username}/{messageId}")
+  @GetMapping("{chatroomId}/{username}/{messageId}")
   public Mono<MessageTo> get(
       @PathVariable UUID chatroomId,
       @PathVariable String username,
@@ -99,7 +108,7 @@ 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