From cd5008df0c0973451a99c7ee2667921d1c5edaf6 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 13:02:25 +0200
Subject: [PATCH 01/11] VCST-122: Refactored Unique Number Generator

feat: Refactored Unique Number Generator
---
 .../Readme.md                                 |  29 ++--
 .../SequenceEntityConfiguration.cs            |  24 +++
 .../Model/SequenceEntity.cs                   |   2 +
 .../Repositories/CoreDbContext.cs             |   2 -
 .../SequenceUniqueNumberGeneratorService.cs   | 153 +++---------------
 5 files changed, 58 insertions(+), 152 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Data.PostgreSql/SequenceEntityConfiguration.cs

diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Readme.md b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Readme.md
index 25bfbdfd3..437dc81f9 100644
--- a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Readme.md
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Readme.md
@@ -1,24 +1,19 @@
+# Generate Migrations
 
-## Package manager 
-Add-Migration Initial -Context VirtoCommerce.CoreModule.Data.Repositories.CoreDbContext  -Verbose -OutputDir Migrations -Project VirtoCommerce.CoreModule.Data.PostgreSql -StartupProject VirtoCommerce.CoreModule.Data.PostgreSql  -Debug
-
-
-
-### Entity Framework Core Commands
-```
-dotnet tool install --global dotnet-ef --version 6.*
+## Install CLI tools for Entity Framework Core
+```cmd
+dotnet tool install --global dotnet-ef --version 8.0.0
 ```
 
-**Generate Migrations**
+or update
 
+```cmd
+dotnet tool update --global dotnet-ef --version 8.0.0
 ```
-dotnet ef migrations add Initial -- "{connection string}"
-dotnet ef migrations add Update1 -- "{connection string}"
-dotnet ef migrations add Update2 -- "{connection string}"
-```
-
-etc..
 
-**Apply Migrations**
+## Add Migration
+Select Data.<Provider> folder and run following command for each provider:
 
-`dotnet ef database update -- "{connection string}"`
+```cmd
+dotnet ef migrations add <migration-name>
+```
diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/SequenceEntityConfiguration.cs b/src/VirtoCommerce.CoreModule.Data.PostgreSql/SequenceEntityConfiguration.cs
new file mode 100644
index 000000000..8338aee9d
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/SequenceEntityConfiguration.cs
@@ -0,0 +1,24 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using VirtoCommerce.CoreModule.Data.Model;
+
+namespace VirtoCommerce.CoreModule.Data.PostgreSql
+{
+    public class SequenceEntityConfiguration : IEntityTypeConfiguration<SequenceEntity>
+    {
+        public void Configure(EntityTypeBuilder<SequenceEntity> builder)
+        {
+            var converter = new ValueConverter<byte[], long>(
+                v => BitConverter.ToInt64(v, 0),
+                v => BitConverter.GetBytes(v));
+
+            builder.Property(c => c.RowVersion)
+                .HasColumnType("xid")
+                .HasColumnName("xmin")
+                .HasConversion(converter)
+                .ValueGeneratedOnAddOrUpdate()
+                .IsConcurrencyToken();
+        }
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs b/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
index 9e66838df..a6b34ff80 100644
--- a/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
@@ -16,5 +16,7 @@ public class SequenceEntity
 
         [Timestamp]
         public byte[] RowVersion { get; set; }
+
+        //public DateTime? LastResetDate { get; set; }
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs b/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
index 20af0e535..0de79721d 100644
--- a/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Repositories/CoreDbContext.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
-using EntityFrameworkCore.Triggers;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using VirtoCommerce.CoreModule.Data.Currency;
 using VirtoCommerce.CoreModule.Data.Model;
 using VirtoCommerce.CoreModule.Data.Package;
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index e50b9733f..40128e407 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -1,6 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Polly;
 using VirtoCommerce.CoreModule.Core.Common;
 using VirtoCommerce.CoreModule.Data.Model;
 using VirtoCommerce.CoreModule.Data.Repositories;
@@ -9,15 +10,8 @@ namespace VirtoCommerce.CoreModule.Data.Services
 {
     public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator
     {
-
-        //How many sequence items will be stored in-memory
-        public const int SequenceReservationRange = 100;
-        public const int DefaultSequenceStartValue = 1;
-
+        private readonly object _lock = new object();
         private readonly Func<ICoreRepository> _repositoryFactory;
-        private static readonly object _sequenceLock = new object();
-        private static readonly InMemorySequenceList _inMemorySequences = new InMemorySequenceList();
-
 
         public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory)
         {
@@ -31,145 +25,38 @@ public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFact
         /// <returns></returns>
         public string GenerateNumber(string numberTemplate)
         {
-            lock (_sequenceLock)
-            {
-                _inMemorySequences[numberTemplate] = _inMemorySequences[numberTemplate] ?? new InMemorySequence(numberTemplate);
-
-                if (_inMemorySequences[numberTemplate].IsEmpty || _inMemorySequences[numberTemplate].HasExpired)
-                {
-                    const int maxTransactionRetries = 3;
-
-                    for (var retryCount = 0; retryCount < maxTransactionRetries; retryCount++)
-                    {
-                        try
-                        {
-                            InitCounters(numberTemplate, out var startCounter, out var endCounter);
-                            _inMemorySequences[numberTemplate].Pregenerate(startCounter, endCounter, numberTemplate);
-                            break;
-                        }
-                        catch (Exception)
-                        {
-                            // Catching base Exception as any db exception thrown as FaultException.
-                        }
-                    }
-                }
-
-                return string.Format(_inMemorySequences[numberTemplate].Next());
-            }
-        }
+            var retryPolicy = Policy.Handle<DbUpdateConcurrencyException>().WaitAndRetry(retryCount: 10, _ => TimeSpan.FromMilliseconds(5));
 
-        private void InitCounters(string objectType, out int startCounter, out int endCounter)
-        {
-            //Update Sequences in database
-            using (var repository = _repositoryFactory())
+            lock (_lock)
             {
-                var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == objectType);
-                var originalModifiedDate = sequence?.ModifiedDate;
-
-                if (sequence != null)
-                {
-                    sequence.ModifiedDate = DateTime.UtcNow;
-                }
-                else
-                {
-                    sequence = new SequenceEntity { ObjectType = objectType, Value = DefaultSequenceStartValue, ModifiedDate = DateTime.UtcNow };
-                    repository.Add(sequence);
-                }
-
+                var currentDate = DateTime.Now; // {0}
 
-                repository.UnitOfWork.Commit();
-                //TODO will check it
-                //Refresh data to make sure we have latest value in case another transaction was locked
-                //repository.Refresh(repository.Sequences);
-                sequence = repository.Sequences.Single(s => s.ObjectType == objectType);
-                startCounter = sequence.Value;
+                int counter = 0;
+                retryPolicy.Execute(() => counter = RequestNextCounter(numberTemplate));
 
-                //Sequence in database has expired?
-                if (originalModifiedDate.HasValue && originalModifiedDate.Value.Date < DateTime.UtcNow.Date)
-                {
-                    startCounter = DefaultSequenceStartValue;
-                }
-
-                try
-                {
-                    endCounter = checked(startCounter + SequenceReservationRange);
-                }
-                catch (OverflowException)
-                {
-                    //need to reset
-                    startCounter = DefaultSequenceStartValue;
-                    endCounter = SequenceReservationRange;
-                }
-
-                sequence.Value = endCounter;
-                repository.UnitOfWork.Commit();
+                return string.Format(numberTemplate, currentDate, counter);
             }
         }
 
-        private class InMemorySequence
+        protected virtual int RequestNextCounter(string numberTemplate)
         {
-            private readonly string _type;
-            private Stack<string> _sequence = new Stack<string>();
-            private DateTime? _lastGenerationDateTime;
-
-            public InMemorySequence(string type)
-            {
-                _type = type;
-            }
-
-            public string ObjectType
-            {
-                get { return _type; }
-            }
-
-            public bool HasExpired
-            {
-                get { return _lastGenerationDateTime.HasValue && _lastGenerationDateTime.Value.Date < DateTime.UtcNow.Date; }
-            }
-
-            public bool IsEmpty
-            {
-                get { return _sequence.Count == 0; }
-            }
+            using var repository = _repositoryFactory();
+            var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == numberTemplate);
 
-            public string Next()
+            if (sequence != null)
             {
-                return _sequence.Pop();
+                sequence.ModifiedDate = DateTime.UtcNow;
+                sequence.Value += 1;
             }
-
-            public void Pregenerate(int startCount, int endCount, string numberTemplate)
+            else
             {
-                _lastGenerationDateTime = DateTime.UtcNow;
-                var generatedItems = new Stack<string>();
-                for (var index = startCount; index < endCount; index++)
-                {
-                    generatedItems.Push(string.Format(numberTemplate, _lastGenerationDateTime.Value, index));
-                }
-
-                //This revereses the sequence
-                _sequence = new Stack<string>(generatedItems);
+                sequence = new SequenceEntity { ObjectType = numberTemplate, Value = 1, ModifiedDate = DateTime.UtcNow };
+                repository.Add(sequence);
             }
-        }
 
-        private class InMemorySequenceList : List<InMemorySequence>
-        {
-            public InMemorySequence this[string type]
-            {
-                get
-                {
-                    return this.FirstOrDefault(i => i.ObjectType.Equals(type, StringComparison.OrdinalIgnoreCase));
-                }
-                set
-                {
-                    var exitingItem = this[type];
+            repository.UnitOfWork.Commit();
 
-                    if (exitingItem != null)
-                    {
-                        Remove(exitingItem);
-                    }
-                    Add(value);
-                }
-            }
+            return sequence.Value;
         }
     }
 }

From 6c781204ae8e45ce73c42c480f53fcad483613d1 Mon Sep 17 00:00:00 2001
From: artem-dudarev <ad@virtoway.com>
Date: Fri, 26 Jan 2024 13:14:26 +0200
Subject: [PATCH 02/11] Update row version for PostgreSQL

---
 ...0240126111303_UpdateRowVersion.Designer.cs | 147 ++++++++++++++++++
 .../20240126111303_UpdateRowVersion.cs        |  50 ++++++
 .../Migrations/CoreDbContextModelSnapshot.cs  |   7 +-
 3 files changed, 201 insertions(+), 3 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.Designer.cs
 create mode 100644 src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.cs

diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.Designer.cs b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.Designer.cs
new file mode 100644
index 000000000..50c098ab2
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.Designer.cs
@@ -0,0 +1,147 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using VirtoCommerce.CoreModule.Data.Repositories;
+
+#nullable disable
+
+namespace VirtoCommerce.CoreModule.Data.PostgreSql.Migrations
+{
+    [DbContext(typeof(CoreDbContext))]
+    [Migration("20240126111303_UpdateRowVersion")]
+    partial class UpdateRowVersion
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("VirtoCommerce.CoreModule.Data.Currency.CurrencyEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("CreatedBy")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime>("CreatedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("CustomFormatting")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<decimal>("ExchangeRate")
+                        .HasColumnType("Money");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("MidpointRounding")
+                        .HasMaxLength(18)
+                        .HasColumnType("character varying(18)");
+
+                    b.Property<string>("ModifiedBy")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime?>("ModifiedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("RoundingType")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("Symbol")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code")
+                        .HasDatabaseName("IX_Code");
+
+                    b.ToTable("Currency", (string)null);
+                });
+
+            modelBuilder.Entity("VirtoCommerce.CoreModule.Data.Model.SequenceEntity", b =>
+                {
+                    b.Property<string>("ObjectType")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<DateTime?>("ModifiedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<long?>("RowVersion")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.Property<int>("Value")
+                        .HasColumnType("integer");
+
+                    b.HasKey("ObjectType");
+
+                    b.ToTable("Sequence", (string)null);
+                });
+
+            modelBuilder.Entity("VirtoCommerce.CoreModule.Data.Package.PackageTypeEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<decimal>("Height")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<decimal>("Length")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.Property<string>("MeasureUnit")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(254)
+                        .HasColumnType("character varying(254)");
+
+                    b.Property<decimal>("Width")
+                        .HasPrecision(18, 4)
+                        .HasColumnType("numeric(18,4)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PackageType", (string)null);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.cs b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.cs
new file mode 100644
index 000000000..1810c2088
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/20240126111303_UpdateRowVersion.cs
@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace VirtoCommerce.CoreModule.Data.PostgreSql.Migrations
+{
+    /// <inheritdoc />
+    public partial class UpdateRowVersion : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "RowVersion",
+                table: "Sequence",
+                newName: "xmin");
+
+            migrationBuilder.AlterColumn<uint>(
+                name: "xmin",
+                table: "Sequence",
+                type: "xid",
+                rowVersion: true,
+                nullable: true,
+                oldClrType: typeof(byte[]),
+                oldType: "bytea",
+                oldRowVersion: true,
+                oldNullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "xmin",
+                table: "Sequence",
+                newName: "RowVersion");
+
+            migrationBuilder.AlterColumn<byte[]>(
+                name: "RowVersion",
+                table: "Sequence",
+                type: "bytea",
+                rowVersion: true,
+                nullable: true,
+                oldClrType: typeof(uint),
+                oldType: "xid",
+                oldRowVersion: true,
+                oldNullable: true);
+        }
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/CoreDbContextModelSnapshot.cs b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/CoreDbContextModelSnapshot.cs
index 234bd7571..838e6cd3f 100644
--- a/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/CoreDbContextModelSnapshot.cs
+++ b/src/VirtoCommerce.CoreModule.Data.PostgreSql/Migrations/CoreDbContextModelSnapshot.cs
@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("ProductVersion", "8.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -92,10 +92,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime?>("ModifiedDate")
                         .HasColumnType("timestamp with time zone");
 
-                    b.Property<byte[]>("RowVersion")
+                    b.Property<long?>("RowVersion")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
-                        .HasColumnType("bytea");
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
 
                     b.Property<int>("Value")
                         .HasColumnType("integer");

From 0eb2e75aaa1a11e628f8380f5d8ea4f500480cb9 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 16:38:43 +0200
Subject: [PATCH 03/11] feat: Added ITenantUniqueNumberGenerator. feat: Added
 Integration and Unit tests.

---
 .../Common/ITenantUniqueNumberGenerator.cs    |  27 +++
 .../Common/ResetCounterType.cs                |  11 +
 .../SequenceUniqueNumberGeneratorService.cs   | 123 ++++++++++-
 .../UniqueNumberGeneratorTest.cs              | 202 ++++++++++++++++++
 .../VirtoCommerce.CoreModule.Tests.csproj     |   1 +
 5 files changed, 354 insertions(+), 10 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
 create mode 100644 src/VirtoCommerce.CoreModule.Core/Common/ResetCounterType.cs
 create mode 100644 tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs

diff --git a/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
new file mode 100644
index 000000000..8b719d352
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
@@ -0,0 +1,27 @@
+namespace VirtoCommerce.CoreModule.Core.Common
+{
+    /// <summary>
+    /// Represents options for unique number generation.
+    /// </summary>
+    public class UniqueNumberGeneratorOptions
+    {
+        public ResetCounterType ResetCounterType { get; set; }
+        public int StartCounterFrom { get; set; } = 1;
+        public int CounterIncrement { get; set; } = 1;
+    }
+
+    /// <summary>
+    /// Represents interface for unique number generation for tenant.
+    /// </summary>
+    public interface ITenantUniqueNumberGenerator
+    {
+        /// <summary>
+        /// Generates unique number using given template with resetCounterType for tentantId.
+        /// </summary>
+        /// <param name="tentantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options);
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Core/Common/ResetCounterType.cs b/src/VirtoCommerce.CoreModule.Core/Common/ResetCounterType.cs
new file mode 100644
index 000000000..a36495c28
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Core/Common/ResetCounterType.cs
@@ -0,0 +1,11 @@
+namespace VirtoCommerce.CoreModule.Core.Common
+{
+    public enum ResetCounterType
+    {
+        None = 0,
+        Daily = 1,
+        Weekly = 2,
+        Monthly = 3,
+        Yearly = 5,
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index 40128e407..7ec03abd1 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -2,17 +2,29 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Polly;
+using Polly.Retry;
 using VirtoCommerce.CoreModule.Core.Common;
 using VirtoCommerce.CoreModule.Data.Model;
 using VirtoCommerce.CoreModule.Data.Repositories;
 
 namespace VirtoCommerce.CoreModule.Data.Services
 {
-    public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator
+    /// <summary>
+    /// Represents implementation of unique number generator using database sequences.
+    /// Generates unique number using given template, e.g., GenerateNumber("Order{0:yyMMdd}-{1:D5}");
+    /// {0} - date (the UTC time of number generation)
+    /// {1} - the sequence number
+    /// {2} - tenantId
+    /// </summary>
+    public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator, ITenantUniqueNumberGenerator
     {
         private readonly object _lock = new object();
         private readonly Func<ICoreRepository> _repositoryFactory;
 
+        /// <summary>
+        /// Creates new instance of SequenceUniqueNumberGeneratorService.
+        /// </summary>
+        /// <param name="repositoryFactory"></param>
         public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory)
         {
             _repositoryFactory = repositoryFactory;
@@ -25,32 +37,83 @@ public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFact
         /// <returns></returns>
         public string GenerateNumber(string numberTemplate)
         {
-            var retryPolicy = Policy.Handle<DbUpdateConcurrencyException>().WaitAndRetry(retryCount: 10, _ => TimeSpan.FromMilliseconds(5));
+            return GenerateNumber(string.Empty, numberTemplate,
+                new UniqueNumberGeneratorOptions
+                {
+                    ResetCounterType = ResetCounterType.Daily,
+                    CounterIncrement = 1,
+                    StartCounterFrom = 1
+                });
+        }
+
+        /// <summary>
+        /// Generates unique number using given template and options for tentantId.
+        /// </summary>
+        /// <param name="tentantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options)
+        {
+            var retryPolicy = ConfigureRetryPolicy();
 
             lock (_lock)
             {
-                var currentDate = DateTime.Now; // {0}
+                var currentDate = DateTime.Now;
+                var counter = 0;
 
-                int counter = 0;
-                retryPolicy.Execute(() => counter = RequestNextCounter(numberTemplate));
+                retryPolicy.Execute(() => counter = RequestNextCounter(tentantId, numberTemplate, options));
 
-                return string.Format(numberTemplate, currentDate, counter);
+                return string.Format(numberTemplate, currentDate, counter, tentantId);
             }
         }
 
-        protected virtual int RequestNextCounter(string numberTemplate)
+        /// <summary>
+        /// Configures retry policy for database operations.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual RetryPolicy ConfigureRetryPolicy()
+        {
+            return Policy.Handle<DbUpdateConcurrencyException>()
+                .Or<InvalidOperationException>()
+                .WaitAndRetry(retryCount: 15, _ => TimeSpan.FromMilliseconds(5));
+        }
+
+        /// <summary>
+        /// Requests next counter for given number template.
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="resetCounterType"></param>
+        /// <returns></returns>
+        protected virtual int RequestNextCounter(string tenantId, string numberTemplate, UniqueNumberGeneratorOptions options)
         {
             using var repository = _repositoryFactory();
             var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == numberTemplate);
 
             if (sequence != null)
             {
-                sequence.ModifiedDate = DateTime.UtcNow;
-                sequence.Value += 1;
+                var lastResetDate = sequence.ModifiedDate ?? GetCurrentUtcDate();
+
+                if (ShouldResetCounter(lastResetDate, options.ResetCounterType))
+                {
+                    sequence.Value = options.StartCounterFrom;
+                }
+                else
+                {
+                    sequence.Value += options.CounterIncrement;
+                }
+
+                sequence.ModifiedDate = GetCurrentUtcDate();
             }
             else
             {
-                sequence = new SequenceEntity { ObjectType = numberTemplate, Value = 1, ModifiedDate = DateTime.UtcNow };
+                sequence = new SequenceEntity
+                {
+                    ObjectType = numberTemplate,
+                    Value = options.StartCounterFrom,
+                    ModifiedDate = GetCurrentUtcDate()
+                };
                 repository.Add(sequence);
             }
 
@@ -58,5 +121,45 @@ protected virtual int RequestNextCounter(string numberTemplate)
 
             return sequence.Value;
         }
+
+        /// <summary>
+        /// Returns true if counter should be reset.
+        /// </summary>
+        /// <param name="lastResetDate"></param>
+        /// <param name="resetCounterType"></param>
+        /// <returns></returns>
+        protected virtual bool ShouldResetCounter(DateTime lastResetDate, ResetCounterType resetCounterType)
+        {
+            var currentUtcDate = GetCurrentUtcDate();
+
+            switch (resetCounterType)
+            {
+                case ResetCounterType.Daily:
+                    return currentUtcDate.Date > lastResetDate.Date;
+                case ResetCounterType.Weekly:
+                    // Reset every Monday
+                    int daysUntilTargetDay = ((int)DayOfWeek.Monday - (int)lastResetDate.DayOfWeek + 7) % 7;
+                    var nextMondayDate = lastResetDate.Date.AddDays(daysUntilTargetDay);
+                    return currentUtcDate >= nextMondayDate;
+                case ResetCounterType.Monthly:
+                    // Reset on first day of the month
+                    return currentUtcDate.Month > lastResetDate.Month || currentUtcDate.Year > lastResetDate.Year;
+                case ResetCounterType.Yearly:
+                    // Reset on first day of the year 
+                    return currentUtcDate.Year > lastResetDate.Year;
+                case ResetCounterType.None:
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns current UTC date. Allows to override for testing purposes.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual DateTime GetCurrentUtcDate()
+        {
+            return DateTime.UtcNow;
+        }
     }
 }
diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
new file mode 100644
index 000000000..46088c8bc
--- /dev/null
+++ b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
@@ -0,0 +1,202 @@
+using System;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using VirtoCommerce.CoreModule.Core.Common;
+using VirtoCommerce.CoreModule.Data.Model;
+using VirtoCommerce.CoreModule.Data.Repositories;
+using VirtoCommerce.CoreModule.Data.Services;
+using VirtoCommerce.Platform.Core.Domain;
+using Xunit;
+
+namespace VirtoCommerce.CoreModule.Tests
+{
+    public class CustomDateSequenceUniqueNumberGeneratorService : SequenceUniqueNumberGeneratorService
+    {
+        public DateTime CurrentUtcDate { get; set; }
+
+        public CustomDateSequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
+            DateTime currentUtcDate) : base(repositoryFactory)
+        {
+            CurrentUtcDate = currentUtcDate;
+        }
+
+        protected override DateTime GetCurrentUtcDate()
+        {
+            return CurrentUtcDate;
+        }
+    }
+
+    public class UniqueNumberGeneratorTest
+    {
+        [Fact]
+        [Trait("Category", "IntegrationTest")]
+        public void IntegrationTestWithSqlServer()
+        {
+            var connectionString = "Data Source=(local);Initial Catalog=VirtoCommerce3;Persist Security Info=True;User ID=virto;Password=virto;Connect Timeout=30;TrustServerCertificate=True;";
+
+            var optionsBuilder = new DbContextOptionsBuilder<CoreDbContext>();
+            optionsBuilder.UseSqlServer(connectionString);
+
+            var generator = new SequenceUniqueNumberGeneratorService(() => new CoreRepositoryImpl(new CoreDbContext(optionsBuilder.Options)));
+
+            var number = generator.GenerateNumber("PO{0:yyMMdd}-{1:D5}");
+            Assert.NotNull(number);
+        }
+
+        [Theory]
+        [InlineData("{1}", "2")]
+        [InlineData("PO-{1:D5}", "PO-00002")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}", "CO240126-00002")]
+        public void GenerateNumber_ShouldGenerateUniqueNumbersWithDifferentParameters(string template, string expected)
+        {
+            // Arrange
+            var sequenceEntity = new SequenceEntity { ObjectType = template, Value = 1, ModifiedDate = DateTime.UtcNow };
+
+            var repositoryFactoryMock = CreateRepositoryMock(sequenceEntity);
+
+            var numberGeneratorService = new CustomDateSequenceUniqueNumberGeneratorService(
+                repositoryFactoryMock.Object,
+                new DateTime(2024, 01, 26, 0, 0, 0, DateTimeKind.Utc));
+
+            // Act
+            var generatedNumber = numberGeneratorService.GenerateNumber(template);
+
+            // Assert
+            Assert.Equal(expected, generatedNumber);
+        }
+
+
+
+        public static TheoryData<DateTime, DateTime, ResetCounterType, string> ResetCounterCases =
+            new()
+            {
+                // Daily
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 58, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Daily,
+                    "00778"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 27, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Daily,
+                    "00001"
+                },
+                // Weekly
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 58, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 28, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Weekly,
+                    "00778"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 29, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Weekly,
+                    "00001"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 30, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Weekly,
+                    "00001"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2024, 05, 30, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Weekly,
+                    "00001"
+                },
+                // Monthly
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 58, DateTimeKind.Utc),
+                    new DateTime(2024, 01, 31, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Monthly,
+                    "00778"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2024, 02, 01, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Monthly,
+                    "00001"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2025, 01, 01, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Monthly,
+                    "00001"
+                },
+                // Yearly
+                 {
+                    new DateTime(2024, 01, 26, 23, 59, 58, DateTimeKind.Utc),
+                    new DateTime(2024, 12, 31, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Yearly,
+                    "00778"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2025, 02, 01, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.Yearly,
+                    "00001"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2030, 01, 01, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.Yearly,
+                    "00001"
+                },
+                // Never
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2025, 02, 01, 00, 00, 00, DateTimeKind.Utc),
+                    ResetCounterType.None,
+                    "00778"
+                },
+                {
+                    new DateTime(2024, 01, 26, 23, 59, 59, DateTimeKind.Utc),
+                    new DateTime(2030, 01, 01, 23, 59, 59, DateTimeKind.Utc),
+                    ResetCounterType.None,
+                    "00778"
+                },
+            };
+
+
+        [Theory]
+        [MemberData(nameof(ResetCounterCases))]
+        public void GenerateNumber_ResetCounter(DateTime lastResetDate, DateTime currentDate, ResetCounterType resetCounterType, string expected)
+        {
+            var tenantId = "TEST";
+            var template = "{1:D5}";
+
+            // Arrange
+            var sequenceEntity = new SequenceEntity { ObjectType = template, Value = 777, ModifiedDate = lastResetDate };
+
+            var repositoryFactoryMock = CreateRepositoryMock(sequenceEntity);
+
+            var numberGeneratorService = new CustomDateSequenceUniqueNumberGeneratorService(
+                repositoryFactoryMock.Object,
+                currentDate);
+
+            // Act
+            var generatedNumber = numberGeneratorService.GenerateNumber(tenantId, template,
+                new UniqueNumberGeneratorOptions { ResetCounterType = resetCounterType });
+
+            // Assert
+            Assert.Equal(expected, generatedNumber);
+        }
+
+        private static Mock<Func<ICoreRepository>> CreateRepositoryMock(SequenceEntity sequenceEntity)
+        {
+            var repositoryMock = new Mock<ICoreRepository>();
+            repositoryMock.Setup(r => r.Sequences).Returns((new SequenceEntity[] { sequenceEntity }).AsQueryable());
+            repositoryMock.Setup(r => r.UnitOfWork).Returns((new Mock<IUnitOfWork>()).Object);
+
+
+            var repositoryFactoryMock = new Mock<Func<ICoreRepository>>();
+            repositoryFactoryMock.Setup(f => f()).Returns(repositoryMock.Object);
+            return repositoryFactoryMock;
+        }
+    }
+}
diff --git a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
index cef1210e9..cb04207c6 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
+++ b/tests/VirtoCommerce.CoreModule.Tests/VirtoCommerce.CoreModule.Tests.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\VirtoCommerce.CoreModule.Core\VirtoCommerce.CoreModule.Core.csproj" />
+    <ProjectReference Include="..\..\src\VirtoCommerce.CoreModule.Data.SqlServer\VirtoCommerce.CoreModule.Data.SqlServer.csproj" />
     <ProjectReference Include="..\..\src\VirtoCommerce.CoreModule.Data\VirtoCommerce.CoreModule.Data.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From ac360b87bcf919d8cf12af0f242fa3cce37692db Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 16:54:51 +0200
Subject: [PATCH 04/11] Add SequenceNumberGeneratorOptions

---
 .../Common/NumberGeneratorOptions.cs               | 14 ++++++++++++++
 .../SequenceUniqueNumberGeneratorService.cs        | 10 ++++++++--
 src/VirtoCommerce.CoreModule.Web/Module.cs         | 10 ++++++----
 .../UniqueNumberGeneratorTest.cs                   |  7 ++++---
 4 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs

diff --git a/src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs
new file mode 100644
index 000000000..8b58b0373
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs
@@ -0,0 +1,14 @@
+namespace VirtoCommerce.CoreModule.Core.Common
+{
+    public class SequenceNumberGeneratorOptions
+    {
+        /// <summary>
+        /// Defines the number of retries to generate unique number if either DbUpdateConcurrencyException or InvalidOperationException is occured.
+        /// </summary>
+        public int RetryCount { get; set; } = 15;
+        /// <summary>
+        /// Defines the delay between retries in seconds.
+        /// </summary>
+        public int RetryDelay { get; set; } = 5;
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index 7ec03abd1..f071bc2e2 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 using Polly;
 using Polly.Retry;
 using VirtoCommerce.CoreModule.Core.Common;
@@ -21,13 +22,18 @@ public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator, ITen
         private readonly object _lock = new object();
         private readonly Func<ICoreRepository> _repositoryFactory;
 
+        private readonly SequenceNumberGeneratorOptions _options;
+
         /// <summary>
         /// Creates new instance of SequenceUniqueNumberGeneratorService.
         /// </summary>
         /// <param name="repositoryFactory"></param>
-        public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory)
+        /// <param name="options"></param>
+        public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
+            IOptions<SequenceNumberGeneratorOptions> options)
         {
             _repositoryFactory = repositoryFactory;
+            _options = options.Value;
         }
 
         /// <summary>
@@ -76,7 +82,7 @@ protected virtual RetryPolicy ConfigureRetryPolicy()
         {
             return Policy.Handle<DbUpdateConcurrencyException>()
                 .Or<InvalidOperationException>()
-                .WaitAndRetry(retryCount: 15, _ => TimeSpan.FromMilliseconds(5));
+                .WaitAndRetry(retryCount: _options.RetryCount, _ => TimeSpan.FromMilliseconds(_options.RetryDelay));
         }
 
         /// <summary>
diff --git a/src/VirtoCommerce.CoreModule.Web/Module.cs b/src/VirtoCommerce.CoreModule.Web/Module.cs
index d14e00888..a7cb59c5f 100644
--- a/src/VirtoCommerce.CoreModule.Web/Module.cs
+++ b/src/VirtoCommerce.CoreModule.Web/Module.cs
@@ -72,6 +72,8 @@ public void Initialize(IServiceCollection serviceCollection)
 
             // Money rounding
             serviceCollection.AddTransient<IMoneyRoundingPolicy, DefaultMoneyRoundingPolicy>();
+
+            serviceCollection.AddOptions<SequenceNumberGeneratorOptions>().Bind(Configuration.GetSection("VirtoCommerce:SequenceNumberGenerator")).ValidateDataAnnotations();
         }
 
         public void PostInitialize(IApplicationBuilder appBuilder)
@@ -103,15 +105,15 @@ public void Uninstall()
             // Method intentionally left empty.
         }
 
