VCST-2432: Add global tenant ID option for sequence number generation (…

…#234) feat: Introduced a new `UseGlobalTenantId` property in the `SequenceNumberGeneratorOptions` class to support a global counter across all tenants/stores. By default, false. Set VirtoCommerce:SequenceNumberGenerator:UseGlobalTenantId to true, to enable it. (#234)
VirtoCommerce · Dec 12, 2024 · 8f6e993 · 8f6e993
1 parent 585eab1
commit 8f6e993
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/VirtoCommerce.CoreModule.Core/Common/SequenceNumberGeneratorOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/SequenceNumberGeneratorOptions.cs
@@ -10,5 +10,11 @@ public class SequenceNumberGeneratorOptions
         /// Defines the delay between retries in seconds.
         /// </summary>
         public int RetryDelay { get; set; } = 5;
+
+        /// <summary>
+        /// Defines usage of the static tenant id instead of store id for generating unique number.
+        /// Can be useful when you want to have golobal counter for all stores/tenants.
+        /// </summary>
+        public bool UseGlobalTenantId { get; set; } = false;
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs
@@ -141,7 +141,7 @@ protected virtual RetryPolicy ConfigureRetryPolicy()
         /// <returns></returns>
         protected virtual int RequestNextCounter(string tenantId, CounterOptions counterOptions)
         {
-            var sequenceKey = string.IsNullOrEmpty(tenantId) ? counterOptions.NumberTemplate : $"{tenantId}/{counterOptions.NumberTemplate}";
+            var sequenceKey = GetSequenceKey(tenantId, counterOptions);
 
             using var repository = _repositoryFactory();
             var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == sequenceKey);
@@ -177,6 +177,16 @@ protected virtual int RequestNextCounter(string tenantId, CounterOptions counter
             return sequence.Value;
         }
 
+        protected virtual string GetSequenceKey(string tenantId, CounterOptions counterOptions)
+        {
+            if(_options.UseGlobalTenantId || string.IsNullOrEmpty(tenantId))
+            {
+                return counterOptions.NumberTemplate;
+            }
+
+            return $"{tenantId}/{counterOptions.NumberTemplate}";
+        }
+
         /// <summary>
         /// Returns true if counter should be reset.
         /// </summary>
@@ -193,7 +203,7 @@ protected virtual bool ShouldResetCounter(DateTime lastResetDate, ResetCounterTy
                     return currentUtcDate.Date > lastResetDate.Date;
                 case ResetCounterType.Weekly:
                     // Reset every Monday
-                    int daysUntilTargetDay = ((int)DayOfWeek.Monday - (int)lastResetDate.DayOfWeek + 7) % 7;
+                    var daysUntilTargetDay = ((int)DayOfWeek.Monday - (int)lastResetDate.DayOfWeek + 7) % 7;
                     var nextMondayDate = lastResetDate.Date.AddDays(daysUntilTargetDay);
                     return currentUtcDate >= nextMondayDate;
                 case ResetCounterType.Monthly: