ID Generator moved out of the unit of work

swisschain · Aug 12, 2020 · 51f2ff2 · 51f2ff2
1 parent e6dcf4a
commit 51f2ff2
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 26 deletions.
diff --git a/src/Swisschain.Extensions.Idempotency/DefaultIdGeneratorRepository.cs b/src/Swisschain.Extensions.Idempotency/DefaultIdGeneratorRepository.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Swisschain.Extensions.Idempotency
+{
+    internal sealed class DefaultIdGeneratorRepository : IIdGeneratorRepository
+    {
+        public Task<long> GetId(string idempotencyId, string generatorName)
+        {
+            throw new InvalidOperationException("ID generator repository is not configured. To use ID generator, you need to configure a persistence in service.AddIdempotency(c => {...})");
+        }
+    }
+}
diff --git a/src/Swisschain.Extensions.Idempotency/IIdGenerator.cs b/src/Swisschain.Extensions.Idempotency/IIdGenerator.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace Swisschain.Extensions.Idempotency
+{
+    public interface IIdGenerator
+    {
+        Task<long> GetId(string idempotencyId, string generatorName);
+    }
+}
diff --git a/src/Swisschain.Extensions.Idempotency/IIdGeneratorRepository.cs b/src/Swisschain.Extensions.Idempotency/IIdGeneratorRepository.cs
@@ -3,7 +3,7 @@
 namespace Swisschain.Extensions.Idempotency
 {
     /// <summary>
-    /// Should work in the context of the <see cref="IUnitOfWork"/> transaction
+    /// Should work not in the context of the <see cref="IUnitOfWork"/> transaction
     /// </summary>
     public interface IIdGeneratorRepository
     {

diff --git a/src/Swisschain.Extensions.Idempotency/IUnitOfWork.cs b/src/Swisschain.Extensions.Idempotency/IUnitOfWork.cs
@@ -5,7 +5,6 @@ namespace Swisschain.Extensions.Idempotency
 {
     public interface IUnitOfWork : IAsyncDisposable
     {
-        IIdGeneratorRepository IdGeneratorRepository { get; }
         IOutboxWriteRepository OutboxWriteRepository { get; }
         string IdempotencyId { get; }
         bool IsCommitted { get; }
@@ -27,18 +26,6 @@ Task Init(IIdGeneratorRepository idGeneratorRepository,
         /// </summary>
         Task Rollback();
 
-        /// <summary>
-        /// Generates or returns existing unique ID for the given <see cref="IdempotencyId"/> using
-        /// <see cref="IdGeneratorRepository"/> and specified <paramref name="generatorName"/>
-        /// </summary>
-        Task<long> GenerateId(string generatorName);
-
-        /// <summary>
-        /// Generates or returns existing unique ID for the specified <paramref name="idempotencyId"/> using
-        /// <see cref="IdGeneratorRepository"/> and specified <paramref name="generatorName"/>
-        /// </summary>
-        Task<long> GenerateId(string idempotencyId, string generatorName);
-
         /// <summary>
         /// Dispatches <see cref="Outbox"/> using default <see cref="IOutboxDispatcher"/>.
         /// It's recommended to use more specific dispatcher if possible.

diff --git a/src/Swisschain.Extensions.Idempotency/IdGenerator.cs b/src/Swisschain.Extensions.Idempotency/IdGenerator.cs
@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+
+namespace Swisschain.Extensions.Idempotency
+{
+    internal sealed class IdGenerator : IIdGenerator
+    {
+        readonly IIdGeneratorRepository _idGeneratorRepository;
+
+        public IdGenerator(IIdGeneratorRepository idGeneratorRepository)
+        {
+            _idGeneratorRepository = idGeneratorRepository;
+        }
+
+        public Task<long> GetId(string idempotencyId, string generatorName)
+        {
+            return _idGeneratorRepository.GetId(idempotencyId, generatorName);
+        }
+    }
+}
diff --git a/src/Swisschain.Extensions.Idempotency/IdempotencyServiceCollectionExtensions.cs b/src/Swisschain.Extensions.Idempotency/IdempotencyServiceCollectionExtensions.cs
@@ -11,9 +11,11 @@ public static class IdempotencyServiceCollectionExtensions
         public static IServiceCollection AddIdempotency(this IServiceCollection services, Action<IdempotencyConfigurationBuilder> config)
         {
             services.AddTransient<IOutboxManager, OutboxManager>();
+            services.AddTransient<IIdGenerator, IdGenerator>();
 
             services.AddTransient<IOutboxDispatcher, DefaultOutboxDispatcher>();
             services.AddTransient<IOutboxReadRepository, DefaultOutboxReadRepository>();
+            services.AddTransient<IIdGeneratorRepository, DefaultIdGeneratorRepository>();
 
             if (config != null)
             {

diff --git a/src/Swisschain.Extensions.Idempotency/UnitOfWorkBase.cs b/src/Swisschain.Extensions.Idempotency/UnitOfWorkBase.cs
@@ -12,7 +12,6 @@ public UnitOfWorkBase(IOutboxDispatcher defaultOutboxDispatcher)
             _defaultOutboxDispatcher = defaultOutboxDispatcher;
         }
 
-        public IIdGeneratorRepository IdGeneratorRepository { get; private set; }
         public IOutboxWriteRepository OutboxWriteRepository { get; private set; }
         public string IdempotencyId { get; private set; }
         public bool IsCommitted { get; private set; }
@@ -29,7 +28,6 @@ public Task Init(IIdGeneratorRepository idGeneratorRepository,
             Outbox outbox)
         {
             OutboxWriteRepository = outboxWriteRepository;
-            IdGeneratorRepository = idGeneratorRepository;
             IdempotencyId = idempotencyId;
             Outbox = outbox;
 
@@ -73,16 +71,6 @@ public async Task Rollback()
             IsRolledBack = true;
         }
 
-        public Task<long> GenerateId(string generatorName)
-        {
-            return IdGeneratorRepository.GetId(IdempotencyId, generatorName);
-        }
-
-        public Task<long> GenerateId(string idempotencyId, string generatorName)
-        {
-            return IdGeneratorRepository.GetId(idempotencyId, generatorName);
-        }
-
         public Task EnsureOutboxDispatched()
         {
             return EnsureOutboxDispatched(_defaultOutboxDispatcher);