From fd11c0c489783bcb51ce04c4326c27d68d593c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Thu, 19 Oct 2023 13:55:27 +0200 Subject: [PATCH] fix: Mark snapshot envelopes with snapshot source --- .../persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala | 3 ++- .../query/EventsByPersistenceIdStartingFromSnapshotSpec.scala | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/akka/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala b/core/src/main/scala/akka/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala index 336746b3..a7c4cddf 100644 --- a/core/src/main/scala/akka/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala +++ b/core/src/main/scala/akka/persistence/r2dbc/query/scaladsl/R2dbcReadJournal.scala @@ -162,7 +162,8 @@ final class R2dbcReadJournal(system: ExtendedActorSystem, config: Config, cfgPat row.entityType, row.slice, filtered = false, - source = "", + // FIXME move constant to Akka/EnvelopeOrigin + source = "SN", tags = row.tags) } diff --git a/core/src/test/scala/akka/persistence/r2dbc/query/EventsByPersistenceIdStartingFromSnapshotSpec.scala b/core/src/test/scala/akka/persistence/r2dbc/query/EventsByPersistenceIdStartingFromSnapshotSpec.scala index 30751e3a..c125492b 100644 --- a/core/src/test/scala/akka/persistence/r2dbc/query/EventsByPersistenceIdStartingFromSnapshotSpec.scala +++ b/core/src/test/scala/akka/persistence/r2dbc/query/EventsByPersistenceIdStartingFromSnapshotSpec.scala @@ -124,7 +124,9 @@ class EventsByPersistenceIdStartingFromSnapshotSpec .runWith(sinkProbe) .request(21) - result.expectNext().event shouldBe expectedSnapshotEvent(17) + val evt17 = result.expectNext() + evt17.event shouldBe expectedSnapshotEvent(17) + evt17.source should ===("SN") for (i <- 18 to 20) { result.expectNext().event shouldBe s"e-$i" }