From 8f611459ad590839a8be1ab5cc54063f645ebec9 Mon Sep 17 00:00:00 2001
From: mrcheater <mister.cheater@list.ru>
Date: Fri, 14 Jan 2022 13:17:39 +0300
Subject: [PATCH 1/2] Add regression test

---
 .../test/__snapshots__/read-model.test.ts.snap     |  6 +++---
 .../tools/testing-tools/test/read-model.test.ts    | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap b/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap
index 5159d0de3f..fd68e320b6 100644
--- a/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap
+++ b/packages/tools/testing-tools/test/__snapshots__/read-model.test.ts.snap
@@ -20,15 +20,15 @@ Array [
 exports[`givenEvents tests should match snapshot with specified timestamp 1`] = `
 Array [
   Object {
-    "timestamp": 11,
+    "timestamp": 10,
     "value": "test-1",
   },
   Object {
-    "timestamp": 21,
+    "timestamp": 20,
     "value": "test-2",
   },
   Object {
-    "timestamp": 31,
+    "timestamp": 30,
     "value": "test-3",
   },
 ]
diff --git a/packages/tools/testing-tools/test/read-model.test.ts b/packages/tools/testing-tools/test/read-model.test.ts
index 6e01ee134f..b70b6008f3 100644
--- a/packages/tools/testing-tools/test/read-model.test.ts
+++ b/packages/tools/testing-tools/test/read-model.test.ts
@@ -243,6 +243,20 @@ describe('givenEvents tests', () => {
       .readModel(readModel)
       .query('all', {})
 
+    expect(result?.items).toEqual([
+      {
+        value: 'test-1',
+        timestamp: 10,
+      },
+      {
+        value: 'test-2',
+        timestamp: 20,
+      },
+      {
+        value: 'test-3',
+        timestamp: 30,
+      },
+    ])
     expect(result?.items).toMatchSnapshot()
   })
 

From fd6f4e2b7f475c5aeaaaa8305f91cfb70c744c40 Mon Sep 17 00:00:00 2001
From: mrcheater <mister.cheater@list.ru>
Date: Fri, 14 Jan 2022 13:30:59 +0300
Subject: [PATCH 2/2] Fix

---
 packages/tools/testing-tools/src/runtime/get-event-store.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/tools/testing-tools/src/runtime/get-event-store.ts b/packages/tools/testing-tools/src/runtime/get-event-store.ts
index b811de7843..f5f7565930 100644
--- a/packages/tools/testing-tools/src/runtime/get-event-store.ts
+++ b/packages/tools/testing-tools/src/runtime/get-event-store.ts
@@ -70,9 +70,9 @@ export const getEventStore = async (
         const event = events[timestampIndex]
 
         event.timestamp =
-          (eventByAggregateIdVersion.get(
+          eventByAggregateIdVersion.get(
             `${event.aggregateId}:${event.aggregateVersion}`
-          )?.timestamp ?? timestampIndex) + 1
+          )?.timestamp ?? timestampIndex + 1
       }
 
       return {