X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatRoom.java;h=1c21fb979a1f2f4c5a061b2c1243d39f24d4cb5c;hb=6eb03cbe4609eea0b7061b574a7e273ecd0c9813;hp=bed91c76c3daf1960901cc05ddc7015b3498cf64;hpb=a35ac0e02622cb5638380612064467c2309ebee5;p=demos%2Fkafka%2Fchat

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 bed91c76..1c21fb97 100644
--- 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,63 +1,88 @@
 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.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 @Slf4j
+@EqualsAndHashCode(of = { "id" })
+@ToString(of = { "id", "name" })
 public class ChatRoom
 {
+  public final static Pattern VALID_USER = Pattern.compile("^[a-z0-9-]{2,}$");
   @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;
+    // @RequiredArgsConstructor unfortunately not possible, because
+    // the `bufferSize` is not set, if `createSink()` is called
+    // from the variable declaration!
     this.sink = createSink();
   }
 
 
   synchronized public Mono<Message> addMessage(
       Long id,
-      LocalDateTime timestamp,
       String user,
       String text)
   {
-    return chatroomService
-        .persistMessage(Message.MessageKey.of(user, id), timestamp, text)
-        .doOnNext(message ->
-        {
-          Sinks.EmitResult result = sink.tryEmitNext(message);
-          if (result.isFailure())
-          {
-            log.warn("Emitting of message failed with {} for {}", result.name(), message);
-          }
-        });
+    Matcher matcher = VALID_USER.matcher(user);
+    if (!matcher.matches())
+      throw new InvalidUsernameException(user);
+
+    Message.MessageKey key = Message.MessageKey.of(user, id);
+    return service
+        .getMessage(key)
+        .flatMap(existing -> text.equals(existing.getMessageText())
+            ? Mono.just(existing)
+            : Mono.error(() -> new MessageMutationException(existing, text)))
+        .switchIfEmpty(
+            Mono
+                .fromSupplier(() ->service.persistMessage(key, LocalDateTime.now(clock), text))
+                .doOnNext(m ->
+                {
+                  Sinks.EmitResult result = sink.tryEmitNext(m);
+                  if (result.isFailure())
+                  {
+                    log.warn("Emitting of message failed with {} for {}", result.name(), m);
+                  }
+                }));
   }
 
 
   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 +99,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()