X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2Fkafka%2FKafkaChatRoomService.java;h=4e7eb369b9d8be01a10d96ab97865949e97ebb25;hb=b4bdcb0fca725eeb32b0215240aa9db18809f7d6;hp=981c11f527afad087386ab54f58bfedbfa819952;hpb=ba3aba8860f41fcc54970d5e234fee0576768c98;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
index 981c11f5..4e7eb369 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/persistence/kafka/KafkaChatRoomService.java
@@ -3,50 +3,87 @@ package de.juplo.kafka.chat.backend.persistence.kafka;
 import de.juplo.kafka.chat.backend.domain.ChatRoomService;
 import de.juplo.kafka.chat.backend.domain.Message;
 import de.juplo.kafka.chat.backend.domain.MessageMutationException;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.TopicPartition;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.LinkedHashMap;
+import java.util.UUID;
 
 
 @Slf4j
-@RequiredArgsConstructor
 public class KafkaChatRoomService implements ChatRoomService
 {
   private final Producer<String, MessageTo> producer;
   private final TopicPartition tp;
+  private final UUID chatRoomId;
+  private final ZoneOffset zoneOffset;
 
   private final LinkedHashMap<Message.MessageKey, Message> messages = new LinkedHashMap<>();
 
-  private long offset = 0l;
+  private MessageHandlingStrategy strategy;
+
+
+  public KafkaChatRoomService(
+      Producer<String, MessageTo> producer,
+      TopicPartition tp,
+      UUID chatRoomId,
+      ZoneOffset zoneOffset)
+  {
+    this.producer = producer;
+    this.tp = tp;
+    this.chatRoomId = chatRoomId;
+    this.zoneOffset = zoneOffset;
+    this.strategy = new ChatroomInactiveMessageHandlingStrategy(tp);
+  }
 
 
   @Override
-  public Message persistMessage(
+  public Mono<Message> persistMessage(
     Message.MessageKey key,
     LocalDateTime timestamp,
     String text)
   {
-    
-    Mono.error(() -> new MessageMutationException(existing, text)));
-    Message message = new Message(key, (long)messages.size(), timestamp, text);
-    messages.put(message.getKey(), message);
-    return message;
+    return strategy.persistMessage(key, timestamp, text);
+  }
+
+  synchronized protected void addMessage(Message message) throws MessageMutationException
+  {
+    Message existingMessage = messages.get(message.getKey());
+
+    if (existingMessage == null)
+    {
+      messages.put(existingMessage.getKey(), existingMessage);
+    }
+    else
+    {
+      if (!existingMessage.getMessageText().equals(message.getMessageText()))
+      {
+        throw new MessageMutationException(existingMessage, message.getMessageText());
+      }
+
+      // Warn and emit existing message
+      log.warn(
+          "Keeping existing message with {}@{} for {}",
+          existingMessage.getSerialNumber(),
+          existingMessage.getTimestamp(),
+          existingMessage.getKey());
+    }
   }
 
   @Override
-  public Mono<Message> getMessage(Message.MessageKey key)
+  synchronized public Mono<Message> getMessage(Message.MessageKey key)
   {
     return Mono.fromSupplier(() -> messages.get(key));
   }
 
   @Override
-  public Flux<Message> getMessages(long first, long last)
+  synchronized public Flux<Message> getMessages(long first, long last)
   {
     return Flux.fromStream(messages
       .values()