diff --git a/.gitignore b/.gitignore
index d745ade..bb552ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -369,3 +369,4 @@ FodyWeavers.xsd
.idea/
Imports/
+.idea/
diff --git a/.idea/.idea.DataImport/.idea/.gitignore b/.idea/.idea.DataImport/.idea/.gitignore
deleted file mode 100644
index 3697fcf..0000000
--- a/.idea/.idea.DataImport/.idea/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Rider ignored files
-/modules.xml
-/contentModel.xml
-/projectSettingsUpdater.xml
-/.idea.DataImport.iml
-# Ignored default folder with query files
-/queries/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/.idea.DataImport/.idea/encodings.xml b/.idea/.idea.DataImport/.idea/encodings.xml
deleted file mode 100644
index df87cf9..0000000
--- a/.idea/.idea.DataImport/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.DataImport/.idea/indexLayout.xml b/.idea/.idea.DataImport/.idea/indexLayout.xml
deleted file mode 100644
index 7c38c58..0000000
--- a/.idea/.idea.DataImport/.idea/indexLayout.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- ../../Backend
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/.idea.DataImport/.idea/vcs.xml b/.idea/.idea.DataImport/.idea/vcs.xml
deleted file mode 100644
index 254e5f3..0000000
--- a/.idea/.idea.DataImport/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DataImport.API/Controllers/CountryController.cs b/DataImport.API/Controllers/CountryController.cs
index 035444a..20a2a65 100644
--- a/DataImport.API/Controllers/CountryController.cs
+++ b/DataImport.API/Controllers/CountryController.cs
@@ -1,5 +1,6 @@
using DataImport.API.Controllers.BaseController;
using DataImport.Commands.Queries;
+using DataImport.Data.Enums; // <-- add this
namespace DataImport.API.Controllers;
@@ -7,6 +8,7 @@ namespace DataImport.API.Controllers;
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 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 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);