From 1ddf2203ad446b6f5661f2ecef17521429b69278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Del=C3=A8gue?= <adelegue@hotmail.com>
Date: Wed, 17 Jul 2024 19:11:28 +0200
Subject: [PATCH] bug

---
 .../src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java b/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java
index 8baef21b..9b42de6d 100644
--- a/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java
+++ b/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java
@@ -88,7 +88,7 @@ public CompletionStage<InTransactionResult<List<Either<Error, ProcessingSuccess<
                                             .flatMap(Either::swap)
                                             .map(Either::left);
 
-                                    Map<String, C> commandsById = commandsAndResults.flatMap(t -> t._3.map(any -> t._1)).groupBy(c -> c.entityId().get()).mapValues(List::head);
+                                    Map<String, C> commandsById = HashMap.ofEntries(commandsAndResults.flatMap(t -> t._3.toList().flatMap(any -> any.events.map(e -> e.entityId()).distinct().map(id -> Tuple.of(id, t._1))));
                                     Map<String, Message> messageById = HashMap.ofEntries(commandsAndResults.flatMap(t -> t._3.map(any -> Tuple(t._1.entityId().get(), any.message))));
                                     Map<String, Option<S>> statesById = HashMap.ofEntries(commandsAndResults.flatMap(t -> t._3.map(any -> Tuple(t._1.entityId().get(), t._2))));
                                     List<E> allEvents = commandsAndResults.flatMap(t -> t._3.map(ev -> ev.events)).flatMap(identity());