test: `LocalJsonFilesStorageStrategyIT` asserts, that the state is restored

[demos/kafka/chat] / src / main / java / de / juplo / kafka / chat / backend / domain / ChatRoom.java

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
index bed91c7..22eebff 100644 (file)
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/ChatRoom.java
@@ -1,35 +1,43 @@
 package de.juplo.kafka.chat.backend.domain;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.Sinks;
 
+import java.time.Clock;
 import java.time.LocalDateTime;
 import java.util.*;
 
 
 @Slf4j
+@EqualsAndHashCode(of = { "id" })
+@ToString(of = { "id", "name" })
 public class ChatRoom
 {
   @Getter
   private final UUID id;
   @Getter
   private final String name;
-  private final ChatroomService chatroomService;
+  private final Clock clock;
+  private final ChatRoomService service;
   private final int bufferSize;
   private Sinks.Many<Message> sink;
 
   public ChatRoom(
       UUID id,
       String name,
-      ChatroomService chatroomService,
+      Clock clock,
+      ChatRoomService service,
       int bufferSize)
   {
     this.id = id;
     this.name = name;
-    this.chatroomService = chatroomService;
+    this.clock = clock;
+    this.service = service;
     this.bufferSize = bufferSize;
     this.sink = createSink();
   }
@@ -37,12 +45,11 @@ public class ChatRoom
 
   synchronized public Mono<Message> addMessage(
       Long id,
-      LocalDateTime timestamp,
       String user,
       String text)
   {
-    return chatroomService
-        .persistMessage(Message.MessageKey.of(user, id), timestamp, text)
+    return service
+        .persistMessage(Message.MessageKey.of(user, id), LocalDateTime.now(clock), text)
         .doOnNext(message ->
         {
           Sinks.EmitResult result = sink.tryEmitNext(message);
@@ -57,7 +64,7 @@ public class ChatRoom
   public Mono<Message> getMessage(String username, Long messageId)
   {
     Message.MessageKey key = Message.MessageKey.of(username, messageId);
-    return chatroomService.getMessage(key);
+    return service.getMessage(key);
   }
 
   synchronized public Flux<Message> listen()
@@ -74,7 +81,7 @@ public class ChatRoom
 
   public Flux<Message> getMessages(long first, long last)
   {
-    return chatroomService.getMessages(first, last);
+    return service.getMessages(first, last);
   }
 
   private Sinks.Many<Message> createSink()