fix: Nhs Number Search (#1801)

* feat: search by NHS Number

* fix: search fixes

* chore: removed sort, functionality in another branch

* test: updated existing and added new tests

* test: fixed tests

Author: Warren-Pitterson

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

@@ -140,9 +140,9 @@ public async Task<List<ExceptionManagement>> GetByFilter(Expression<Func<Excepti
 
     public async Task<ValidationExceptionsByNhsNumberResponse> GetExceptionsWithReportsByNhsNumber(string nhsNumber)
     {
-        var validationExceptions = await GetValidationExceptionsByNhsNumber(nhsNumber);
+        var allValidationExceptions = await GetValidationExceptionsByNhsNumber(nhsNumber);
 
-        if (validationExceptions.Count == 0)
+        if (allValidationExceptions.Count == 0)
         {
             return new ValidationExceptionsByNhsNumberResponse
             {
@@ -152,15 +152,46 @@ public async Task<ValidationExceptionsByNhsNumberResponse> GetExceptionsWithRepo
             };
         }
 
-        var reports = GenerateExceptionReports(validationExceptions);
+        var exceptions = allValidationExceptions
+            .Where(x => x.Category == (int)ExceptionCategory.NBO)
+            .ToList();
+
+        var reportExceptions = allValidationExceptions
+            .Where(x => x.Category == (int)ExceptionCategory.Confusion ||
+                       x.Category == (int)ExceptionCategory.Superseded)
+            .ToList();
+
+        var reports = GenerateExceptionReports(reportExceptions);
+
         return new ValidationExceptionsByNhsNumberResponse
         {
-            Exceptions = validationExceptions,
+            Exceptions = exceptions,
             Reports = reports,
             NhsNumber = nhsNumber
         };
     }
 
+    private async Task<List<ValidationException>> GetValidationExceptionsByNhsNumber(string nhsNumber)
+    {
+        var exceptions = await _validationExceptionDataServiceClient.GetByFilter(x =>
+            x.NhsNumber == nhsNumber &&
+            x.Category.HasValue &&
+            (x.Category.Value == (int)ExceptionCategory.NBO ||
+             x.Category.Value == (int)ExceptionCategory.Confusion ||
+             x.Category.Value == (int)ExceptionCategory.Superseded));
+
+        if (exceptions == null || !exceptions.Any())
+        {
+            return [];
+        }
+
+        return [.. exceptions
+            .Select(GetValidationExceptionWithDetails)
+            .Where(x => x != null)
+            .Cast<ValidationException>()
+            .OrderByDescending(x => x.DateCreated)];
+    }
+
     private List<ValidationException> MapToValidationExceptions(IEnumerable<ExceptionManagement> exceptions)
     {
         return exceptions.Select(GetValidationExceptionWithDetails).Where(x => x != null).ToList()!;
@@ -252,7 +283,6 @@ private ServiceResponseModel CreateResponse(bool success, HttpStatusCode statusC
         };
     }
 
-
     private static string? ValidateServiceNowId(string serviceNowId)
     {
         if (string.IsNullOrWhiteSpace(serviceNowId))
@@ -343,27 +373,9 @@ private static List<ValidationException> SortExceptions(SortOrder? sortOrder, IE
             : [.. filteredList.OrderByDescending(dateProperty)];
     }
 
-
-
-    private async Task<List<ValidationException>> GetValidationExceptionsByNhsNumber(string nhsNumber)
-    {
-        var exceptions = await _validationExceptionDataServiceClient.GetByFilter(x => x.NhsNumber == nhsNumber && x.Category.HasValue && x.Category.Value == (int)ExceptionCategory.NBO);
-        if (exceptions == null || !exceptions.Any())
-        {
-            return [];
-        }
-
-        return [.. exceptions
-            .Select(GetValidationExceptionWithDetails)
-            .Where(x => x != null)
-            .Cast<ValidationException>()
-            .OrderByDescending(x => x.DateCreated)];
-    }
-
     private static List<ValidationExceptionReport> GenerateExceptionReports(List<ValidationException> validationExceptions)
     {
         return [.. validationExceptions
-            .Where(x => x.Category.HasValue && (x.Category.Value == 12 || x.Category.Value == 13))
             .GroupBy(x => new
             {
                 Date = x.DateCreated?.Date ?? DateTime.Now.Date,

application/CohortManager/src/Functions/screeningDataServices/GetValidationExceptions/GetValidationExceptions.cs

@@ -157,7 +157,7 @@ public async Task<HttpResponseData> GetValidationExceptionsByNhsNumber([HttpTrig
         {
             var result = await _validationData.GetExceptionsWithReportsByNhsNumber(cleanedNhsNumber);
 
-            if (result.Exceptions.Count == 0)
+            if (result.Exceptions.Count == 0 && result.Reports.Count == 0)
             {
                 return _createResponse.CreateHttpResponse(HttpStatusCode.NoContent, req);
             }

application/CohortManager/src/Web/app/exceptions/search/page.tsx

@@ -146,6 +146,20 @@ function ResultsHeader({ startItem, endItem, totalCount }: {
   );
 }
 
+// Component: No Exceptions State
+function NoExceptionsState({ nhsNumber }: { readonly nhsNumber: string }) {
+  return (
+    <>
+      <h2 className="nhsuk-heading-m nhsuk-u-margin-bottom-5">Exceptions</h2>
+      <div className="nhsuk-card nhsuk-u-margin-bottom-5">
+        <div className="nhsuk-card__content">
+          <p>No exceptions found for NHS Number {nhsNumber}</p>
+        </div>
+      </div>
+    </>
+  );
+}
+
 // Component: Reports Table Row
 function ReportsTableRow({ report, nhsNumber, index }: {
   readonly report: ValidationExceptionReport;
@@ -243,10 +257,10 @@ export default async function Page({
   });
 
   const totalCount = response.data.PaginatedExceptions.TotalItems || 0;
+  const reportsCount = response.data.Reports?.length || 0;
 
-  // Redirect to No Results page if no results found
-  if (totalCount === 0) {
-    redirect(`/exceptions/noResults`);
+  if (totalCount === 0 && reportsCount === 0) {
+      redirect(`/exceptions/noResults`);
   }
 
   try {
@@ -271,16 +285,22 @@ export default async function Page({
                 Search results for {nhsNumber}
               </h1>
 
-              <ResultsHeader
-                startItem={startItem}
-                endItem={endItem}
-                totalCount={totalCount}
-              />
-              <div className="nhsuk-card nhsuk-u-margin-bottom-5">
-                <div className="nhsuk-card__content">
-                  <ExceptionsTable exceptions={exceptionDetails} />
-                </div>
-              </div>
+              {exceptionDetails.length > 0 ? (
+                <>
+                  <ResultsHeader
+                    startItem={startItem}
+                    endItem={endItem}
+                    totalCount={totalCount}
+                  />
+                  <div className="nhsuk-card nhsuk-u-margin-bottom-5">
+                    <div className="nhsuk-card__content">
+                      <ExceptionsTable exceptions={exceptionDetails} />
+                    </div>
+                  </div>
+                </>
+              ) : (
+                <NoExceptionsState nhsNumber={nhsNumber} />
+              )}
 
               {totalPages > 1 && (
                 <Pagination