Feature/473710 Common Data Integration

src/EPR.RegulatorService.Facade.API/Controllers/OrganisationRegistrationSubmissionsController.cs

@@ -99,15 +99,15 @@ public async Task<IActionResult> GetRegistrationSubmissionList(
                 return ValidationProblem();
             }
 
-            var result = await organisationRegistrationSubmissionService.HandleGetRegistrationSubmissionList(filter);
+            var result = await organisationRegistrationSubmissionService.HandleGetRegistrationSubmissionList(filter, User.UserId());
 
             return Ok(result);
         }
         catch (Exception ex)
         {
             logger.LogError(ex, $"Exception during {nameof(GetRegistrationSubmissionList)}");
             return Problem($"Exception occured processing {nameof(GetRegistrationSubmissionList)}",
-                HttpContext.Request.Path,
+                HttpContext?.Request?.Path,
                 StatusCodes.Status500InternalServerError);
         }
     }
@@ -128,9 +128,9 @@ public async Task<IActionResult> GetRegistrationSubmissionDetails([Required] Gui
             }
 
             var result =
-                await organisationRegistrationSubmissionService.HandleGetOrganisationRegistrationSubmissionDetails(submissionId);
+                await organisationRegistrationSubmissionService.HandleGetOrganisationRegistrationSubmissionDetails(submissionId, User.UserId());
 
-            if (null == result)
+            if (result is null)
             {
                 return NotFound();
             }

src/EPR.RegulatorService.Facade.API/Controllers/SubmissionsController.cs

@@ -186,7 +186,7 @@ public async Task<IActionResult> GetRegistrationSubmissions([FromQuery] Registra
     {
         if (!ModelState.IsValid)
         {
-            return ValidationProblem();
+            return ValidationProblem(ModelState);
         }
 
         var lastSyncResponse = await _commonDataService.GetSubmissionLastSyncTime();
@@ -195,7 +195,7 @@ public async Task<IActionResult> GetRegistrationSubmissions([FromQuery] Registra
             return HandleError.HandleErrorWithStatusCode(lastSyncResponse.StatusCode);
         }
 
-        var submissionEventsLastSync = lastSyncResponse.Content.ReadFromJsonAsync<SubmissionEventsLastSync>().Result;
+        var submissionEventsLastSync = await lastSyncResponse.Content.ReadFromJsonAsync<SubmissionEventsLastSync>();
 
         var deltaRegistrationDecisionsResponse = await _submissionService.GetDeltaRegistrationSubmissions(submissionEventsLastSync.LastSyncTime, User.UserId());
 
@@ -204,7 +204,7 @@ public async Task<IActionResult> GetRegistrationSubmissions([FromQuery] Registra
             return HandleError.HandleErrorWithStatusCode(deltaRegistrationDecisionsResponse.StatusCode);
         }
 
-        var deltaRegistrationDecisions = deltaRegistrationDecisionsResponse.Content.ReadFromJsonAsync<RegulatorRegistrationDecision[]>().Result;
+        var deltaRegistrationDecisions = await deltaRegistrationDecisionsResponse.Content.ReadFromJsonAsync<RegulatorRegistrationDecision[]>();
 
         var registrationSubmissionsRequest = new GetRegistrationSubmissionsRequest
         {

src/EPR.RegulatorService.Facade.API/appsettings.json

@@ -39,13 +39,14 @@
   },
   "SubmissionsApiConfig": {
     "BaseUrl": "https://devrwdwebwaX408.azurewebsites.net",
-    "Timeout": 30,
+    "Timeout": 300,
     "ServiceRetryCount": 6,
     "ApiVersion": 1,
     "Endpoints": {
       "CreateSubmissionEvent": "v{0}/submissions/{1}/events",
       "GetPoMSubmissions": "v{0}/submissions/events/get-regulator-pom-decision",
-      "GetRegistrationSubmissions": "v{0}/submissions/events/get-regulator-registration-decision"
+      "GetRegistrationSubmissions": "v{0}/submissions/events/get-regulator-registration-decision",
+      "GetOrganisationRegistrationEvents": "v{0}/submissions/events/organisation-registration"
     }
   },
   "CommonDataApiConfig": {
@@ -57,8 +58,9 @@
       "GetSubmissionEventsLastSyncTime": "submission-events/get-last-sync-time",
       "GetPoMSubmissions": "submissions/pom/summary",
       "GetRegistrationSubmissions": "submissions/registrations/summary",
-      "GetRegistrationSubmissionDetails": "organisationRegistrationSubmissions/submission/details",
-      "GetOrganisationRegistrationSubmissions": "organisationRegistrationSubmissions/submission/list"
+      "GetRegistrationSubmissionDetails": "submissions/organisation-registration-submission",
+      "GetOrganisationRegistrationSubmissionsSummaries": "submissions/organisation-registrations",
+      "GetOrganisationRegistrationSubmissionDetails": "submissions/organisation-registration-submission"
     }
   },
   "MessagingConfig": {

src/EPR.RegulatorService.Facade.Core/Configs/CommonDataApiConfig.cs

@@ -20,5 +20,5 @@ public class CommonDataServiceEndpoints
 
     public string GetOrganisationRegistrationSubmissionDetails { get; set; } = null!;
 
-    public string GetOrganisationRegistrationSubmissions { get; set; } = null!;
+    public string GetOrganisationRegistrationSubmissionsSummaries { get; set; } = null!;
 }

src/EPR.RegulatorService.Facade.Core/Configs/SubmissionsApiConfig.cs

@@ -18,4 +18,6 @@ public class SubmissionsServiceEndpoints
     public string GetPoMSubmissions { get; set; } = null!;
 
     public string GetRegistrationSubmissions { get; set; } = null!;
+
+    public string GetOrganisationRegistrationEvents { get; set; } = null!;
 }

