From 01889e12190b89f95cf554d9f41473e4978b27c6 Mon Sep 17 00:00:00 2001 From: warren Date: Tue, 12 Aug 2025 11:18:28 +0100 Subject: [PATCH 1/2] feat: added SupersededByNhsNumber to ExceptionDetails and changed pagination from 20 to 10 results per page --- .../Functions/Shared/Common/Pagination/PaginationService.cs | 4 ++-- .../Functions/Shared/Data/Database/ValidationExceptionData.cs | 3 ++- .../src/Functions/Shared/Model/ExceptionDetails.cs | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs b/application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs index 36dd1d6402..d969804ef1 100644 --- a/application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs +++ b/application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs @@ -2,7 +2,7 @@ namespace Common; public class PaginationService : IPaginationService { - private const int pageSize = 20; + private const int pageSize = 10; public PaginationResult GetPaginatedResult( IQueryable source, @@ -19,7 +19,7 @@ public PaginationResult GetPaginatedResult( var idList = source.Select(idSelector).OrderBy(id => id).ToList(); // Get the index of the lastId - int lastIdIndex = lastId.HasValue? idList.IndexOf(lastId.Value) : -1; + int lastIdIndex = lastId.HasValue ? idList.IndexOf(lastId.Value) : -1; int currentPage = lastIdIndex >= 0 ? (lastIdIndex / pageSize) + 2 : 1; var totalItems = source.Count(); var totalPages = (int)Math.Ceiling((double)totalItems / pageSize); diff --git a/application/CohortManager/src/Functions/Shared/Data/Database/ValidationExceptionData.cs b/application/CohortManager/src/Functions/Shared/Data/Database/ValidationExceptionData.cs index 0ce4b7cfe6..1e11638cda 100644 --- a/application/CohortManager/src/Functions/Shared/Data/Database/ValidationExceptionData.cs +++ b/application/CohortManager/src/Functions/Shared/Data/Database/ValidationExceptionData.cs @@ -125,7 +125,8 @@ public async Task UpdateExceptionServiceNowId(int exceptionId, string serv ParticipantPostCode = participantDemographic?.PostCode, TelephoneNumberHome = participantDemographic?.TelephoneNumberHome, EmailAddressHome = participantDemographic?.EmailAddressHome, - PrimaryCareProvider = participantDemographic?.PrimaryCareProvider + PrimaryCareProvider = participantDemographic?.PrimaryCareProvider, + SupersededByNhsNumber = participantDemographic?.SupersededByNhsNumber, }; if (participantDemographic == null) diff --git a/application/CohortManager/src/Functions/Shared/Model/ExceptionDetails.cs b/application/CohortManager/src/Functions/Shared/Model/ExceptionDetails.cs index 400ae2c1a7..9553944bc3 100644 --- a/application/CohortManager/src/Functions/Shared/Model/ExceptionDetails.cs +++ b/application/CohortManager/src/Functions/Shared/Model/ExceptionDetails.cs @@ -17,4 +17,5 @@ public class ExceptionDetails public string? EmailAddressHome { get; set; } public string? PrimaryCareProvider { get; set; } public Gender? Gender { get; set; } + public long? SupersededByNhsNumber { get; set; } } From d2c2d45f405979a54a4c6fc46abbfe2ce1f4dffb Mon Sep 17 00:00:00 2001 From: warren Date: Tue, 12 Aug 2025 12:35:37 +0100 Subject: [PATCH 2/2] feat: Filename and ErrorRecord removed from response --- .../src/Functions/Shared/Model/EFModels/ExceptionManagement.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/CohortManager/src/Functions/Shared/Model/EFModels/ExceptionManagement.cs b/application/CohortManager/src/Functions/Shared/Model/EFModels/ExceptionManagement.cs index 3c2baa9a40..0f649c1655 100644 --- a/application/CohortManager/src/Functions/Shared/Model/EFModels/ExceptionManagement.cs +++ b/application/CohortManager/src/Functions/Shared/Model/EFModels/ExceptionManagement.cs @@ -65,13 +65,11 @@ public ValidationException ToValidationException() return new ValidationException { ExceptionId = ExceptionId, - FileName = FileName, NhsNumber = NhsNumber, DateCreated = DateCreated, DateResolved = DateResolved, RuleId = RuleId, RuleDescription = RuleDescription, - ErrorRecord = ErrorRecord, Category = Category, ScreeningName = ScreeningName, ExceptionDate = ExceptionDate,