-        public async Task ExportAsync(Stream outStream, ExportImportOptions options, Action<ExportImportProgressInfo> progressCallback, ICancellationToken cancellationToken)
+        public Task ExportAsync(Stream outStream, ExportImportOptions options, Action<ExportImportProgressInfo> progressCallback, ICancellationToken cancellationToken)
         {
-            await _appBuilder.ApplicationServices.GetRequiredService<CoreExportImport>().ExportAsync(outStream, options, progressCallback, cancellationToken);
+            return _appBuilder.ApplicationServices.GetRequiredService<CoreExportImport>().ExportAsync(outStream, options, progressCallback, cancellationToken);
         }
 
-        public async Task ImportAsync(Stream inputStream, ExportImportOptions options, Action<ExportImportProgressInfo> progressCallback,
+        public Task ImportAsync(Stream inputStream, ExportImportOptions options, Action<ExportImportProgressInfo> progressCallback,
             ICancellationToken cancellationToken)
         {
-            await _appBuilder.ApplicationServices.GetRequiredService<CoreExportImport>().ImportAsync(inputStream, options, progressCallback, cancellationToken);
+            return _appBuilder.ApplicationServices.GetRequiredService<CoreExportImport>().ImportAsync(inputStream, options, progressCallback, cancellationToken);
         }
     }
 }
diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
index 46088c8bc..582fb23a7 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 using Moq;
 using VirtoCommerce.CoreModule.Core.Common;
 using VirtoCommerce.CoreModule.Data.Model;
@@ -16,7 +17,7 @@ public class CustomDateSequenceUniqueNumberGeneratorService : SequenceUniqueNumb
         public DateTime CurrentUtcDate { get; set; }
 
         public CustomDateSequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
-            DateTime currentUtcDate) : base(repositoryFactory)
+            DateTime currentUtcDate) : base(repositoryFactory, Options.Create(new SequenceNumberGeneratorOptions()))
         {
             CurrentUtcDate = currentUtcDate;
         }