src/EPR.RegulatorService.Facade.Core/Extensions/GetOrganisationRegistrationSubmissionsFilterExtensions.cs

@@ -0,0 +1,35 @@
+using EPR.RegulatorService.Facade.Core.Models.Requests.RegistrationSubmissions;
+using System.Web;
+
+namespace EPR.RegulatorService.Facade.Core.Extensions;
+
+public static class GetOrganisationRegistrationSubmissionsFilterExtensions
+{
+    public static string GenerateQueryString(this GetOrganisationRegistrationSubmissionsCommonDataFilter source)
+    {
+        static string? convertSpaceToComma(string? input) =>
+           string.IsNullOrWhiteSpace(input)
+               ? null
+               : string.Join(",", input.Split(' ', StringSplitOptions.RemoveEmptyEntries));
+
+        var queryParams = new Dictionary<string, string?>
+        {
+            { "OrganisationNameCommaSeparated", convertSpaceToComma(source.OrganisationName) },
+            { "OrganisationIDCommaSeparated", convertSpaceToComma(source.OrganisationReference) },
+            { "RelevantYearCommaSeparated", convertSpaceToComma(source.RelevantYears) },
+            { "SubmissionStatusCommaSeparated", convertSpaceToComma(source.Statuses) },
+            { "OrganisationTypesCommaSeparated", convertSpaceToComma(source.OrganisationType) },
+            { "ApplicationReferenceNumbers", convertSpaceToComma(source.ApplicationReferenceNumbers) },
+            { "PageNumber", source.PageNumber?.ToString() },
+            { "PageSize", source.PageSize?.ToString() }
+        };
+
+        // Filter out null or empty values and encode the parameters
+        var queryString = string.Join("&",
+            queryParams
+                .Where(kv => !string.IsNullOrEmpty(kv.Value))
+                .Select(kv => $"{HttpUtility.UrlEncode(kv.Key)}={HttpUtility.UrlEncode(kv.Value)}"));
+
+        return queryString;
+    }
+}

src/EPR.RegulatorService.Facade.Core/Helpers/Filters/OrganisationRegistrationSubmissionsFilters.cs

@@ -4,24 +4,23 @@ namespace EPR.RegulatorService.Facade.Core.Helpers.Filters;
 
 using System;
 using EPR.RegulatorService.Facade.Core.Models.Requests.RegistrationSubmissions;
