Ensuring tha the event storage is created before doing FetchStreamSta…

…te(). Closes GH-3208
JasperFx · May 16, 2024 · 81f74c7 · 81f74c7
1 parent d1ef0fd
commit 81f74c7
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Marten/Events/QueryEventStore.cs b/src/Marten/Events/QueryEventStore.cs
@@ -249,26 +249,30 @@ public IMartenQueryable<IEvent> QueryAllRawEvents()
 
     public StreamState? FetchStreamState(Guid streamId)
     {
+        _tenant.Database.EnsureStorageExists(typeof(IEvent));
         var handler = eventStorage().QueryForStream(StreamAction.ForReference(streamId, _tenant.TenantId));
         return _session.ExecuteHandler(handler);
     }
 
-    public Task<StreamState?> FetchStreamStateAsync(Guid streamId, CancellationToken token = default)
+    public async Task<StreamState?> FetchStreamStateAsync(Guid streamId, CancellationToken token = default)
     {
+        await _tenant.Database.EnsureStorageExistsAsync(typeof(StreamAction), token).ConfigureAwait(false);
         var handler = eventStorage().QueryForStream(StreamAction.ForReference(streamId, _tenant.TenantId));
-        return _session.ExecuteHandlerAsync(handler, token);
+        return await _session.ExecuteHandlerAsync(handler, token).ConfigureAwait(false);
     }
 
     public StreamState? FetchStreamState(string streamKey)
     {
+        _tenant.Database.EnsureStorageExists(typeof(IEvent));
         var handler = eventStorage().QueryForStream(StreamAction.ForReference(streamKey, _tenant.TenantId));
         return _session.ExecuteHandler(handler);
     }
 
-    public Task<StreamState?> FetchStreamStateAsync(string streamKey, CancellationToken token = default)
+    public async Task<StreamState?> FetchStreamStateAsync(string streamKey, CancellationToken token = default)
     {
+        await _tenant.Database.EnsureStorageExistsAsync(typeof(StreamAction), token).ConfigureAwait(false);
         var handler = eventStorage().QueryForStream(StreamAction.ForReference(streamKey, _tenant.TenantId));
-        return _session.ExecuteHandlerAsync(handler, token);
+        return await _session.ExecuteHandlerAsync(handler, token).ConfigureAwait(false);
     }
 
     private IEventStorage eventStorage()