@@ -38,7 +39,8 @@ public void IntegrationTestWithSqlServer()
             var optionsBuilder = new DbContextOptionsBuilder<CoreDbContext>();
             optionsBuilder.UseSqlServer(connectionString);
 
-            var generator = new SequenceUniqueNumberGeneratorService(() => new CoreRepositoryImpl(new CoreDbContext(optionsBuilder.Options)));
+            var generator = new SequenceUniqueNumberGeneratorService(() => new CoreRepositoryImpl(new CoreDbContext(optionsBuilder.Options)),
+                Options.Create(new SequenceNumberGeneratorOptions()));
 
             var number = generator.GenerateNumber("PO{0:yyMMdd}-{1:D5}");
             Assert.NotNull(number);
@@ -193,7 +195,6 @@ private static Mock<Func<ICoreRepository>> CreateRepositoryMock(SequenceEntity s
             repositoryMock.Setup(r => r.Sequences).Returns((new SequenceEntity[] { sequenceEntity }).AsQueryable());
             repositoryMock.Setup(r => r.UnitOfWork).Returns((new Mock<IUnitOfWork>()).Object);
 
-
             var repositoryFactoryMock = new Mock<Func<ICoreRepository>>();
             repositoryFactoryMock.Setup(f => f()).Returns(repositoryMock.Object);
             return repositoryFactoryMock;

From 3e5724b6827df65b7e20c271105119df3f783238 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 18:03:59 +0200
Subject: [PATCH 05/11] feats: Add support for counter options via template
 number

---
 .../Model/SequenceEntity.cs                   |  2 -
 .../SequenceUniqueNumberGeneratorService.cs   | 79 ++++++++++++++++---
 .../UniqueNumberGeneratorTest.cs              | 14 ++--
 3 files changed, 75 insertions(+), 20 deletions(-)

diff --git a/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs b/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
index a6b34ff80..9e66838df 100644
--- a/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Model/SequenceEntity.cs
@@ -16,7 +16,5 @@ public class SequenceEntity
 
         [Timestamp]
         public byte[] RowVersion { get; set; }
-
-        //public DateTime? LastResetDate { get; set; }
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index f071bc2e2..87f57e892 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Polly;
@@ -11,11 +12,26 @@
 namespace VirtoCommerce.CoreModule.Data.Services
 {
     /// <summary>
-    /// Represents implementation of unique number generator using database sequences.
-    /// Generates unique number using given template, e.g., GenerateNumber("Order{0:yyMMdd}-{1:D5}");
+    /// Represents unique number generator using database storage.
+    /// It generates an unique number using given template, e.g., "PO{0:yyMMdd}-{1:D5}" where
+    /// 
     /// {0} - date (the UTC time of number generation)
     /// {1} - the sequence number
     /// {2} - tenantId
+    /// 
+    /// Also, it supports counter options after @:
+    /// <numberTemplate> or <number_template>@<reset_counter_type>:<start_counter_from>:<counter_increment>
+    /// 
+    /// reset_counter_type - can be one of this value: None, Daily, Weekly, Monthly, Yearly. Default value: Daily
+    /// start_counter_from - positive integer value. Default value: 1
+    /// counter_increment - positive integer value. Default value: 1
+    ///
+    /// Examples:
+    /// PO{1:D5}
+    /// PO{0:yyMMdd}-{1:D5}
+    /// PO{0:yyMMdd}-{1:D5}@Daily
+    /// PO{0:yyMMdd}-{1:D5}@Weekly:1:10
+    /// PO{0:yyMMdd}-{1:D5}@None:1:1
     /// </summary>
     public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator, ITenantUniqueNumberGenerator
     {
@@ -32,24 +48,27 @@ public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator, ITen
         public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
             IOptions<SequenceNumberGeneratorOptions> options)
         {
+            ArgumentNullException.ThrowIfNull(repositoryFactory);
+            ArgumentNullException.ThrowIfNull(options);
+
             _repositoryFactory = repositoryFactory;
             _options = options.Value;
         }
 
         /// <summary>
-        /// Generates unique number using given template, e.g., GenerateNumber("Order{0:yyMMdd}-{1:D5}");
+        /// Generates unique number using given template.
         /// </summary>
         /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
         /// <returns></returns>
-        public string GenerateNumber(string numberTemplate)
+        public virtual string GenerateNumber(string numberTemplate)
         {
-            return GenerateNumber(string.Empty, numberTemplate,
-                new UniqueNumberGeneratorOptions
-                {
-                    ResetCounterType = ResetCounterType.Daily,
-                    CounterIncrement = 1,
-                    StartCounterFrom = 1
-                });
+            ArgumentNullException.ThrowIfNull(numberTemplate);
+
+
+            string resolvedNumberTemplate;
+            var templateOptions = ResolveTemplateOptionsFromTemplate(numberTemplate, out resolvedNumberTemplate);
+
+            return GenerateNumber(string.Empty, resolvedNumberTemplate, templateOptions);
         }
 
         /// <summary>
@@ -59,8 +78,12 @@ public string GenerateNumber(string numberTemplate)
         /// <param name="numberTemplate"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options)
+        public virtual string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options)
         {
+            ArgumentNullException.ThrowIfNull(tentantId);
+            ArgumentNullException.ThrowIfNull(numberTemplate);
+            ArgumentNullException.ThrowIfNull(options);
+
             var retryPolicy = ConfigureRetryPolicy();
 
             lock (_lock)
@@ -74,6 +97,34 @@ public string GenerateNumber(string tentantId, string numberTemplate, UniqueNumb
             }
         }
 
+        protected virtual UniqueNumberGeneratorOptions ResolveTemplateOptionsFromTemplate(string numberTemplate, out string resolvedNumberTemplate)
+        {
+            var match = Regex.Match(numberTemplate, @"(?<Template>[^@]+)@(?<ResetCounterType>None|Daily|Weekly|Monthly|Yearly)(:(?<StartCounterFrom>\d+))?(:(?<CounterIncrement>\d+))?", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
+
+            if (match.Success)
+            {
+                resolvedNumberTemplate = match.Groups["Template"].Value;
+
+                return new UniqueNumberGeneratorOptions
+                {
+                    ResetCounterType = Enum.Parse<ResetCounterType>(match.Groups["ResetCounterType"].Value),
+                    StartCounterFrom = string.IsNullOrEmpty(match.Groups["StartCounterFrom"].Value) ? 1 : int.Parse(match.Groups["StartCounterFrom"].Value),
+                    CounterIncrement = string.IsNullOrEmpty(match.Groups["CounterIncrement"].Value) ? 1 : int.Parse(match.Groups["CounterIncrement"].Value),
+                };
+            }
+            else
+            {
+                resolvedNumberTemplate = numberTemplate;
+
+                return new UniqueNumberGeneratorOptions
+                {
+                    ResetCounterType = ResetCounterType.Daily,
+                    StartCounterFrom = 1,
+                    CounterIncrement = 1,
+                };
+            }
+        }
+
         /// <summary>
         /// Configures retry policy for database operations.
         /// </summary>
@@ -94,8 +145,10 @@ protected virtual RetryPolicy ConfigureRetryPolicy()
         /// <returns></returns>
         protected virtual int RequestNextCounter(string tenantId, string numberTemplate, UniqueNumberGeneratorOptions options)
         {
+            var objectType = string.IsNullOrEmpty(tenantId) ? numberTemplate : $"{tenantId}/{numberTemplate}";
+
             using var repository = _repositoryFactory();
-            var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == numberTemplate);
+            var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == objectType);
 
             if (sequence != null)
             {
diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
index 582fb23a7..f8c79c070 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
@@ -47,13 +47,17 @@ public void IntegrationTestWithSqlServer()
         }
 
         [Theory]
-        [InlineData("{1}", "2")]
-        [InlineData("PO-{1:D5}", "PO-00002")]
-        [InlineData("CO{0:yyMMdd}-{1:D5}", "CO240126-00002")]
+        [InlineData("{1}", "778")]
+        [InlineData("PO-{1:D5}", "PO-00778")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}", "CO240126-00778")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None", "CO240126-00778")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:1", "CO240126-00778")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:1:1", "CO240126-00778")]
         public void GenerateNumber_ShouldGenerateUniqueNumbersWithDifferentParameters(string template, string expected)
         {
+            var objectType = template.Contains("@") ? template.Substring(0, template.IndexOf("@")) : template;
             // Arrange
-            var sequenceEntity = new SequenceEntity { ObjectType = template, Value = 1, ModifiedDate = DateTime.UtcNow };
+            var sequenceEntity = new SequenceEntity { ObjectType = objectType, Value = 777, ModifiedDate = DateTime.UtcNow };
 
             var repositoryFactoryMock = CreateRepositoryMock(sequenceEntity);
 
@@ -173,7 +177,7 @@ public void GenerateNumber_ResetCounter(DateTime lastResetDate, DateTime current
             var template = "{1:D5}";
 
             // Arrange
-            var sequenceEntity = new SequenceEntity { ObjectType = template, Value = 777, ModifiedDate = lastResetDate };
+            var sequenceEntity = new SequenceEntity { ObjectType = $"{tenantId}/{template}", Value = 777, ModifiedDate = lastResetDate };
 
             var repositoryFactoryMock = CreateRepositoryMock(sequenceEntity);
 

From 340b9d7f7d5d29adbb887a23c4d2ee4da2c1645d Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 18:09:31 +0200
Subject: [PATCH 06/11] Add ITenantUniqueNumberGenerator to DI

---
 src/VirtoCommerce.CoreModule.Web/Module.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/VirtoCommerce.CoreModule.Web/Module.cs b/src/VirtoCommerce.CoreModule.Web/Module.cs
index a7cb59c5f..65e0f93cc 100644
--- a/src/VirtoCommerce.CoreModule.Web/Module.cs
+++ b/src/VirtoCommerce.CoreModule.Web/Module.cs
@@ -59,6 +59,8 @@ public void Initialize(IServiceCollection serviceCollection)
                 }
             });
 
+            serviceCollection.AddOptions<SequenceNumberGeneratorOptions>().Bind(Configuration.GetSection("VirtoCommerce:SequenceNumberGenerator")).ValidateDataAnnotations();
+
             serviceCollection.AddTransient<ICoreRepository, CoreRepositoryImpl>();
             serviceCollection.AddTransient<Func<ICoreRepository>>(provider => () => provider.CreateScope().ServiceProvider.GetRequiredService<ICoreRepository>());
             serviceCollection.AddTransient<ICurrencyService, CurrencyService>();
@@ -67,13 +69,12 @@ public void Initialize(IServiceCollection serviceCollection)
             serviceCollection.AddTransient<ISeoDuplicatesDetector, NullSeoDuplicateDetector>();
             serviceCollection.AddTransient<CoreExportImport>();
             serviceCollection.AddTransient<IUniqueNumberGenerator, SequenceUniqueNumberGeneratorService>();
+            serviceCollection.AddTransient<ITenantUniqueNumberGenerator, SequenceUniqueNumberGeneratorService>();
 
             serviceCollection.AddTransient<CompositeSeoBySlugResolver>();
 
             // Money rounding
             serviceCollection.AddTransient<IMoneyRoundingPolicy, DefaultMoneyRoundingPolicy>();
