Merge branch 'main' into Fix/retrieve-pds-demo-to-demographic-response

Author: SamAinsworth-NHS

application/CohortManager/src/Functions/Shared/Common/Pagination/PaginationService.cs

@@ -2,7 +2,7 @@ namespace Common;
 
 public class PaginationService<T> : IPaginationService<T>
 {
-        private const int pageSize = 20;
+    private const int pageSize = 10;
 
     public PaginationResult<T> GetPaginatedResult(
         IQueryable<T> source,
@@ -19,7 +19,7 @@ public PaginationResult<T> 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);

application/CohortManager/src/Functions/Shared/Data/Database/ValidationExceptionData.cs

@@ -125,7 +125,8 @@ public async Task<bool> 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)

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; }
 }

application/CohortManager/src/Web/app/components/participantInformationPanel.tsx

@@ -40,6 +40,16 @@ export default function ParticipantInformationPanel({
               {formatNhsNumber(exceptionDetails.nhsNumber ?? "")}
             </dd>
           </div>
+          {exceptionDetails.supersededByNhsNumber && (
+            <div className="nhsuk-summary-list__row">
+              <dt className="nhsuk-summary-list__key">
+                Superseded by NHS number
+              </dt>
+              <dd className="nhsuk-summary-list__value">
+                {formatNhsNumber(exceptionDetails.supersededByNhsNumber)}
+              </dd>
+            </div>
+          )}
           <div className="nhsuk-summary-list__row">
             <dt className="nhsuk-summary-list__key">Surname</dt>
             <dd className="nhsuk-summary-list__value">

application/CohortManager/src/Web/app/participant-information/[exceptionId]/page.tsx

@@ -34,6 +34,7 @@ export default async function Page(props: {
     const exceptionDetails: ExceptionDetails = {
       exceptionId: exceptionId,
       nhsNumber: exception.NhsNumber,
+      supersededByNhsNumber: exception.ExceptionDetails.SupersededByNhsNumber,
       surname: exception.ExceptionDetails.FamilyName,
       forename: exception.ExceptionDetails.GivenName,
       dateCreated: exception.DateCreated,

application/CohortManager/src/Web/app/types/index.d.ts

@@ -3,6 +3,7 @@ export interface ExceptionDetails {
   dateCreated: string;
   shortDescription: string;
   nhsNumber?: string;
+  supersededByNhsNumber?: string;
   surname: string;
   forename: string;
   dateOfBirth?: string;