fix: now allows for dummy postcode ZZZSECUR in transform (#1477)

* fix: now allows the bypassing of checking outcodes when postcode is a dummy code

* fix: fixing unit tests

* fix: fixing unit tests

* fix: making sure that all possible matches of speical dummy codes are covered

* fix: now returns to TransformReasonForRemoval so transform rules are not effected and can run properly

* chore: addressing comments on PR

Author: SamRobinson75684

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformDataLookupFacade.cs

@@ -60,14 +60,21 @@ public async Task<HashSet<string>> GetCachedExcludedSMUValues()
 
         return excludedSMUData!;
     }
+
     public bool ValidateOutcode(string postcode)
     {
-        string outcode = ValidationHelper.ParseOutcode(postcode)
-            ?? throw new TransformationException("Postcode format invalid");
+        //if a postcode is a dummy postcode then we want to allow the rules to know that we have a dummy postcode
+        if (postcode.StartsWith("ZZ"))
+        {
+            return false;
+        }
 
-        var result = _outcodeClient.GetSingle(outcode).Result;
+        string parsedOutCode = ValidationHelper.ParseOutcode(postcode)
+            ?? throw new TransformationException("Postcode format invalid");
 
+        var result = _outcodeClient.GetSingle(parsedOutCode).Result;
         return result != null;
+
     }
 
     /// <summary>

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformReasonForRemoval.cs

@@ -2,9 +2,8 @@ namespace NHS.CohortManager.CohortDistributionService;
 
 using Model;
 using Common;
-using Data.Database;
 using System.Text.Json;
-using Apache.Arrow.Types;
+
 
 public class TransformReasonForRemoval : ITransformReasonForRemoval
 {

application/CohortManager/src/Functions/ScreeningValidationService/LookupValidation/DataLookupFacadeBreastScreening.cs

@@ -53,7 +53,7 @@ public bool ValidateOutcode(string postcode)
     {
         var outcode = ValidationHelper.ParseOutcode(postcode);
         _logger.LogInformation("Validating Outcode: {Outcode}", outcode);
-        var result = _outcodeClient.GetSingle(outcode).Result;
+        var result = _outcodeClient.GetSingle(outcode!).Result;
 
         return result != null;
     }

application/CohortManager/src/Functions/Shared/Common/ValidationHelper.cs

@@ -1,7 +1,10 @@
 namespace Common;
 
 using System.Globalization;
+using System.Linq.Expressions;
 using System.Text.RegularExpressions;
+using Hl7.Fhir.Validation;
+using Model;
 
 public static class ValidationHelper
 {
@@ -109,21 +112,16 @@ public static bool ValidatePostcode(string postcode)
     /// </remarks>
     public static string? ParseOutcode(string postcode)
     {
-        if (postcode == "ZZZSECUR")
-        {
-            return postcode;
-        }
-
         string pattern = @"^([A-Za-z][A-Za-z]?[0-9][A-Za-z0-9]?) ?[0-9][A-Za-z]{2}$";
 
         Match match = Regex.Match(postcode, pattern, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(2));
+
         if (!match.Success)
         {
             return null;
         }
 
         string outcode = match.Groups[1].Value;
-
         return outcode;
     }