+using EPR.RegulatorService.Facade.Core.Models.Responses.OrganisationRegistrations;
 using EPR.RegulatorService.Facade.Core.Models.Responses.RegistrationSubmissions;
 
 [ExcludeFromCodeCoverage]
 public static class OrganisationRegistrationSubmissionsFilters
 {
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> Filter(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable,
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> Filter(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable,
         GetOrganisationRegistrationSubmissionsFilter filters) => queryable
         .FilterByOrganisationName(filters.OrganisationName)
         .FilterByOrganisationRef(filters.OrganisationReference)
-        .FilterByApplicationRef(filters.ApplicationReferenceNumber)
-        .FilterByRegistrationRef(filters.RegistrationReferenceNumber)
         .FilterByOrganisationType(filters.OrganisationType)
         .FilterBySubmissionStatus(filters.Statuses)
         .FilterByRelevantYear(filters.RelevantYears);
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByOrganisationName(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? organisationName)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByOrganisationName(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? organisationName)
     {
         if (string.IsNullOrWhiteSpace(organisationName)) return queryable;
         var nameParts = organisationName.Split(' ', StringSplitOptions.RemoveEmptyEntries);
@@ -37,8 +36,8 @@ where nameParts.Any(part => q.OrganisationName.Contains(part, StringComparison.O
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByOrganisationRef(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? organisationRef)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByOrganisationRef(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? organisationRef)
     {
         if (string.IsNullOrWhiteSpace(organisationRef)) return queryable;
         var nameParts = organisationRef.Split(' ', StringSplitOptions.RemoveEmptyEntries);
@@ -48,8 +47,8 @@ where nameParts.Any(part => q.OrganisationReference.Contains(part, StringCompari
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByApplicationRef(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? applicationRef)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByApplicationRef(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? applicationRef)
     {
         if (string.IsNullOrWhiteSpace(applicationRef)) return queryable;
         var nameParts = applicationRef.Split(' ', StringSplitOptions.RemoveEmptyEntries);
@@ -59,8 +58,8 @@ where nameParts.Any(part => q.ApplicationReferenceNumber.Contains(part, StringCo
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByRegistrationRef(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? registrationRef)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByRegistrationRef(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? registrationRef)
     {
         if (string.IsNullOrWhiteSpace(registrationRef)) return queryable;
         var nameParts = registrationRef.Split(' ', StringSplitOptions.RemoveEmptyEntries);
@@ -70,8 +69,8 @@ where nameParts.Any(part => q.RegistrationReferenceNumber.Contains(part, StringC
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByOrganisationType(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? organisationType)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByOrganisationType(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? organisationType)
     {
         if (string.IsNullOrWhiteSpace(organisationType) || organisationType == "none") return queryable;
         queryable = from q in queryable
@@ -81,8 +80,8 @@ where organisationType.Contains(q.OrganisationType.ToString())
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterBySubmissionStatus(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? submissionStatus)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterBySubmissionStatus(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? submissionStatus)
     {
         if (string.IsNullOrWhiteSpace(submissionStatus) || submissionStatus == "none") return queryable;
         queryable = from q in queryable
@@ -92,12 +91,12 @@ where submissionStatus.Contains(q.SubmissionStatus.ToString())
         return queryable;
     }
 
-    public static IQueryable<RegistrationSubmissionOrganisationDetails> FilterByRelevantYear(
-        this IQueryable<RegistrationSubmissionOrganisationDetails> queryable, string? relevantYear)
+    public static IQueryable<RegistrationSubmissionOrganisationDetailsResponse> FilterByRelevantYear(
+        this IQueryable<RegistrationSubmissionOrganisationDetailsResponse> queryable, string? relevantYear)
     {
         if (string.IsNullOrWhiteSpace(relevantYear)) return queryable;
         queryable = from q in queryable
-            where relevantYear.Contains(q.RegistrationYear)
+            where relevantYear.Contains(q.RelevantYear.ToString())
             select q;
 
         return queryable;

src/EPR.RegulatorService.Facade.Core/Helpers/LocalPaginationHelper.cs

@@ -12,7 +12,7 @@ namespace EPR.RegulatorService.Facade.Core.Helpers
     public static class LocalPaginationHelper
     {
         public static Tuple<int, List<OrganisationRegistrationSubmissionSummaryResponse>> FilterAndOrder(
-            List<RegistrationSubmissionOrganisationDetails> data,
+            List<RegistrationSubmissionOrganisationDetailsResponse> data,
             GetOrganisationRegistrationSubmissionsFilter filter)
         {
             var rawItems = data.AsQueryable();
@@ -30,7 +30,7 @@ public static Tuple<int, List<OrganisationRegistrationSubmissionSummaryResponse>
                 .ThenBy(x => x.SubmissionStatus == RegistrationSubmissionStatus.Granted)
                 .ThenBy(x => x.SubmissionStatus == RegistrationSubmissionStatus.Queried)
                 .ThenBy(x => x.SubmissionStatus == RegistrationSubmissionStatus.Pending)
-                .ThenBy(x => x.RegistrationDateTime)
+                .ThenBy(x => x.SubmissionDate)
                 .Skip((filter.PageNumber.Value - 1) * filter.PageSize.Value)
                 .Take(filter.PageSize.Value)
                 .Select(x => (OrganisationRegistrationSubmissionSummaryResponse)x)
@@ -45,18 +45,18 @@ public static PaginatedResponse<T> Paginate<T>(List<T>? items, int currentPage,
 
             if (items.Count == 0)
                 return new PaginatedResponse<T>
-                    { Items = [], CurrentPage = currentPage, PageSize = pageSize, TotalItems = 0 };
+                    { items = [], currentPage = currentPage, pageSize = pageSize, totalItems = 0 };
             if (currentPage > (int)Math.Ceiling(totalItems / (double)pageSize))
             {
                 currentPage = (int)Math.Ceiling(totalItems / (double)pageSize);
             }
 
             return new PaginatedResponse<T>
             {
-                Items = items,
-                CurrentPage = currentPage,
-                TotalItems = totalItems,
-                PageSize = pageSize
+                items = items,
+                currentPage = currentPage,
+                totalItems = totalItems,
+                pageSize = pageSize
             };
         }
     }