Added IStore and IStoreRepository to store generic objects (#64)

Co-authored-by: Dmitriy Melnychenko <dmitriy.melnichenko@techfabric.com>
Tech-Fabric · Aug 17, 2023 · 8283cce · 8283cce
1 parent 2ecc755
commit 8283cce
Show file tree

Hide file tree

Showing 27 changed files with 510 additions and 310 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
     branches: [ "main" ]
 
 env:
-  PACKAGE_VERSION: 0.1.4
+  PACKAGE_VERSION: 0.1.5
 
 jobs:
 

diff --git a/...spNet/CloudFabric.EventSourcing.AspNet.CosmosDb/Extensions/ServiceCollectionExtensions.cs b/...spNet/CloudFabric.EventSourcing.AspNet.CosmosDb/Extensions/ServiceCollectionExtensions.cs
@@ -29,7 +29,7 @@ string processorName
                 
                 var cosmosClient = new CosmosClient(connectionString, cosmosClientOptions);
 
-                var eventStore = new CosmosDbEventStore(cosmosClient, databaseId, eventsContainerId, itemsContainerId);
+                var eventStore = new CosmosDbEventStore(cosmosClient, databaseId, eventsContainerId);
                 eventStore.Initialize().Wait();
 
                 var eventStoreObserver = new CosmosDbEventStoreChangeFeedObserver(
@@ -45,6 +45,11 @@ string processorName
 
                 return new AggregateRepositoryFactory(eventStore);
             });
+
+            var storeRepository = new StoreRepository(
+                new CosmosDbStore(connectionString, cosmosClientOptions, databaseId, itemsContainerId)
+            );
+            services.AddScoped<IStoreRepository>(sp => storeRepository);
 
             return new EventSourcingBuilder
             {
@@ -56,11 +61,10 @@ public static IEventSourcingBuilder AddCosmosDbEventStore(
             this IServiceCollection services,
             CosmosClient client,
             string databaseId,
-            string eventsContainerId,
-            string itemsContainerId
+            string eventsContainerId
         )
         {
-            var eventStore = new CosmosDbEventStore(client, databaseId, eventsContainerId, itemsContainerId);
+            var eventStore = new CosmosDbEventStore(client, databaseId, eventsContainerId);
             eventStore.Initialize().Wait();
 
             return new EventSourcingBuilder

diff --git a/...spNet/CloudFabric.EventSourcing.AspNet.InMemory/Extensions/ServiceCollectionExtensions.cs b/...spNet/CloudFabric.EventSourcing.AspNet.InMemory/Extensions/ServiceCollectionExtensions.cs
@@ -26,7 +26,7 @@ public static IEventSourcingBuilder AddInMemoryEventStore(
             services.AddScoped<IEventStore>(
                 (sp) =>
                 {
-                    var eventStore = new InMemoryEventStore(eventsContainer, itemsContainer);
+                    var eventStore = new InMemoryEventStore(eventsContainer);
                     eventStore.Initialize().Wait();
 
                     // add events observer for projections
@@ -58,6 +58,8 @@ public static IEventSourcingBuilder AddInMemoryEventStore(
                 }
             );
 
+            services.AddScoped<IStoreRepository>(sp => new StoreRepository(new InMemoryStore(itemsContainer)));
+
             return builder;
         }
 

diff --git a/...Net/CloudFabric.EventSourcing.AspNet.Postgresql/Extensions/ServiceCollectionExtensions.cs b/...Net/CloudFabric.EventSourcing.AspNet.Postgresql/Extensions/ServiceCollectionExtensions.cs
@@ -15,6 +15,7 @@ class PostgresqlEventSourcingScope
         public IEventStore EventStore { get; set; }
         public EventsObserver EventsObserver { get; set; }
         public ProjectionsEngine? ProjectionsEngine { get; set; }
+        public IStoreRepository StoreRepository { get; set; }
     }
 
     public static class ServiceCollectionExtensions
@@ -83,6 +84,8 @@ Func<IServiceProvider, IPostgresqlEventStoreConnectionInformationProvider> conne
                         scope.ProjectionsEngine.StartAsync(connectionInformationProvider.GetConnectionInformation().ConnectionId).GetAwaiter().GetResult();
                     }
 
+                    scope.StoreRepository = new StoreRepository(new PostgresqlStore(connectionInformationProvider));
+
                     return scope;
                 }
             );
