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

Author: SamRobinson75684

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

@@ -64,16 +64,10 @@ public async Task<HashSet<string>> GetCachedExcludedSMUValues()
     public bool ValidateOutcode(string postcode)
     {
         var parsedOutCode = ValidationHelper.ParseOutcode(postcode);
-        _ = parsedOutCode.outcode
+        _ = parsedOutCode
             ?? throw new TransformationException("Postcode format invalid");
 
-        // we can bypass checking the database if it's a dummy postcode
-        if (parsedOutCode.isDummyPostCode)
-        {
-            return true;
-        }
-
-        var result = _outcodeClient.GetSingle(parsedOutCode.outcode).Result;
+        var result = _outcodeClient.GetSingle(parsedOutCode).Result;
         return result != null;
 
     }
@@ -91,7 +85,7 @@ public bool ValidateLanguageCode(string languageCode)
 
     public string GetBsoCode(string postcode)
     {
-        string outcode = ValidationHelper.ParseOutcode(postcode).outcode
+        string outcode = ValidationHelper.ParseOutcode(postcode)
             ?? throw new TransformationException("Postcode format invalid");
 
         var result = _outcodeClient.GetSingle(outcode).Result;

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.outcode!).Result;
+        var result = _outcodeClient.GetSingle(outcode!).Result;
 
         return result != null;
     }

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

@@ -110,7 +110,7 @@ public static bool ValidatePostcode(string postcode)
     /// Works for valid UK postcodes and dummy postcodes.
     /// Works with or without a space separator between outcode and incode.
     /// </remarks>
-    public static (string? outcode, bool isDummyPostCode) ParseOutcode(string postcode)
+    public static string? ParseOutcode(string postcode)
     {
         string pattern = @"^([A-Za-z][A-Za-z]?[0-9][A-Za-z0-9]?) ?[0-9][A-Za-z]{2}$";
         string specialDummyOutCodePattern = "^ZZ99|^ZZZSECUR$";
@@ -120,19 +120,16 @@ public static (string? outcode, bool isDummyPostCode) ParseOutcode(string postco
 
         if (dummyOutCodePattern.Success)
         {
-            return (postcode, true);
+            return dummyOutCodePattern.Groups[1].Value;
         }
 
         if (!match.Success)
         {
-            return (null, false);
+            return null;
         }
 
-
-
         string outcode = match.Groups[1].Value;
-
-        return (outcode, false);
+        return outcode;
     }
 
     private static bool ParseInt32(char value, out int integerValue)

tests/UnitTests/TransformDataServiceTests/TransformDataServiceTests/TransformDataLookupFacadeTests.cs

@@ -95,23 +95,6 @@ public void ValidateOutcode_OutcodeNotFound_ReturnFalse()
         Assert.IsFalse(result);
     }
 
-    [TestMethod]
-    public void ValidateOutcode_OutCodeIsSpecial_ReturnTrue()
-    {
-        // Arrange
-        _outcodeClientMock
-            .Setup(x => x.GetSingle(It.IsAny<string>()))
-            .ReturnsAsync((BsSelectOutCode)null);
-
-        string postcode = "ZZZSECUR";
-
-        // Act
-        bool result = _sut.ValidateOutcode(postcode);
-
-        // Assert
-        Assert.IsTrue(result);
-    }
-
     [TestMethod]
     [DataRow("")]
     [DataRow("ABC123")]