X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatHome.java;h=13f18b913fde4082b68823fb6d0a3d45b2e15b9d;hb=f9b0d9a71a85741983a451a51fdbd1c38632be87;hp=84b9e9460350d171037eafa02020be7c30b19512;hpb=45c723b0b0c2c6fb39d126ef2cbaf0bd9f365236;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
index 84b9e946..13f18b91 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatHome.java
@@ -1,31 +1,42 @@
 package de.juplo.kafka.chat.backend.domain;
 
-import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.*;
 
 
-@RequiredArgsConstructor
+@Slf4j
 public class ChatHome
 {
-  private final Map<UUID, Chatroom> chatrooms = new HashMap<>();
-  private final ChatroomFactory factory;
+  private final Map<UUID, ChatRoom> chatrooms;
+  private final ChatHomeService service;
 
+  public ChatHome(ChatHomeService service, Flux<ChatRoom> chatroomFlux)
+  {
+    log.debug("Creating ChatHome with factory: {}", service);
+    this.service = service;
+    this.chatrooms = new HashMap<>();
+    chatroomFlux.subscribe(chatroom -> chatrooms.put(chatroom.getId(), chatroom));
+  }
 
-  public Chatroom createChatroom(String name)
+  public Mono<ChatRoom> createChatroom(String name)
   {
-    Chatroom chatroom = factory.createChatroom(UUID.randomUUID(), name);
+    ChatRoom chatroom = service.createChatroom(UUID.randomUUID(), name);
     chatrooms.put(chatroom.getId(), chatroom);
-    return chatroom;
+    return Mono.justOrEmpty(chatroom);
   }
 
-  public Optional<Chatroom> getChatroom(UUID id)
+  public Mono<ChatRoom> getChatroom(UUID id)
   {
-    return Optional.ofNullable(chatrooms.get(id));
+    return Mono
+        .justOrEmpty(chatrooms.get(id))
+        .or(Mono.error(() -> new UnknownChatroomException(id)));
   }
 
-  public Collection<Chatroom> list()
+  public Flux<ChatRoom> list()
   {
-    return chatrooms.values();
+    return Flux.fromStream(chatrooms.values().stream());
   }
 }