@@ -105,6 +108,15 @@ Func<IServiceProvider, IPostgresqlEventStoreConnectionInformationProvider> conne
                 }
             );
 
+            services.AddScoped<IStoreRepository>(
+                (sp) =>
+                {
+                    var eventSourcingScope = sp.GetRequiredService<PostgresqlEventSourcingScope>();
+
+                    return eventSourcingScope.StoreRepository;
+                }
+            );
+
             return builder;
         }
 
@@ -120,7 +132,7 @@ string eventsTableName
             return services.AddPostgresqlEventStore(
                 eventsConnectionString,
                 eventsTableName,
-                string.Concat(eventsTableName, ItemsEventStoreNameSuffix.TableNameSuffix)
+                ItemsStoreNameDefaults.AddDefaultTableNameSuffix(eventsTableName)
             );
         }
 

diff --git a/CloudFabric.EventSourcing.AspNet/CloudFabric.EventSourcing.AspNet/IEventSourcingBuilder.cs b/CloudFabric.EventSourcing.AspNet/CloudFabric.EventSourcing.AspNet/IEventSourcingBuilder.cs
@@ -8,7 +8,7 @@ namespace CloudFabric.EventSourcing.AspNet;
 public interface IEventSourcingBuilder
 {
     IEventStore EventStore { get; set; }
-    
+
     public AggregateRepositoryFactory AggregateRepositoryFactory { get; set; }
 
     IServiceCollection Services { get; set; }

diff --git a/CloudFabric.EventSourcing.Domain/IStoreRepository.cs b/CloudFabric.EventSourcing.Domain/IStoreRepository.cs
@@ -0,0 +1,12 @@
+namespace CloudFabric.EventSourcing.Domain;
+
+/// <summary>
+/// Repository that provides possibility of storing typed objects,
+/// due to requirements to save non 'evented' aggregates items outside of EventStore.
+/// </summary>
+public interface IStoreRepository
+{
+    Task UpsertItem<T>(string id, string partitionKey, T item, CancellationToken cancellationToken = default);
+
+    Task<T?> LoadItem<T>(string id, string partitionKey, CancellationToken cancellationToken = default);
+}
diff --git a/CloudFabric.EventSourcing.Domain/StoreRepository.cs b/CloudFabric.EventSourcing.Domain/StoreRepository.cs
@@ -0,0 +1,33 @@
+using CloudFabric.EventSourcing.EventStore;
+
+namespace CloudFabric.EventSourcing.Domain;
+
+public class StoreRepository : IStoreRepository
+{
+    private readonly IStore _store;
+
+    public StoreRepository(IStore store) 
+    {
+        _store = store;
+    }
+
+    public async Task UpsertItem<TItem>(string id, string partitionKey, TItem item, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(id))
+        {
+            throw new ArgumentNullException(nameof(id));
+        }
+
+        await _store.UpsertItem(id, partitionKey, item, cancellationToken);
+    }
+
+    public async Task<TItem?> LoadItem<TItem>(string id, string partitionKey, CancellationToken cancellationToken = default)
+    {
+        if (string.IsNullOrEmpty(id))
+        {
+            throw new ArgumentNullException(nameof(id));
+        }
+
+        return await _store.LoadItem<TItem?>(id, partitionKey, cancellationToken);
+    }
+}
diff --git a/CloudFabric.EventSourcing.EventStore/Enums/ItemsEventStoreNameSuffix.cs b/CloudFabric.EventSourcing.EventStore/Enums/ItemsEventStoreNameSuffix.cs
diff --git a/CloudFabric.EventSourcing.EventStore/Enums/ItemsStoreNameDefaults.cs b/CloudFabric.EventSourcing.EventStore/Enums/ItemsStoreNameDefaults.cs
@@ -0,0 +1,9 @@
+namespace CloudFabric.EventSourcing.EventStore.Enums;
+
+public static class ItemsStoreNameDefaults
+{
+    public const string TableNameSuffix = "-item";
+
+    public static string AddDefaultTableNameSuffix(string tableName) 
+        => string.Concat(tableName, TableNameSuffix);
+}
diff --git a/CloudFabric.EventSourcing.EventStore/IEventStore.cs b/CloudFabric.EventSourcing.EventStore/IEventStore.cs
@@ -32,8 +32,4 @@ Task<bool> AppendToStreamAsync(
     Task DeleteAll(CancellationToken cancellationToken = default);
 
     Task<bool> HardDeleteAsync(Guid streamId, string partitionKey, CancellationToken cancellationToken = default);
-
-    Task UpsertItem<T>(string id, string partitionKey, T item, CancellationToken cancellationToken = default);
-
-    Task<T?> LoadItem<T>(string id, string partitionKey, CancellationToken cancellationToken = default);
 }
