Feature/country controller update

.gitignore

@@ -369,3 +369,4 @@ FodyWeavers.xsd
 
 .idea/
 Imports/
+.idea/

DataImport.API/Controllers/CountryController.cs

@@ -1,12 +1,14 @@
 using DataImport.API.Controllers.BaseController;
 using DataImport.Commands.Queries;
+using DataImport.Data.Enums;   // <-- add this
 
 namespace DataImport.API.Controllers;
 
 [Route("api/v{version:apiVersion}/[controller]")]
 public class CountryController : ApiControllerBasev1
 {
     private readonly IMediator _mediator;
+
     public CountryController(IMediator mediator)
     {
         _mediator = mediator;
@@ -15,30 +17,29 @@ public CountryController(IMediator mediator)
     [HttpPost]
     [Route("get-count-by-country")]
     public async Task<IActionResult> GetCountryCount(
-        [FromQuery] GetCountryCountQuery request,
+        [FromQuery] Country country,
         CancellationToken ct)
     {
-        if (string.IsNullOrWhiteSpace(request?.country.ToString()))
-            return BadRequest("Country name is required");
-
-        var result = await _mediator.Send(
-            new GetCountryCountQuery(request.country),
-            ct);
+        if (!Enum.IsDefined(typeof(Country), country))
+            return BadRequest("Valid country is required");
 
+        var result = await _mediator.Send(new GetCountryCountQuery(country), ct);
         return Ok(result);
     }
 
     [HttpPost]
     [Route("get-sanctions-by-country")]
     public async Task<IActionResult> GetCountrySanctionsPaged(
-        [FromQuery] GetCountrySanctionsPagedQuery request,
-        CancellationToken ct)
+        [FromQuery] Country country,
+        [FromQuery] int pageSize = 20,
+        [FromQuery] int page = 1,
+        CancellationToken ct = default)
     {
-        if (string.IsNullOrWhiteSpace(request?.country.ToString()))
-            return BadRequest("Country name is required");
+        if (!Enum.IsDefined(typeof(Country), country))
+            return BadRequest("Valid country is required");
 
         var result = await _mediator.Send(
-            new GetCountrySanctionsPagedQuery(request.country),
+            new GetCountrySanctionsPagedQuery(country, pageSize, page),
             ct);
 
         return Ok(result);

DataImport.Data/Migrations/20260920014844_AddedFieldsForDelisting.cs

@@ -0,0 +1,82 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DataImport.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedFieldsForDelisting : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "ContentHash",
+                table: "SanctionDetails",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsActive",
+                table: "SanctionDetails",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastSeenAtUtc",
+                table: "SanctionDetails",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "RemovedAtUtc",
+                table: "SanctionDetails",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "Removed",
+                table: "DataImportLogs",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_SanctionDetails_IsActive_SdnType_LastName",
+                table: "SanctionDetails",
+                columns: new[] { "IsActive", "SdnType", "LastName" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_SanctionDetails_IsActive_SdnType_LastName",
+                table: "SanctionDetails");
+
+            migrationBuilder.DropColumn(
+                name: "ContentHash",
+                table: "SanctionDetails");
+
+            migrationBuilder.DropColumn(
+                name: "IsActive",
+                table: "SanctionDetails");
+
+            migrationBuilder.DropColumn(
+                name: "LastSeenAtUtc",
+                table: "SanctionDetails");
+
+            migrationBuilder.DropColumn(
+                name: "RemovedAtUtc",
+                table: "SanctionDetails");
+
+            migrationBuilder.DropColumn(
+                name: "Removed",
+                table: "DataImportLogs");
+        }
+    }
+}

DataImport.Data/Migrations/SanctionsDbContextModelSnapshot.cs

@@ -42,6 +42,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("RanAtUtc")
                         .HasColumnType("datetime2");
 
+                    b.Property<int>("Removed")
+                        .HasColumnType("int");
+
                     b.Property<bool>("Succeeded")
                         .HasColumnType("bit");
 
@@ -69,6 +72,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("ContentHash")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Country")
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
@@ -80,16 +87,25 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("ImportedAtUtc")
                         .HasColumnType("datetime2");
 
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
                     b.Property<string>("LastName")
                         .IsRequired()
                         .HasMaxLength(350)
                         .HasColumnType("nvarchar(350)");
 
+                    b.Property<DateTime>("LastSeenAtUtc")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("RecordUniqueId")
                         .IsRequired()
                         .HasMaxLength(100)
                         .HasColumnType("nvarchar(100)");
 
+                    b.Property<DateTime?>("RemovedAtUtc")
+                        .HasColumnType("datetime2");
+
                     b.Property<string>("SdnType")
                         .IsRequired()
                         .HasMaxLength(20)
@@ -106,6 +122,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("SdnType", "LastName");
 
+                    b.HasIndex("IsActive", "SdnType", "LastName");
+
                     b.ToTable("SanctionDetails");
                 });
 #pragma warning restore 612, 618

DataImport.Data/Models/DataImportLog.cs

@@ -17,9 +17,9 @@ public class DataImportLog
         public int Inserted { get; set; }
         public int Updated { get; set; }
         public int Unchanged { get; set; }
-        public bool WasDownloaded { get; set; } 
+        public int Removed { get; set; }
+        public bool WasDownloaded { get; set; }
         public bool Succeeded { get; set; }
-        public string? ErrorMessage { get; set; } 
-
+        public string? ErrorMessage { get; set; }
     }
 }