From 9a6ecd9b5d527ca9f6f9facfe397beb8dab6359a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Del=C3=A8gue?= <adelegue@hotmail.com>
Date: Wed, 17 Jul 2024 20:40:30 +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 c4ad2067..896400be 100644
--- a/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java
+++ b/thoth-core/src/main/java/fr/maif/eventsourcing/EventProcessorImpl.java
@@ -99,7 +99,7 @@ public CompletionStage<InTransactionResult<List<Either<Error, ProcessingSuccess<
                                                             buildEnvelopes(ctx, commandsById, sequences, allEvents)
                                                     )
                                                     .thenApply(allEnvelopes -> {
-                                                        Map<String, List<EventEnvelope<E, Meta, Context>>> indexed = allEnvelopes.groupBy(env -> env.entityId);
+                                                        Map<String, List<EventEnvelope<E, Meta, Context>>> indexed = allEnvelopes.groupBy(env -> commandsById.get(env.entityId).get().entityId().get());
                                                         return indexed.map(t -> {
                                                             String entityId = t._1;
                                                             List<EventEnvelope<E, Meta, Context>> eventEnvelopes = t._2;