-
-            serviceCollection.AddOptions<SequenceNumberGeneratorOptions>().Bind(Configuration.GetSection("VirtoCommerce:SequenceNumberGenerator")).ValidateDataAnnotations();
         }
 
         public void PostInitialize(IApplicationBuilder appBuilder)

From a15b1a35f3c379d6565fa0f75d4c8c077a83fc52 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 18:24:00 +0200
Subject: [PATCH 07/11] Refactoring and extend ITenantUniqueNumberGenerator
 with simple method

---
 .../Common/CounterOptions.cs                  | 21 ++++++++
 .../Common/ITenantUniqueNumberGenerator.cs    | 24 ++++-----
 ...s.cs => SequenceNumberGeneratorOptions.cs} |  0
 .../SequenceUniqueNumberGeneratorService.cs   | 54 +++++++++++--------
 .../UniqueNumberGeneratorTest.cs              | 25 ++++++++-
 5 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
 rename src/VirtoCommerce.CoreModule.Core/Common/{NumberGeneratorOptions.cs => SequenceNumberGeneratorOptions.cs} (100%)

diff --git a/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
new file mode 100644
index 000000000..61327a53d
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
@@ -0,0 +1,21 @@
+namespace VirtoCommerce.CoreModule.Core.Common
+{
+    /// <summary>
+    /// Represents options for Counter Options for ITenantUniqueNumberGenerator.
+    /// </summary>
+    public class CounterOptions
+    {
+        /// <summary>
+        /// Represents type of counter reset. Can be one of this value: None, Daily, Weekly, Monthly, Yearly. Default value: Daily  
+        /// </summary>
+        public ResetCounterType ResetCounterType { get; set; } = ResetCounterType.Daily;
+        /// <summary>
+        /// Represents start counter from value. Default value: 1
+        /// </summary>
+        public int StartCounterFrom { get; set; } = 1;
+        /// <summary>
+        /// Represents counter increment value. Default value: 1
+        /// </summary>
+        public int CounterIncrement { get; set; } = 1;
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
index 8b719d352..0063a4313 100644
--- a/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
+++ b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
@@ -1,15 +1,5 @@
 namespace VirtoCommerce.CoreModule.Core.Common
 {
-    /// <summary>
-    /// Represents options for unique number generation.
-    /// </summary>
-    public class UniqueNumberGeneratorOptions
-    {
-        public ResetCounterType ResetCounterType { get; set; }
-        public int StartCounterFrom { get; set; } = 1;
-        public int CounterIncrement { get; set; } = 1;
-    }
-
     /// <summary>
     /// Represents interface for unique number generation for tenant.
     /// </summary>
@@ -18,10 +8,18 @@ public interface ITenantUniqueNumberGenerator
         /// <summary>
         /// Generates unique number using given template with resetCounterType for tentantId.
         /// </summary>
-        /// <param name="tentantId"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="counterOptions"></param>
+        /// <returns></returns>
+        string GenerateNumber(string tenantId, string numberTemplate, CounterOptions counterOptions);
+
+        /// <summary>
+        /// Generates unique number using given template for tentantId.
+        /// </summary>
+        /// <param name="tenantId"></param>
         /// <param name="numberTemplate"></param>
-        /// <param name="options"></param>
         /// <returns></returns>
-        string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options);
+        string GenerateNumber(string tenantId, string numberTemplate);
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/SequenceNumberGeneratorOptions.cs
similarity index 100%
rename from src/VirtoCommerce.CoreModule.Core/Common/NumberGeneratorOptions.cs
rename to src/VirtoCommerce.CoreModule.Core/Common/SequenceNumberGeneratorOptions.cs
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index 87f57e892..b5a3acb45 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -72,17 +72,33 @@ public virtual string GenerateNumber(string numberTemplate)
         }
 
         /// <summary>
-        /// Generates unique number using given template and options for tentantId.
+        /// Generates unique number using given template.
         /// </summary>
-        /// <param name="tentantId"></param>
+        /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
+        /// <returns></returns>
+        public virtual string GenerateNumber(string tenantId, string numberTemplate)
+        {
+            ArgumentNullException.ThrowIfNull(tenantId);
+            ArgumentNullException.ThrowIfNull(numberTemplate);
+
+            string resolvedNumberTemplate;
+            var templateOptions = ResolveTemplateOptionsFromTemplate(numberTemplate, out resolvedNumberTemplate);
+
+            return GenerateNumber(tenantId, resolvedNumberTemplate, templateOptions);
+        }
+
+        /// <summary>
+        /// Generates unique number using given template and options for tenantId.
+        /// </summary>
+        /// <param name="tenantId"></param>
         /// <param name="numberTemplate"></param>
         /// <param name="options"></param>
         /// <returns></returns>
-        public virtual string GenerateNumber(string tentantId, string numberTemplate, UniqueNumberGeneratorOptions options)
+        public virtual string GenerateNumber(string tenantId, string numberTemplate, CounterOptions counterOptions)
         {
-            ArgumentNullException.ThrowIfNull(tentantId);
+            ArgumentNullException.ThrowIfNull(tenantId);
             ArgumentNullException.ThrowIfNull(numberTemplate);
-            ArgumentNullException.ThrowIfNull(options);
+            ArgumentNullException.ThrowIfNull(counterOptions);
 
             var retryPolicy = ConfigureRetryPolicy();
 
@@ -91,13 +107,13 @@ public virtual string GenerateNumber(string tentantId, string numberTemplate, Un
                 var currentDate = DateTime.Now;
                 var counter = 0;
 
-                retryPolicy.Execute(() => counter = RequestNextCounter(tentantId, numberTemplate, options));
+                retryPolicy.Execute(() => counter = RequestNextCounter(tenantId, numberTemplate, counterOptions));
 
-                return string.Format(numberTemplate, currentDate, counter, tentantId);
+                return string.Format(numberTemplate, currentDate, counter, tenantId);
             }
         }
 
-        protected virtual UniqueNumberGeneratorOptions ResolveTemplateOptionsFromTemplate(string numberTemplate, out string resolvedNumberTemplate)
+        protected virtual CounterOptions ResolveTemplateOptionsFromTemplate(string numberTemplate, out string resolvedNumberTemplate)
         {
             var match = Regex.Match(numberTemplate, @"(?<Template>[^@]+)@(?<ResetCounterType>None|Daily|Weekly|Monthly|Yearly)(:(?<StartCounterFrom>\d+))?(:(?<CounterIncrement>\d+))?", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
 
@@ -105,7 +121,7 @@ protected virtual UniqueNumberGeneratorOptions ResolveTemplateOptionsFromTemplat
             {
                 resolvedNumberTemplate = match.Groups["Template"].Value;
 
-                return new UniqueNumberGeneratorOptions
+                return new CounterOptions
                 {
                     ResetCounterType = Enum.Parse<ResetCounterType>(match.Groups["ResetCounterType"].Value),
                     StartCounterFrom = string.IsNullOrEmpty(match.Groups["StartCounterFrom"].Value) ? 1 : int.Parse(match.Groups["StartCounterFrom"].Value),
@@ -115,13 +131,7 @@ protected virtual UniqueNumberGeneratorOptions ResolveTemplateOptionsFromTemplat
             else
             {
                 resolvedNumberTemplate = numberTemplate;
-
-                return new UniqueNumberGeneratorOptions
-                {
-                    ResetCounterType = ResetCounterType.Daily,
-                    StartCounterFrom = 1,
-                    CounterIncrement = 1,
-                };
+                return new CounterOptions();
             }
         }
 
@@ -141,9 +151,9 @@ protected virtual RetryPolicy ConfigureRetryPolicy()
         /// </summary>
         /// <param name="tenantId"></param>
         /// <param name="numberTemplate"></param>
-        /// <param name="resetCounterType"></param>
+        /// <param name="counterOptions"></param>
         /// <returns></returns>
-        protected virtual int RequestNextCounter(string tenantId, string numberTemplate, UniqueNumberGeneratorOptions options)
+        protected virtual int RequestNextCounter(string tenantId, string numberTemplate, CounterOptions counterOptions)
         {
             var objectType = string.IsNullOrEmpty(tenantId) ? numberTemplate : $"{tenantId}/{numberTemplate}";
 
@@ -154,13 +164,13 @@ protected virtual int RequestNextCounter(string tenantId, string numberTemplate,
             {
                 var lastResetDate = sequence.ModifiedDate ?? GetCurrentUtcDate();
 
-                if (ShouldResetCounter(lastResetDate, options.ResetCounterType))
+                if (ShouldResetCounter(lastResetDate, counterOptions.ResetCounterType))
                 {
-                    sequence.Value = options.StartCounterFrom;
+                    sequence.Value = counterOptions.StartCounterFrom;
                 }
                 else
                 {
-                    sequence.Value += options.CounterIncrement;
+                    sequence.Value += counterOptions.CounterIncrement;
                 }
 
                 sequence.ModifiedDate = GetCurrentUtcDate();
@@ -170,7 +180,7 @@ protected virtual int RequestNextCounter(string tenantId, string numberTemplate,
                 sequence = new SequenceEntity
                 {
                     ObjectType = numberTemplate,
-                    Value = options.StartCounterFrom,
+                    Value = counterOptions.StartCounterFrom,
                     ModifiedDate = GetCurrentUtcDate()
                 };
                 repository.Add(sequence);
diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
index f8c79c070..acb2a5362 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
@@ -187,7 +187,30 @@ public void GenerateNumber_ResetCounter(DateTime lastResetDate, DateTime current
 
             // Act
             var generatedNumber = numberGeneratorService.GenerateNumber(tenantId, template,
-                new UniqueNumberGeneratorOptions { ResetCounterType = resetCounterType });
+                new CounterOptions { ResetCounterType = resetCounterType });
+
+            // Assert
+            Assert.Equal(expected, generatedNumber);
+        }
+
+        [Theory]
+        [MemberData(nameof(ResetCounterCases))]
+        public void GenerateNumber_ResetCounter_LoadSettingsFromTemplate(DateTime lastResetDate, DateTime currentDate, ResetCounterType resetCounterType, string expected)
+        {
+            var tenantId = "TEST";
+            var template = "{1:D5}";
+
+            // Arrange
+            var sequenceEntity = new SequenceEntity { ObjectType = $"{tenantId}/{template}", Value = 777, ModifiedDate = lastResetDate };
+
+            var repositoryFactoryMock = CreateRepositoryMock(sequenceEntity);
+
+            var numberGeneratorService = new CustomDateSequenceUniqueNumberGeneratorService(
+                repositoryFactoryMock.Object,
+                currentDate);
+
+            // Act
+            var generatedNumber = numberGeneratorService.GenerateNumber(tenantId, $"{template}@{resetCounterType}");
 
             // Assert
             Assert.Equal(expected, generatedNumber);

From 1ebe3c6b8546f50308eb68ee5ef621f74506211f Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 18:46:01 +0200
Subject: [PATCH 08/11] Add testes for CounterIncrement

---
 .../VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
index acb2a5362..40d173ac2 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
@@ -53,6 +53,8 @@ public void IntegrationTestWithSqlServer()
         [InlineData("CO{0:yyMMdd}-{1:D5}@None", "CO240126-00778")]
         [InlineData("CO{0:yyMMdd}-{1:D5}@None:1", "CO240126-00778")]
         [InlineData("CO{0:yyMMdd}-{1:D5}@None:1:1", "CO240126-00778")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:1:10", "CO240126-00787")]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:1:100", "CO240126-00877")]
         public void GenerateNumber_ShouldGenerateUniqueNumbersWithDifferentParameters(string template, string expected)
         {
             var objectType = template.Contains("@") ? template.Substring(0, template.IndexOf("@")) : template;

From 855cd8bd2184e4603c31e0e1a321efaae49f7d7e Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 26 Jan 2024 19:46:48 +0200
Subject: [PATCH 09/11] fix summary

---
 src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
index 61327a53d..d072c0289 100644
--- a/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
+++ b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
@@ -1,7 +1,7 @@
 namespace VirtoCommerce.CoreModule.Core.Common
 {
     /// <summary>
-    /// Represents options for Counter Options for ITenantUniqueNumberGenerator.
+    /// Represents counter options for ITenantUniqueNumberGenerator.
     /// </summary>
     public class CounterOptions
     {

From c96b57a6bc10156c72c9b45e762d367c194b8b8c Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Mon, 29 Jan 2024 09:47:29 +0200
Subject: [PATCH 10/11] Refacto code: Add Parse for CounterOptions, Mark legacy
 interafce with obsolete.

---
 .../Common/CounterOptions.cs                  |  42 +++
 .../Common/ITenantUniqueNumberGenerator.cs    |   3 +-
 .../SequenceNumberGeneratorService.cs         | 220 +++++++++++++
 .../SequenceUniqueNumberGeneratorService.cs   | 293 +++++++-----------
 .../Services/TimeBasedNumberGenerator.cs      |   1 +
 src/VirtoCommerce.CoreModule.Web/Module.cs    |   4 +-
 ...eneratorTest.cs => NumberGeneratorTest.cs} |  46 ++-
 7 files changed, 424 insertions(+), 185 deletions(-)
 create mode 100644 src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs
 rename tests/VirtoCommerce.CoreModule.Tests/{UniqueNumberGeneratorTest.cs => NumberGeneratorTest.cs} (76%)

diff --git a/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
index d072c0289..d91b616c3 100644
--- a/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
+++ b/src/VirtoCommerce.CoreModule.Core/Common/CounterOptions.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Text.RegularExpressions;
+
 namespace VirtoCommerce.CoreModule.Core.Common
 {
     /// <summary>
@@ -5,6 +8,13 @@ namespace VirtoCommerce.CoreModule.Core.Common
     /// </summary>
     public class CounterOptions
     {
+        private static Regex NumberTemplateRegex = new Regex(@"(?<Template>[^@]+)@(?<ResetCounterType>None|Daily|Weekly|Monthly|Yearly)(:(?<StartCounterFrom>\d+))?(:(?<CounterIncrement>\d+))?", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
+
+        /// <summary>
+        /// Represents number temp[late 
+        /// </summary>
+        public string NumberTemplate { get; set; }
+
         /// <summary>
         /// Represents type of counter reset. Can be one of this value: None, Daily, Weekly, Monthly, Yearly. Default value: Daily  
         /// </summary>
@@ -17,5 +27,37 @@ public class CounterOptions
         /// Represents counter increment value. Default value: 1
         /// </summary>
         public int CounterIncrement { get; set; } = 1;
+
+        public override string ToString()
+        {
+            return $"{NumberTemplate}@{ResetCounterType}:{StartCounterFrom}:{CounterIncrement}";
+        }
+
+        /// <summary>
+        /// Parse counter options from string template: "numberTemplate" or "number_template@reset_counter_type:start_counter_from:counter_increment".
+        /// </summary>
+        /// <param name="template"></param>
+        /// <returns></returns>
+        public static CounterOptions Parse(string template)
+        {
+            ArgumentNullException.ThrowIfNull(template);
+
+            var match = NumberTemplateRegex.Match(template);
+
+            if (match.Success)
+            {
+                return new CounterOptions
+                {
+                    NumberTemplate = match.Groups["Template"].Value,
+                    ResetCounterType = Enum.Parse<ResetCounterType>(match.Groups["ResetCounterType"].Value),
+                    StartCounterFrom = string.IsNullOrEmpty(match.Groups["StartCounterFrom"].Value) ? 1 : int.Parse(match.Groups["StartCounterFrom"].Value),
+                    CounterIncrement = string.IsNullOrEmpty(match.Groups["CounterIncrement"].Value) ? 1 : int.Parse(match.Groups["CounterIncrement"].Value),
+                };
+            }
+            else
+            {
+                return new CounterOptions { NumberTemplate = template };
+            }
+        }
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
index 0063a4313..3c2da2748 100644
--- a/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
+++ b/src/VirtoCommerce.CoreModule.Core/Common/ITenantUniqueNumberGenerator.cs
@@ -9,10 +9,9 @@ public interface ITenantUniqueNumberGenerator
         /// Generates unique number using given template with resetCounterType for tentantId.
         /// </summary>
         /// <param name="tenantId"></param>
-        /// <param name="numberTemplate"></param>
         /// <param name="counterOptions"></param>
         /// <returns></returns>
-        string GenerateNumber(string tenantId, string numberTemplate, CounterOptions counterOptions);
+        string GenerateNumber(string tenantId, CounterOptions counterOptions);
 
         /// <summary>
         /// Generates unique number using given template for tentantId.
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs
new file mode 100644
index 000000000..805a5b0a3
--- /dev/null
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceNumberGeneratorService.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
+using Polly;
+using Polly.Retry;
+using VirtoCommerce.CoreModule.Core.Common;
+using VirtoCommerce.CoreModule.Data.Model;
+using VirtoCommerce.CoreModule.Data.Repositories;
+
+namespace VirtoCommerce.CoreModule.Data.Services
+{
+    /// <summary>
+    /// Represents sequence number generator using database storage and different policy.
+    /// It generates an unique number using given template, e.g., "PO{0:yyMMdd}-{1:D5}" where
+    /// 
+    /// {0} - date (the UTC time of number generation)
+    /// {1} - the sequence number
+    /// {2} - tenantId
+    /// 
+    /// Also, it supports counter options after @:
+    /// <numberTemplate> or <number_template>@<reset_counter_type>:<start_counter_from>:<counter_increment>
+    /// 
+    /// reset_counter_type - can be one of this value: None, Daily, Weekly, Monthly, Yearly. Default value: Daily
+    /// start_counter_from - positive integer value. Default value: 1
+    /// counter_increment - positive integer value. Default value: 1
+    ///
+    /// Examples:
+    /// PO{1:D5}
+    /// PO{0:yyMMdd}-{1:D5}
+    /// PO{0:yyMMdd}-{1:D5}@Daily
+    /// PO{0:yyMMdd}-{1:D5}@Weekly:1:10
+    /// PO{0:yyMMdd}-{1:D5}@None:1:1
+    /// </summary>
+    public class SequenceNumberGeneratorService : IUniqueNumberGenerator, ITenantUniqueNumberGenerator
+    {
+        private readonly object _lock = new object();
+        private readonly Func<ICoreRepository> _repositoryFactory;
+
+        private readonly SequenceNumberGeneratorOptions _options;
+
+        /// <summary>
+        /// Creates new instance of SequenceUniqueNumberGeneratorService.
+        /// </summary>
+        /// <param name="repositoryFactory"></param>
+        /// <param name="options"></param>
+        public SequenceNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
+            IOptions<SequenceNumberGeneratorOptions> options)
+        {
+            ArgumentNullException.ThrowIfNull(repositoryFactory);
+            ArgumentNullException.ThrowIfNull(options);
+
+            _repositoryFactory = repositoryFactory;
+            _options = options.Value;
+        }
+
+        /// <summary>
+        /// Generates unique number using given template.
+        /// </summary>
+        /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
+        /// <returns></returns>
+        public virtual string GenerateNumber(string numberTemplate)
+        {
+            ArgumentNullException.ThrowIfNull(numberTemplate);
+
+            var counterOptions = CounterOptions.Parse(numberTemplate);
+
+            return GenerateNumber(string.Empty, counterOptions);
+        }
+
+        /// <summary>
+        /// Generates unique number using given template.
+        /// </summary>
+        /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
+        /// <returns></returns>
+        public virtual string GenerateNumber(string tenantId, string numberTemplate)
+        {
+            ArgumentNullException.ThrowIfNull(tenantId);
+            ArgumentNullException.ThrowIfNull(numberTemplate);
+
+            var counterOptions = CounterOptions.Parse(numberTemplate);
+
+            return GenerateNumber(tenantId, counterOptions);
+        }
+
+        /// <summary>
+        /// Requests next counter and Generates unique number using given template and options for tenantId.
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public virtual string GenerateNumber(string tenantId, CounterOptions counterOptions)
+        {
+            ArgumentNullException.ThrowIfNull(tenantId);
+            ArgumentNullException.ThrowIfNull(counterOptions);
+
+            var retryPolicy = ConfigureRetryPolicy();
+
+            lock (_lock)
+            {
+                var counter = 0;
+                var currentDate = GetCurrentUtcDate();
+
+                retryPolicy.Execute(() => counter = RequestNextCounter(tenantId, counterOptions));
+
+                return GenerateNumberInternal(tenantId, counterOptions, currentDate, counter);
+            }
+        }
+
+        /// <summary>
+        /// Generates unique number using given params and options for tenantId.
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="counterOptions"></param>
+        /// <param name="currentDate"></param>
+        /// <param name="counter"></param>
+        /// <returns></returns>
+        protected virtual string GenerateNumberInternal(string tenantId, CounterOptions counterOptions, DateTime currentDate, int counter)
+        {
+            return string.Format(counterOptions.NumberTemplate, currentDate, counter, tenantId);
+        }
+
+        /// <summary>
+        /// Configures retry policy for database operations.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual RetryPolicy ConfigureRetryPolicy()
+        {
+            return Policy.Handle<DbUpdateConcurrencyException>()
+                .Or<InvalidOperationException>()
+                .WaitAndRetry(retryCount: _options.RetryCount, _ => TimeSpan.FromMilliseconds(_options.RetryDelay));
+        }
+
+        /// <summary>
+        /// Requests next counter for given number template.
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="numberTemplate"></param>
+        /// <param name="counterOptions"></param>
+        /// <returns></returns>
+        protected virtual int RequestNextCounter(string tenantId, CounterOptions counterOptions)
+        {
+            var sequenceKey = string.IsNullOrEmpty(tenantId) ? counterOptions.NumberTemplate : $"{tenantId}/{counterOptions.NumberTemplate}";
+
+            using var repository = _repositoryFactory();
+            var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == sequenceKey);
+
+            if (sequence != null)
+            {
+                var lastResetDate = sequence.ModifiedDate ?? GetCurrentUtcDate();
+
+                if (ShouldResetCounter(lastResetDate, counterOptions.ResetCounterType))
+                {
+                    sequence.Value = counterOptions.StartCounterFrom;
+                }
+                else
+                {
+                    sequence.Value += counterOptions.CounterIncrement;
+                }
+
+                sequence.ModifiedDate = GetCurrentUtcDate();
+            }
+            else
+            {
+                sequence = new SequenceEntity
+                {
+                    ObjectType = sequenceKey,
+                    Value = counterOptions.StartCounterFrom,
+                    ModifiedDate = GetCurrentUtcDate()
+                };
+                repository.Add(sequence);
+            }
+
+            repository.UnitOfWork.Commit();
+
+            return sequence.Value;
+        }
+
+        /// <summary>
+        /// Returns true if counter should be reset.
+        /// </summary>
+        /// <param name="lastResetDate"></param>
+        /// <param name="resetCounterType"></param>
+        /// <returns></returns>
+        protected virtual bool ShouldResetCounter(DateTime lastResetDate, ResetCounterType resetCounterType)
+        {
+            var currentUtcDate = GetCurrentUtcDate();
+
+            switch (resetCounterType)
+            {
+                case ResetCounterType.Daily:
+                    return currentUtcDate.Date > lastResetDate.Date;
+                case ResetCounterType.Weekly:
+                    // Reset every Monday
+                    int daysUntilTargetDay = ((int)DayOfWeek.Monday - (int)lastResetDate.DayOfWeek + 7) % 7;
+                    var nextMondayDate = lastResetDate.Date.AddDays(daysUntilTargetDay);
+                    return currentUtcDate >= nextMondayDate;
+                case ResetCounterType.Monthly:
+                    // Reset on first day of the month
+                    return currentUtcDate.Month > lastResetDate.Month || currentUtcDate.Year > lastResetDate.Year;
+                case ResetCounterType.Yearly:
+                    // Reset on first day of the year 
+                    return currentUtcDate.Year > lastResetDate.Year;
+                case ResetCounterType.None:
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Returns current UTC date. Allows to override for testing purposes.
+        /// </summary>
+        /// <returns></returns>
+        protected virtual DateTime GetCurrentUtcDate()
+        {
+            return DateTime.UtcNow;
+        }
+    }
+}
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
index b5a3acb45..06d8d7c89 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/SequenceUniqueNumberGeneratorService.cs
@@ -1,234 +1,175 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Polly;
-using Polly.Retry;
 using VirtoCommerce.CoreModule.Core.Common;
 using VirtoCommerce.CoreModule.Data.Model;
 using VirtoCommerce.CoreModule.Data.Repositories;
 
 namespace VirtoCommerce.CoreModule.Data.Services
 {
-    /// <summary>
-    /// Represents unique number generator using database storage.
-    /// It generates an unique number using given template, e.g., "PO{0:yyMMdd}-{1:D5}" where
-    /// 
-    /// {0} - date (the UTC time of number generation)
-    /// {1} - the sequence number
-    /// {2} - tenantId
-    /// 
-    /// Also, it supports counter options after @:
-    /// <numberTemplate> or <number_template>@<reset_counter_type>:<start_counter_from>:<counter_increment>
-    /// 
-    /// reset_counter_type - can be one of this value: None, Daily, Weekly, Monthly, Yearly. Default value: Daily
-    /// start_counter_from - positive integer value. Default value: 1
-    /// counter_increment - positive integer value. Default value: 1
-    ///
-    /// Examples:
-    /// PO{1:D5}
-    /// PO{0:yyMMdd}-{1:D5}
-    /// PO{0:yyMMdd}-{1:D5}@Daily
-    /// PO{0:yyMMdd}-{1:D5}@Weekly:1:10
-    /// PO{0:yyMMdd}-{1:D5}@None:1:1
-    /// </summary>
-    public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator, ITenantUniqueNumberGenerator
+    [Obsolete("Use SequenceNumberGeneratorService", DiagnosticId = "VC0008", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions/")]
+    public class SequenceUniqueNumberGeneratorService : IUniqueNumberGenerator
     {
-        private readonly object _lock = new object();
+
+        //How many sequence items will be stored in-memory
+        public const int SequenceReservationRange = 100;
+        public const int DefaultSequenceStartValue = 1;
+
         private readonly Func<ICoreRepository> _repositoryFactory;
+        private static readonly object _sequenceLock = new object();
+        private static readonly InMemorySequenceList _inMemorySequences = new InMemorySequenceList();
 
-        private readonly SequenceNumberGeneratorOptions _options;
 
-        /// <summary>
-        /// Creates new instance of SequenceUniqueNumberGeneratorService.
-        /// </summary>
-        /// <param name="repositoryFactory"></param>
-        /// <param name="options"></param>
-        public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory,
-            IOptions<SequenceNumberGeneratorOptions> options)
+        public SequenceUniqueNumberGeneratorService(Func<ICoreRepository> repositoryFactory)
         {
-            ArgumentNullException.ThrowIfNull(repositoryFactory);
-            ArgumentNullException.ThrowIfNull(options);
-
             _repositoryFactory = repositoryFactory;
-            _options = options.Value;
         }
 
         /// <summary>
-        /// Generates unique number using given template.
+        /// Generates unique number using given template, e.g., GenerateNumber("Order{0:yyMMdd}-{1:D5}");
         /// </summary>
         /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
         /// <returns></returns>
-        public virtual string GenerateNumber(string numberTemplate)
+        public string GenerateNumber(string numberTemplate)
         {
-            ArgumentNullException.ThrowIfNull(numberTemplate);
-
+            lock (_sequenceLock)
+            {
+                _inMemorySequences[numberTemplate] = _inMemorySequences[numberTemplate] ?? new InMemorySequence(numberTemplate);
 
-            string resolvedNumberTemplate;
-            var templateOptions = ResolveTemplateOptionsFromTemplate(numberTemplate, out resolvedNumberTemplate);
+                if (_inMemorySequences[numberTemplate].IsEmpty || _inMemorySequences[numberTemplate].HasExpired)
+                {
+                    const int maxTransactionRetries = 3;
+
+                    for (var retryCount = 0; retryCount < maxTransactionRetries; retryCount++)
+                    {
+                        try
+                        {
+                            InitCounters(numberTemplate, out var startCounter, out var endCounter);
+                            _inMemorySequences[numberTemplate].Pregenerate(startCounter, endCounter, numberTemplate);
+                            break;
+                        }
+                        catch (Exception)
+                        {
+                            // Catching base Exception as any db exception thrown as FaultException.
+                        }
+                    }
+                }
 
-            return GenerateNumber(string.Empty, resolvedNumberTemplate, templateOptions);
+                return string.Format(_inMemorySequences[numberTemplate].Next());
+            }
         }
 
-        /// <summary>
-        /// Generates unique number using given template.
-        /// </summary>
-        /// <param name="numberTemplate">The number template. Pass the format to be used in string.Format function. Passable parameters: 0 - date (the UTC time of number generation); 1 - the sequence number.</param>
-        /// <returns></returns>
-        public virtual string GenerateNumber(string tenantId, string numberTemplate)
+        private void InitCounters(string objectType, out int startCounter, out int endCounter)
         {
-            ArgumentNullException.ThrowIfNull(tenantId);
-            ArgumentNullException.ThrowIfNull(numberTemplate);
-
-            string resolvedNumberTemplate;
-            var templateOptions = ResolveTemplateOptionsFromTemplate(numberTemplate, out resolvedNumberTemplate);
+            //Update Sequences in database
+            using (var repository = _repositoryFactory())
+            {
+                var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == objectType);
+                var originalModifiedDate = sequence?.ModifiedDate;
 
-            return GenerateNumber(tenantId, resolvedNumberTemplate, templateOptions);
-        }
+                if (sequence != null)
+                {
+                    sequence.ModifiedDate = DateTime.UtcNow;
+                }
+                else
+                {
+                    sequence = new SequenceEntity { ObjectType = objectType, Value = DefaultSequenceStartValue, ModifiedDate = DateTime.UtcNow };
+                    repository.Add(sequence);
+                }
 
-        /// <summary>
-        /// Generates unique number using given template and options for tenantId.
-        /// </summary>
-        /// <param name="tenantId"></param>
-        /// <param name="numberTemplate"></param>
-        /// <param name="options"></param>
-        /// <returns></returns>
-        public virtual string GenerateNumber(string tenantId, string numberTemplate, CounterOptions counterOptions)
-        {
-            ArgumentNullException.ThrowIfNull(tenantId);
-            ArgumentNullException.ThrowIfNull(numberTemplate);
-            ArgumentNullException.ThrowIfNull(counterOptions);
 
-            var retryPolicy = ConfigureRetryPolicy();
+                repository.UnitOfWork.Commit();
+                //Refresh data to make sure we have latest value in case another transaction was locked
+                //repository.Refresh(repository.Sequences);
+                sequence = repository.Sequences.Single(s => s.ObjectType == objectType);
+                startCounter = sequence.Value;
 
-            lock (_lock)
-            {
-                var currentDate = DateTime.Now;
-                var counter = 0;
+                //Sequence in database has expired?
+                if (originalModifiedDate.HasValue && originalModifiedDate.Value.Date < DateTime.UtcNow.Date)
+                {
+                    startCounter = DefaultSequenceStartValue;
+                }
 
-                retryPolicy.Execute(() => counter = RequestNextCounter(tenantId, numberTemplate, counterOptions));
+                try
+                {
+                    endCounter = checked(startCounter + SequenceReservationRange);
+                }
+                catch (OverflowException)
+                {
+                    //need to reset
+                    startCounter = DefaultSequenceStartValue;
+                    endCounter = SequenceReservationRange;
+                }
 
-                return string.Format(numberTemplate, currentDate, counter, tenantId);
+                sequence.Value = endCounter;
+                repository.UnitOfWork.Commit();
             }
         }
 
-        protected virtual CounterOptions ResolveTemplateOptionsFromTemplate(string numberTemplate, out string resolvedNumberTemplate)
+        private class InMemorySequence
         {
-            var match = Regex.Match(numberTemplate, @"(?<Template>[^@]+)@(?<ResetCounterType>None|Daily|Weekly|Monthly|Yearly)(:(?<StartCounterFrom>\d+))?(:(?<CounterIncrement>\d+))?", RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            private readonly string _type;
+            private Stack<string> _sequence = new Stack<string>();
+            private DateTime? _lastGenerationDateTime;
 
-            if (match.Success)
+            public InMemorySequence(string type)
             {
-                resolvedNumberTemplate = match.Groups["Template"].Value;
-
-                return new CounterOptions
-                {
-                    ResetCounterType = Enum.Parse<ResetCounterType>(match.Groups["ResetCounterType"].Value),
-                    StartCounterFrom = string.IsNullOrEmpty(match.Groups["StartCounterFrom"].Value) ? 1 : int.Parse(match.Groups["StartCounterFrom"].Value),
-                    CounterIncrement = string.IsNullOrEmpty(match.Groups["CounterIncrement"].Value) ? 1 : int.Parse(match.Groups["CounterIncrement"].Value),
-                };
+                _type = type;
             }
-            else
+
+            public string ObjectType
             {
-                resolvedNumberTemplate = numberTemplate;
-                return new CounterOptions();
+                get { return _type; }
             }
-        }
-
-        /// <summary>
-        /// Configures retry policy for database operations.
-        /// </summary>
-        /// <returns></returns>
-        protected virtual RetryPolicy ConfigureRetryPolicy()
-        {
-            return Policy.Handle<DbUpdateConcurrencyException>()
-                .Or<InvalidOperationException>()
-                .WaitAndRetry(retryCount: _options.RetryCount, _ => TimeSpan.FromMilliseconds(_options.RetryDelay));
-        }
 
-        /// <summary>
-        /// Requests next counter for given number template.
-        /// </summary>
-        /// <param name="tenantId"></param>
-        /// <param name="numberTemplate"></param>
-        /// <param name="counterOptions"></param>
-        /// <returns></returns>
-        protected virtual int RequestNextCounter(string tenantId, string numberTemplate, CounterOptions counterOptions)
-        {
-            var objectType = string.IsNullOrEmpty(tenantId) ? numberTemplate : $"{tenantId}/{numberTemplate}";
+            public bool HasExpired
+            {
+                get { return _lastGenerationDateTime.HasValue && _lastGenerationDateTime.Value.Date < DateTime.UtcNow.Date; }
+            }
 
-            using var repository = _repositoryFactory();
-            var sequence = repository.Sequences.SingleOrDefault(s => s.ObjectType == objectType);
+            public bool IsEmpty
+            {
+                get { return _sequence.Count == 0; }
+            }
 
-            if (sequence != null)
+            public string Next()
             {
-                var lastResetDate = sequence.ModifiedDate ?? GetCurrentUtcDate();
+                return _sequence.Pop();
+            }
 
-                if (ShouldResetCounter(lastResetDate, counterOptions.ResetCounterType))
-                {
-                    sequence.Value = counterOptions.StartCounterFrom;
-                }
-                else
+            public void Pregenerate(int startCount, int endCount, string numberTemplate)
+            {
+                _lastGenerationDateTime = DateTime.UtcNow;
+                var generatedItems = new Stack<string>();
+                for (var index = startCount; index < endCount; index++)
                 {
-                    sequence.Value += counterOptions.CounterIncrement;
+                    generatedItems.Push(string.Format(numberTemplate, _lastGenerationDateTime.Value, index));
                 }
 
-                sequence.ModifiedDate = GetCurrentUtcDate();
-            }
-            else
-            {
-                sequence = new SequenceEntity
-                {
-                    ObjectType = numberTemplate,
-                    Value = counterOptions.StartCounterFrom,
-                    ModifiedDate = GetCurrentUtcDate()
-                };
-                repository.Add(sequence);
+                //This revereses the sequence
+                _sequence = new Stack<string>(generatedItems);
             }
-
-            repository.UnitOfWork.Commit();
-
-            return sequence.Value;
         }
 
-        /// <summary>
-        /// Returns true if counter should be reset.
-        /// </summary>
-        /// <param name="lastResetDate"></param>
-        /// <param name="resetCounterType"></param>
-        /// <returns></returns>
-        protected virtual bool ShouldResetCounter(DateTime lastResetDate, ResetCounterType resetCounterType)
+        private class InMemorySequenceList : List<InMemorySequence>
         {
-            var currentUtcDate = GetCurrentUtcDate();
-
-            switch (resetCounterType)
+            public InMemorySequence this[string type]
             {
-                case ResetCounterType.Daily:
-                    return currentUtcDate.Date > lastResetDate.Date;
-                case ResetCounterType.Weekly:
-                    // Reset every Monday
-                    int daysUntilTargetDay = ((int)DayOfWeek.Monday - (int)lastResetDate.DayOfWeek + 7) % 7;
-                    var nextMondayDate = lastResetDate.Date.AddDays(daysUntilTargetDay);
-                    return currentUtcDate >= nextMondayDate;
-                case ResetCounterType.Monthly:
-                    // Reset on first day of the month
-                    return currentUtcDate.Month > lastResetDate.Month || currentUtcDate.Year > lastResetDate.Year;
-                case ResetCounterType.Yearly:
-                    // Reset on first day of the year 
-                    return currentUtcDate.Year > lastResetDate.Year;
-                case ResetCounterType.None:
-                default:
-                    return false;
-            }
-        }
+                get
+                {
+                    return this.FirstOrDefault(i => i.ObjectType.Equals(type, StringComparison.OrdinalIgnoreCase));
+                }
+                set
+                {
+                    var exitingItem = this[type];
 
-        /// <summary>
-        /// Returns current UTC date. Allows to override for testing purposes.
-        /// </summary>
-        /// <returns></returns>
-        protected virtual DateTime GetCurrentUtcDate()
-        {
-            return DateTime.UtcNow;
+                    if (exitingItem != null)
+                    {
+                        Remove(exitingItem);
+                    }
+                    Add(value);
+                }
+            }
         }
     }
 }
diff --git a/src/VirtoCommerce.CoreModule.Data/Services/TimeBasedNumberGenerator.cs b/src/VirtoCommerce.CoreModule.Data/Services/TimeBasedNumberGenerator.cs
index e933505a6..6fe43d96d 100644
--- a/src/VirtoCommerce.CoreModule.Data/Services/TimeBasedNumberGenerator.cs
+++ b/src/VirtoCommerce.CoreModule.Data/Services/TimeBasedNumberGenerator.cs
@@ -6,6 +6,7 @@
 
 namespace VirtoCommerce.CoreModule.Data.Services
 {
+    [Obsolete("Use SequenceNumberGeneratorService", DiagnosticId = "VC0008", UrlFormat = "https://docs.virtocommerce.org/products/products-virto3-versions/")]
     public class TimeBasedNumberGenerator : IUniqueNumberGenerator
     {
 
diff --git a/src/VirtoCommerce.CoreModule.Web/Module.cs b/src/VirtoCommerce.CoreModule.Web/Module.cs
index 65e0f93cc..2eb55f760 100644
--- a/src/VirtoCommerce.CoreModule.Web/Module.cs
+++ b/src/VirtoCommerce.CoreModule.Web/Module.cs
@@ -68,8 +68,8 @@ public void Initialize(IServiceCollection serviceCollection)
             //Can be overridden
             serviceCollection.AddTransient<ISeoDuplicatesDetector, NullSeoDuplicateDetector>();
             serviceCollection.AddTransient<CoreExportImport>();
-            serviceCollection.AddTransient<IUniqueNumberGenerator, SequenceUniqueNumberGeneratorService>();
-            serviceCollection.AddTransient<ITenantUniqueNumberGenerator, SequenceUniqueNumberGeneratorService>();
+            serviceCollection.AddTransient<IUniqueNumberGenerator, SequenceNumberGeneratorService>();
+            serviceCollection.AddTransient<ITenantUniqueNumberGenerator, SequenceNumberGeneratorService>();
 
             serviceCollection.AddTransient<CompositeSeoBySlugResolver>();
 
diff --git a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
similarity index 76%
rename from tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
rename to tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
index 40d173ac2..f868d08aa 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/UniqueNumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
@@ -12,7 +12,7 @@
 
 namespace VirtoCommerce.CoreModule.Tests
 {
-    public class CustomDateSequenceUniqueNumberGeneratorService : SequenceUniqueNumberGeneratorService
+    public class CustomDateSequenceUniqueNumberGeneratorService : SequenceNumberGeneratorService
     {
         public DateTime CurrentUtcDate { get; set; }
 
@@ -28,7 +28,7 @@ protected override DateTime GetCurrentUtcDate()
         }
     }
 
-    public class UniqueNumberGeneratorTest
+    public class NumberGeneratorTest
     {
         [Fact]
         [Trait("Category", "IntegrationTest")]
@@ -39,13 +39,44 @@ public void IntegrationTestWithSqlServer()
             var optionsBuilder = new DbContextOptionsBuilder<CoreDbContext>();
             optionsBuilder.UseSqlServer(connectionString);
 
-            var generator = new SequenceUniqueNumberGeneratorService(() => new CoreRepositoryImpl(new CoreDbContext(optionsBuilder.Options)),
+            var generator = new SequenceNumberGeneratorService(() => new CoreRepositoryImpl(new CoreDbContext(optionsBuilder.Options)),
                 Options.Create(new SequenceNumberGeneratorOptions()));
 
             var number = generator.GenerateNumber("PO{0:yyMMdd}-{1:D5}");
             Assert.NotNull(number);
         }
 
+        [Theory]
+        [InlineData("{1}", "{1}", ResetCounterType.Daily, 1, 1)]
+        [InlineData("PO-{1:D5}", "PO-{1:D5}", ResetCounterType.Daily, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Daily, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.None, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Daily", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Daily, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Weekly", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Weekly, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Monthly", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Monthly, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Yearly", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Yearly, 1, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:5", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.None, 5, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Daily:55", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Daily, 55, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Weekly:555", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Weekly, 555, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Monthly:5555", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Monthly, 5555, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Yearly:55555", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Yearly, 55555, 1)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@None:5:8", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.None, 5, 8)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Daily:55:88", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Daily, 55, 88)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Weekly:555:888", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Weekly, 555, 888)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Monthly:5555:8888", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Monthly, 5555, 8888)]
+        [InlineData("CO{0:yyMMdd}-{1:D5}@Yearly:55555:88888", "CO{0:yyMMdd}-{1:D5}", ResetCounterType.Yearly, 55555, 88888)]
+        public void GenerateNumber_ShouldParseCounterOptionsWithDifferentParameters(string template,
+            string numberTemplate, ResetCounterType resetCounterType, int startCounterFrom, int counterIncrement)
+        {
+            var counterOptions = CounterOptions.Parse(template);
+
+            // Assert
+            Assert.Equal(numberTemplate, counterOptions.NumberTemplate);
+            Assert.Equal(resetCounterType, counterOptions.ResetCounterType);
+            Assert.Equal(startCounterFrom, counterOptions.StartCounterFrom);
+            Assert.Equal(counterIncrement, counterOptions.CounterIncrement);
+        }
+
         [Theory]
         [InlineData("{1}", "778")]
         [InlineData("PO-{1:D5}", "PO-00778")]
@@ -188,8 +219,13 @@ public void GenerateNumber_ResetCounter(DateTime lastResetDate, DateTime current
                 currentDate);
 
             // Act
-            var generatedNumber = numberGeneratorService.GenerateNumber(tenantId, template,
-                new CounterOptions { ResetCounterType = resetCounterType });
+            var generatedNumber = numberGeneratorService.GenerateNumber(
+                tenantId,
+                new CounterOptions
+                {
+                    NumberTemplate = template,
+                    ResetCounterType = resetCounterType
+                });
 
             // Assert
             Assert.Equal(expected, generatedNumber);

From 9c7df741dcc9b0fdddaa4fd4fd1aeb953d4884b4 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Wed, 31 Jan 2024 21:26:47 +0200
Subject: [PATCH 11/11] fix code smell

---
 tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs b/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
index f868d08aa..775708ba8 100644
--- a/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
+++ b/tests/VirtoCommerce.CoreModule.Tests/NumberGeneratorTest.cs
@@ -88,7 +88,7 @@ public void GenerateNumber_ShouldParseCounterOptionsWithDifferentParameters(stri
         [InlineData("CO{0:yyMMdd}-{1:D5}@None:1:100", "CO240126-00877")]
         public void GenerateNumber_ShouldGenerateUniqueNumbersWithDifferentParameters(string template, string expected)
         {
-            var objectType = template.Contains("@") ? template.Substring(0, template.IndexOf("@")) : template;
+            var objectType = template.Contains('@') ? template.Substring(0, template.IndexOf('@')) : template;
             // Arrange
             var sequenceEntity = new SequenceEntity { ObjectType = objectType, Value = 777, ModifiedDate = DateTime.UtcNow };