Update Iban index and related queries

The uniqueness index for Iban in the AddressBookRecord model has been extended to include the IbanType. Previously, the uniqueness was only enforced on the Iban. Now it is on the combination of OwnerClientId, Iban, and IbanType. This change has also been reflected in related queries and services, and the database migration file has been created for this adjustment.

Author: pylypenko-smplt

src/Service.AddressBook.Domain/IAddressBookRepository.cs

@@ -9,7 +9,7 @@ public interface IAddressBookRepository
     Task<AddressBookRecord> GetAsync(string contactId);
     Task<AddressBookRecord> GetByNicknameAsync(string ownerClientId, string nickname);
     Task<AddressBookRecord> GetByNameAsync(string ownerClientId, string name);
-    Task<AddressBookRecord> GetByIbanAsync(string ownerClientId, string iban);
+    Task<AddressBookRecord> GetByIbanAsync(string ownerClientId, string iban, IbanType type);
 
     Task<List<AddressBookRecord>> GetListAsync(string ownerClientId, int skip, int take, bool withIban,
         bool withNickname, IbanType? requestIbanType = null);

src/Service.AddressBook.Postgres/DatabaseContext.cs

@@ -29,7 +29,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<AddressBookRecord>().HasIndex(e => new {e.OwnerClientId, e.Nickname}).IsUnique();
             modelBuilder.Entity<AddressBookRecord>().HasIndex(e => new {e.OwnerClientId, e.Name}).IsUnique();
-            modelBuilder.Entity<AddressBookRecord>().HasIndex(e => new {e.OwnerClientId, e.Iban}).IsUnique();
+            modelBuilder.Entity<AddressBookRecord>().HasIndex(e => new {e.OwnerClientId, e.Iban, e.IbanType}).IsUnique();
 
             base.OnModelCreating(modelBuilder);
         }

src/Service.AddressBook.Postgres/Migrations/20231212154538_Index.Designer.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Service.AddressBook.Postgres.Migrations
+{
+    /// <inheritdoc />
+    public partial class Index : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_addressbook_OwnerClientId_Iban",
+                schema: "addressbook",
+                table: "addressbook");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_addressbook_OwnerClientId_Iban_IbanType",
+                schema: "addressbook",
+                table: "addressbook",
+                columns: new[] { "OwnerClientId", "Iban", "IbanType" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_addressbook_OwnerClientId_Iban_IbanType",
+                schema: "addressbook",
+                table: "addressbook");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_addressbook_OwnerClientId_Iban",
+                schema: "addressbook",
+                table: "addressbook",
+                columns: new[] { "OwnerClientId", "Iban" },
+                unique: true);
+        }
+    }
+}

src/Service.AddressBook.Postgres/Migrations/20231212154538_Index.cs

@@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasDefaultSchema("addressbook")
-                .HasAnnotation("ProductVersion", "7.0.13")
+                .HasAnnotation("ProductVersion", "8.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -72,15 +72,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("ContactId");
 
-                    b.HasIndex("OwnerClientId", "Iban")
-                        .IsUnique();
-
                     b.HasIndex("OwnerClientId", "Name")
                         .IsUnique();
 
                     b.HasIndex("OwnerClientId", "Nickname")
                         .IsUnique();
 
+                    b.HasIndex("OwnerClientId", "Iban", "IbanType")
+                        .IsUnique();
+
                     b.ToTable("addressbook", "addressbook");
                 });
 #pragma warning restore 612, 618

src/Service.AddressBook.Postgres/Migrations/DatabaseContextModelSnapshot.cs

@@ -43,9 +43,10 @@ public async Task<AddressBookRecord> GetByNameAsync(string ownerClientId, string
             return _records.FirstOrDefault(t => t.OwnerClientId == ownerClientId && t.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
         }
 
-        public async Task<AddressBookRecord> GetByIbanAsync(string ownerClientId, string iban)
+        public async Task<AddressBookRecord> GetByIbanAsync(string ownerClientId, string iban, IbanType type)
         {
-            return _records.FirstOrDefault(t => t.OwnerClientId == ownerClientId && t.Iban == iban);
+            return _records.FirstOrDefault(
+                t => t.OwnerClientId == ownerClientId && t.Iban == iban && t.IbanType == type);
         }
 
         public async Task<List<AddressBookRecord>> GetListAsync(string ownerClientId, int skip, int take, bool withIban,

src/Service.AddressBook/Services/AddressBookRepositoryMemoryCache.cs

@@ -245,17 +245,17 @@ public async Task<OperationResponse> CreateWithIbanAsync(AddIbanRequest request)
             _logger.LogInformation("Requested create for client {clientId} and iban {iban}", request.OwnerClientId, request.Iban);
             try
             {
-                // var existingRecord =
-                //     await _addressBookRepository.GetByIbanAsync(request.OwnerClientId, request.Iban);
-                // if (existingRecord != null)
-                //     return new OperationResponse()
-                //     {
-                //         IsSuccess = false,
-                //         ErrorMessage = "Record already exists",
-                //         ErrorCode = GlobalSendErrorCode.IbanAlreadyUsed
-                //     };
+                var existingRecord =
+                    await _addressBookRepository.GetByIbanAsync(request.OwnerClientId, request.Iban, request.IbanType);
+                if (existingRecord != null)
+                    return new OperationResponse()
+                    {
+                        IsSuccess = false,
+                        ErrorMessage = "Record already exists",
+                        ErrorCode = GlobalSendErrorCode.IbanAlreadyUsed
+                    };
 
-                var existingRecord = await _addressBookRepository.GetByNameAsync(request.OwnerClientId, request.Name);
+                existingRecord = await _addressBookRepository.GetByNameAsync(request.OwnerClientId, request.Name);
                 if (existingRecord != null)
                     return new OperationResponse()
                     {
@@ -388,15 +388,15 @@ public async Task<OperationResponse> UpdateContactAsync(UpdateContactRequest req
 
                 if(!string.IsNullOrWhiteSpace(request.Iban))
                 {
-                    // var existing = await _addressBookRepository.GetByIbanAsync(request.OwnerClientId, request.Iban);
-                    // if (existing != null && existing.ContactId != request.ContactId)
-                    // {
-                    //     return new OperationResponse()
-                    //     {
-                    //         IsSuccess = false,
-                    //         ErrorCode = GlobalSendErrorCode.IbanAlreadyUsed
-                    //     };
-                    // }
+                    var existing = await _addressBookRepository.GetByIbanAsync(request.OwnerClientId, request.Iban, record.IbanType);
+                    if (existing != null && existing.ContactId != request.ContactId)
+                    {
+                        return new OperationResponse()
+                        {
+                            IsSuccess = false,
+                            ErrorCode = GlobalSendErrorCode.IbanAlreadyUsed
+                        };
+                    }
 
                     request.Iban = request.Iban.ToUpper().Replace(" ","");