diff --git a/CloudFabric.EventSourcing.EventStore/IStore.cs b/CloudFabric.EventSourcing.EventStore/IStore.cs
@@ -0,0 +1,12 @@
+namespace CloudFabric.EventSourcing.EventStore;
+
+public interface IStore
+{
+    Task Initialize(CancellationToken cancellationToken = default);
+
+    Task DeleteAll(CancellationToken cancellationToken = default);
+
+    Task UpsertItem<T>(string id, string partitionKey, T item, CancellationToken cancellationToken = default);
+
+    Task<T?> LoadItem<T>(string id, string partitionKey, CancellationToken cancellationToken = default);
+}
diff --git a/CloudFabric.EventSourcing.Tests/ItemTests.cs b/CloudFabric.EventSourcing.Tests/ItemTests.cs
@@ -6,19 +6,19 @@
 namespace CloudFabric.EventSourcing.Tests;
 public abstract class ItemTests
 {
-    protected abstract Task<IEventStore> GetEventStore();
-    private IEventStore _eventStore;
+    protected abstract Task<IStore> GetStore();
+    private IStore _store;
 
     [TestInitialize]
     public async Task Initialize()
     {
-        _eventStore = await GetEventStore();
+        _store = await GetStore();
     }
 
     [TestCleanup]
     public async Task Cleanup()
     {
-        await _eventStore.DeleteAll();
+        await _store.DeleteAll();
     }
 
     [TestMethod]
@@ -35,7 +35,7 @@ public async Task SaveItem()
             }
         };
 
-        Func<Task> action = async () => await _eventStore.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
+        Func<Task> action = async () => await _store.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
         await action.Should().NotThrowAsync();
     }
 
@@ -52,9 +52,9 @@ public async Task LoadItem()
             }
         };
 
-        await _eventStore.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
+        await _store.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
 
-        var loadedItem = await _eventStore.LoadItem<TestItem>($"{item.Id}{item.Name}", $"{item.Id}{item.Name}");
+        var loadedItem = await _store.LoadItem<TestItem>($"{item.Id}{item.Name}", $"{item.Id}{item.Name}");
 
         loadedItem.Id.Should().Be(item.Id);
         loadedItem.Name.Should().Be(item.Name);
@@ -65,7 +65,7 @@ public async Task LoadItem()
     [TestMethod]
     public async Task LoadItem_NullIfNotFound()
     {
-        var loadedItem = await _eventStore.LoadItem<TestItem>($"{Guid.NewGuid()}", $"{Guid.NewGuid()}");
+        var loadedItem = await _store.LoadItem<TestItem>($"{Guid.NewGuid()}", $"{Guid.NewGuid()}");
 
         loadedItem.Should().BeNull();
     }
@@ -84,7 +84,7 @@ public async Task UpdateItem()
             }
         };
 
-        await _eventStore.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
+        await _store.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
 
         string propertyGuid = Guid.NewGuid().ToString();
 
@@ -93,10 +93,10 @@ public async Task UpdateItem()
             { propertyGuid, new TestNestedItemClass() }
         };
 
-        Func<Task> action = async () => await _eventStore.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
+        Func<Task> action = async () => await _store.UpsertItem($"{item.Id}{item.Name}", $"{item.Id}{item.Name}", item);
         await action.Should().NotThrowAsync();
 
-        var updatedItem = await _eventStore.LoadItem<TestItem>($"{item.Id}{item.Name}", $"{item.Id}{item.Name}");
+        var updatedItem = await _store.LoadItem<TestItem>($"{item.Id}{item.Name}", $"{item.Id}{item.Name}");
         updatedItem.Properties.ContainsKey(propertyGuid).Should().BeTrue();
     }
 }