Merge branch 'main' into feat/rfr-transformRules

MWClayson-NHS · web-flow · commit 1afa6210d0b8 · 2025-12-17T14:12:32.000Z
diff --git a/application/CohortManager/src/Functions/ScreeningValidationService/LookupValidation/Breast_Screening_lookupRules.json b/application/CohortManager/src/Functions/ScreeningValidationService/LookupValidation/Breast_Screening_lookupRules.json
@@ -2,33 +2,25 @@
   {
     "WorkflowName": "Common",
     "GlobalParams": [
-      {
-        "Name": "ValidCurrentPosting",
-        "Expression": "string.IsNullOrEmpty(newParticipant.CurrentPosting) OR dbLookup.CheckIfCurrentPostingExists(newParticipant.CurrentPosting)"
-      },
       {
         "Name": "ValidPrimaryCareProvider",
         "Expression": "string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) || dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.PrimaryCareProvider)"
       }
     ],
     "Rules": [
       {
-        "RuleName": "45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal",
+        "RuleName": "45.GPPracticeCodeDoesNotExist.NBO.NonFatal",
         "LocalParams": [
           {
-            "Name": "EnglishPostingCategory",
-            "Expression": "string.Equals(dbLookup.RetrievePostingCategory(newParticipant.CurrentPosting), \"ENGLAND\", StringComparison.OrdinalIgnoreCase)"
-          },
-          {
-            "Name": "InvalidPostingCategory",
-            "Expression": "!(EnglishPostingCategory || string.Equals(newParticipant.CurrentPosting, \"ENG\", StringComparison.OrdinalIgnoreCase) || string.Equals(newParticipant.CurrentPosting, \"IM\", StringComparison.OrdinalIgnoreCase) || string.Equals(newParticipant.CurrentPosting, \"DMS\", StringComparison.OrdinalIgnoreCase))"
+            "Name": "WelshPostingCategory",
+            "Expression": "string.Equals(dbLookup.RetrievePostingCategory(newParticipant.CurrentPosting), \"WALES\", StringComparison.OrdinalIgnoreCase)"
           },
           {
             "Name": "IsExcluded",
             "Expression": "dbLookup.CheckIfPrimaryCareProviderInExcludedSmuList(newParticipant.PrimaryCareProvider)"
           }
         ],
-        "Expression": "(InvalidPostingCategory || ValidPrimaryCareProvider || IsExcluded)",
+        "Expression": "(WelshPostingCategory || ValidPrimaryCareProvider  || IsExcluded)",
         "Actions": {
           "OnFailure": {
             "Name": "OutputExpression",
@@ -62,7 +54,7 @@
         "Expression": "!(reasonForRemoval AND postcode AND primaryCareProvider)"
       },
       {
-        "RuleName": "17.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal",
+        "RuleName": "71.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal",
         "LocalParams": [
           {
             "Name": "addressLines",
diff --git a/application/CohortManager/src/Web/app/components/search-nhs-number.tsx b/application/CohortManager/src/Web/app/components/search-nhs-number.tsx
@@ -7,13 +7,13 @@ export function SearchNhsNumber() {
   const [nhsNumber, setNhsNumber] = useState("");
 
   const isValidNhsNumber = (value: string): boolean => {
-    const cleaned = value.replaceAll(" ", "");
+    const cleaned = value.trim().replaceAll(" ", "");
     return cleaned.length === 10 && /^\d+$/.test(cleaned);
   };
 
   const handleSubmit = (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    const cleanedNhsNumber = nhsNumber.replaceAll(" ", "");
+    const cleanedNhsNumber = nhsNumber.trim().replaceAll(" ", "");
 
     if (!isValidNhsNumber(nhsNumber)) {
       router.push(`/exceptions/noResults`);
@@ -39,12 +39,11 @@ export function SearchNhsNumber() {
   };
 
   return (
-    <search className="nhsuk-header__search">
-      <form
-        className="nhsuk-header__search-form"
-        id="search"
-        onSubmit={handleSubmit}
-      >
+    <form
+      className="nhsuk-header__search-form"
+      id="search"
+      onSubmit={handleSubmit}
+    >
         <label className="nhsuk-u-visually-hidden" htmlFor="search-field">
           Search by NHS number
         </label>
@@ -74,6 +73,5 @@ export function SearchNhsNumber() {
           </svg>
         </button>
       </form>
-    </search>
   );
 }
diff --git a/application/CohortManager/src/Web/app/globals.scss b/application/CohortManager/src/Web/app/globals.scss
@@ -165,8 +165,9 @@
 .nhsuk-header__content {
   display: flex;
   align-items: center;
+  gap: clamp(8px, 2vw, 24px);
+  flex-wrap: wrap;
   justify-content: space-between;
-  flex-wrap: nowrap;
 }
 
 .nhsuk-header__service {
@@ -176,16 +177,12 @@
 
 .nhsuk-header__search {
   flex: 1;
-  min-width: 250px;
-}
-
-.nhsuk-header .nhsuk-header__search {
-  margin: 0 100px;
+  min-width: min(240px, 40vw);
+  max-width: 420px;
 }
 
 .nhsuk-header__search-form {
   display: flex;
-  fill: currentColor;
 }
 
 .nhsuk-header__account {
diff --git a/application/CohortManager/src/Web/app/lib/ruleMapping.test.ts b/application/CohortManager/src/Web/app/lib/ruleMapping.test.ts
@@ -4,7 +4,7 @@ describe("ruleMapping", () => {
   describe("ruleIdMappings", () => {
     it("should contain all expected rule IDs", () => {
       const expectedRuleIds = [
-        3, 8, 10, 17, 18, 21, 22, 30, 35, 39, 40, 54, 66, 69, 71,
+        3, 8, 17, 18, 30, 35, 39, 40, 54, 66, 71
       ];
       const actualRuleIds = Object.keys(ruleIdMappings).map(Number);
 
@@ -153,15 +153,5 @@ describe("ruleMapping", () => {
         expect(mapping.ruleDescription.trim()).not.toBe("");
       });
     });
-
-    it("should handle rules with empty moreDetails", () => {
-      // Rule 21 has empty moreDetails in the mapping
-      const result = getRuleMapping(21);
-      expect(result.moreDetails).toBe("");
-      expect(result.ruleDescription).toBe(
-        "The 'Superseded by NHS number' field has been populated with an NHS number by NBO."
-      );
-      expect(result.reportingId).toBe("CMR33");
-    });
   });
 });
diff --git a/application/CohortManager/src/Web/app/lib/ruleMapping.ts b/application/CohortManager/src/Web/app/lib/ruleMapping.ts
@@ -15,12 +15,6 @@ export const ruleIdMappings: Record<number, RuleMapping> = {
     reportingId: "CMR4",
     portalFormTitle: "Raise with Cohorting as a Service (CaaS)",
   },
-  10: {
-    ruleDescription:
-      "Update received for NHS number with reason for removal of ‘DEA’.",
-    moreDetails: "An update has been received for a record marked as deceased.",
-    reportingId: "CMR36",
-  },
   17: {
     ruleDescription:
       "Date of birth is either missing, in the wrong format, or is in the future.",
@@ -35,20 +29,6 @@ export const ruleIdMappings: Record<number, RuleMapping> = {
       "Enter the date of death in the correct format. The date cannot be in the future.",
     reportingId: "CMR22",
   },
-  21: {
-    ruleDescription:
-      "The 'Superseded by NHS number' field has been populated with an NHS number by NBO.",
-    moreDetails: "",
-    reportingId: "CMR33",
-  },
-  22: {
-    ruleDescription:
-      "Amendment received for an NHS number that is not in this cohort.",
-    moreDetails:
-      "Raise with Cohorting as a Service (CaaS). An amendment cannot be applied as the record has not yet been added to the cohort. There may have been a delay in adding the new record to Cohort Manager.  ",
-    reportingId: "CMR39",
-    portalFormTitle: "Raise with Cohorting as a Service (CaaS)",
-  },
   30: {
     ruleDescription: "Postcode is in the wrong format.",
     moreDetails: "Enter a valid UK postcode.",
@@ -104,12 +84,6 @@ export const ruleIdMappings: Record<number, RuleMapping> = {
     reportingId: "CMR20",
     portalFormTitle: "Confused NHS numbers",
   },
-  69: {
-    ruleDescription: "NHS number’s invalid flag is set to true.",
-    moreDetails:
-      "An update has been received for the record with the NHS Number now flagged as invalid.",
-    reportingId: "CMR29",
-  },
   71: {
     ruleDescription: "Address is blank (postcode may be blank too).",
     moreDetails: "Enter the patient's full address and postcode.",
diff --git a/infrastructure/tf-core/environments/development.tfvars b/infrastructure/tf-core/environments/development.tfvars
@@ -11,7 +11,7 @@ features = {
   private_service_connection_is_manual = false
   public_network_access_enabled        = false
   frontdoor_endpoint_enabled           = true
-  alerts_enabled                       = true
+  alerts_enabled                       = false
 }
 
 # these will be merged with compliance tags in locals.tf
diff --git a/infrastructure/tf-core/environments/sandbox.tfvars b/infrastructure/tf-core/environments/sandbox.tfvars
@@ -10,7 +10,7 @@ features = {
   private_service_connection_is_manual = false
   public_network_access_enabled        = false
   frontdoor_endpoint_enabled           = false
-  alerts_enabled                       = true
+  alerts_enabled                       = false
 }
 
 # these will be merged with compliance tags in locals.tf
diff --git a/tests/UnitTests/ScreeningValidationServiceTests/LookupValidation/LookupValidationTests.cs b/tests/UnitTests/ScreeningValidationServiceTests/LookupValidation/LookupValidationTests.cs
@@ -28,6 +28,8 @@ public class LookupValidationTests
     private readonly Mock<ILogger<LookupValidation>> _mockLogger = new();
     private readonly Mock<IDataLookupFacadeBreastScreening> _lookupValidation = new();
 
+    private readonly List<string> welshPostingCategories = new List<string>{"CLD","CYM","DYF","GWE","SGA","WGA"};
+
     [TestInitialize]
     public void IntialiseTests()
     {
@@ -189,29 +191,64 @@ public async Task Run_CurrentPosting_ReturnNoContent(string currentPosting)
     }
 
     [TestMethod]
-    [DataRow("InvalidCurrentPosting", "InvalidPCP")]
-    [DataRow("ValidCurrentPosting", "ValidPCP")]
-    [DataRow("InvalidCurrentPosting", "ValidPCP")]
-    [DataRow("ValidCurrentPosting", null)]
-    [DataRow("InvalidCurrentPosting", null)]
-    public async Task Run_CurrentPostingAndPrimaryProvider_ReturnNoContent(string currentPosting, string primaryCareProvider)
+    [DataRow("BAA", "InvalidPCP", true)]
+    [DataRow(null, "InvalidPCP", true)]
+    [DataRow("BAA", "ValidPCP", true)]
+    [DataRow(null, "ValidPCP", true)]
+    [DataRow("BAA", "ValidPCP", false)]
+    [DataRow(null, "ValidPCP", false)]
+    [DataRow("BAA", null, false)]
+    [DataRow("BAA", null, true)]
+    [DataRow(null, null, false)]
+    [DataRow("CYM", "InvalidPCP", false)]
+    [DataRow("CYM", "ValidPCP", false)]
+    [DataRow("CYM", "InvalidPCP", true)]
+    [DataRow("CYM", "ValidPCP", true)]
+    public async Task Run_CurrentPostingAndPrimaryProvider_ReturnNoContent(string currentPosting, string primaryCareProvider, bool PCPIsExcluded)
     {
         // Arrange
         _requestBody.NewParticipant.CurrentPosting = currentPosting;
         _requestBody.NewParticipant.PrimaryCareProvider = primaryCareProvider;
+
         var json = JsonSerializer.Serialize(_requestBody);
         SetUpRequestBody(json);
 
-        _lookupValidation.Setup(x => x.ValidatePostingCategories(It.IsAny<string>())).Returns(currentPosting == "ValidCurrentPosting");
         _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderExists(It.IsAny<string>())).Returns(primaryCareProvider == "ValidPCP");
+        _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderInExcludedSmuList(It.IsAny<string>())).Returns(PCPIsExcluded);
+        _lookupValidation.Setup(x => x.RetrievePostingCategory(It.IsIn<string>(welshPostingCategories))).Returns("WALES");
+        _lookupValidation.Setup(x => x.RetrievePostingCategory(It.IsNotIn<string>(welshPostingCategories))).Returns("ENGLAND");
 
         // Act
         var response = await _sut.RunAsync(_request.Object);
         string body = await AssertionHelper.ReadResponseBodyAsync(response);
 
         // Assert
-        Assert.IsFalse(body.Contains("45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal"));
+        Assert.IsFalse(body.Contains("45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal")); // Rule Not Triggered
     }
+    [TestMethod]
+    [DataRow("BAA", "InvalidPCP",false)]
+    [DataRow("HJ", "InvalidPCP",false)]
+    [DataRow("DMS", "InvalidPCP",false)]
+    public async Task Run_CurrentPostingAndPrimaryProvider_ReturnsException(string currentPosting, string primaryCareProvider, bool PCPIsExcluded)
+    {
+        // Arrange
+        _requestBody.NewParticipant.CurrentPosting = currentPosting;
+        _requestBody.NewParticipant.PrimaryCareProvider = primaryCareProvider;
+        var json = JsonSerializer.Serialize(_requestBody);
+        SetUpRequestBody(json);
+
+        _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderExists(It.IsAny<string>())).Returns(primaryCareProvider == "ValidPCP");
+        _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderInExcludedSmuList(It.IsAny<string>())).Returns(PCPIsExcluded);
+        _lookupValidation.Setup(x => x.RetrievePostingCategory(It.IsIn<string>(welshPostingCategories))).Returns("WALES");
+        _lookupValidation.Setup(x => x.RetrievePostingCategory(It.IsNotIn<string>(welshPostingCategories))).Returns("ENGLAND");
+        // Act
+        var response = await _sut.RunAsync(_request.Object);
+        string body = await AssertionHelper.ReadResponseBodyAsync(response);
+
+        // Assert
+        Assert.IsTrue(body.Contains("45.GPPracticeCodeDoesNotExist.NBO.NonFatal"));
+    }
+
 
     #region Validate BSO Code (Rule 54)
     [TestMethod]
@@ -267,35 +304,6 @@ public async Task Run_AmendedParticipantHasValidBSO_ReturnNoContent(string reaso
     #endregion
 
     [TestMethod]
-    [DataRow("DMS", "Z00000")]
-    [DataRow("ENG", "Z00000")]
-    [DataRow("IM", "Z00000")]
-
-    public async Task Run_ParticipantLocationRemainingOutsideOfCohortAndNotInExcludedSMU_ReturnValidationException(string newCurrentPosting, string newPrimaryCareProvider)
-    {
-        // Arrange
-        _requestBody.NewParticipant.RecordType = Actions.New;
-        _requestBody.NewParticipant.CurrentPosting = newCurrentPosting;
-        _requestBody.NewParticipant.PrimaryCareProvider = newPrimaryCareProvider;
-
-        var json = JsonSerializer.Serialize(_requestBody);
-        SetUpRequestBody(json);
-        _lookupValidation.Setup(x => x.RetrievePostingCategory(newCurrentPosting)).Returns(newCurrentPosting);
-        _lookupValidation.Setup(x => x.CheckIfCurrentPostingExists(newCurrentPosting)).Returns(true);
-        _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderInExcludedSmuList(newPrimaryCareProvider)).Returns(false);
-        _lookupValidation.Setup(x => x.CheckIfPrimaryCareProviderExists(newPrimaryCareProvider)).Returns(false);
-
-        // Act
-        var response = await _sut.RunAsync(_request.Object);
-        string body = await AssertionHelper.ReadResponseBodyAsync(response);
-
-        // Assert
-        StringAssert.Contains(body, "45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal");
-    }
-
-
-    [TestMethod]
-
     [DataRow(null, null, null, null, null, null, "Existing Address 1", "Existing Address 2", "Existing Address 3", "Existing Address 4", "Existing Address 5", "RG2 5TX")]  // All New Address Fields null, New Postcode null, Existing Address fields full.
     [DataRow("", "", "", "", "", "", "Existing Address 1", "Existing Address 2", "Existing Address 3", "Existing Address 4", "Existing Address 5", "RG2 5TX")]  // All New Address Fields empty, New Postcode empty, Existing Address fields full.
     [DataRow(null, null, null, null, null, "RG2 5TX", "Existing Address 1", "Existing Address 2", "Existing Address 3", "Existing Address 4", "Existing Address 5", "ZZ99 6TF")] // All New Address Fields null, All existing address field full, Postcode does not match.
@@ -327,7 +335,7 @@ public async Task Run_AddressLinesNullAndPostcodeDoesNotMatchExisting_ReturnVali
         string body = await AssertionHelper.ReadResponseBodyAsync(response);
 
         // Assert
-        StringAssert.Contains(body, "17.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal");
+        StringAssert.Contains(body, "71.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal");
     }
 
     [DataRow(null, null, null, null, null, "RG2 5TX", "Existing Address 1", "Existing Address 2", "Existing Address 3", "Existing Address 4", "Existing Address 5", "RG2 5TX")]  // All New Address Fields Blank, Postcode exists, Existing Address fields full
diff --git a/tests/playwright-tests/src/tests/e2e/epic4d-validation-tests/epic4d-6045-validation-testsuite-migrated.ts b/tests/playwright-tests/src/tests/e2e/epic4d-validation-tests/epic4d-6045-validation-testsuite-migrated.ts
@@ -24,5 +24,5 @@
 // This equates to "@epic4d-" tags, configured in the package.json at the playwright-tests root location.
 
 
- export const runnerBasedEpic4dTestScenariosAdd = "@DTOSS-9496-01|@DTOSS-9498-01|@DTOSS-A456-01|@DTOSS-A457-01|@DTOSS-A459-01";
+ export const runnerBasedEpic4dTestScenariosAdd = "@DTOSS-11715-01|@DTOSS-9496-01|@DTOSS-9498-01|@DTOSS-A456-01|@DTOSS-A457-01|@DTOSS-A459-01";
  export const runnerBasedEpic4dTestScenariosAmend = "@DTOSS-9497-01|@DTOSS-9499-01|@DTOSS-A451-01|@DTOSS-A452-01|@DTOSS-A453-01|@DTOSS-A454-01|@DTOSS-A455-01|@DTOSS-A458-01";
diff --git a/tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-11715-01/ADD1_-_CAAS_BREAST_SCREENING_COHORT.json b/tests/playwright-tests/src/tests/e2e/testFiles/@DTOSS-11715-01/ADD1_-_CAAS_BREAST_SCREENING_COHORT.json

Original file line number	Diff line number	Diff line change
`@@ -2,33 +2,25 @@`
`2`	`2`	`{`
`3`	`3`	`"WorkflowName": "Common",`
`4`	`4`	`"GlobalParams": [`
`5`		`- {`
`6`		`- "Name": "ValidCurrentPosting",`
`7`		`- "Expression": "string.IsNullOrEmpty(newParticipant.CurrentPosting) OR dbLookup.CheckIfCurrentPostingExists(newParticipant.CurrentPosting)"`
`8`		`- },`
`9`	`5`	`{`
`10`	`6`	`"Name": "ValidPrimaryCareProvider",`
`11`	`7`	`"Expression": "string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) \|\| dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.PrimaryCareProvider)"`
`12`	`8`	`}`
`13`	`9`	`],`
`14`	`10`	`"Rules": [`
`15`	`11`	`{`
`16`		`- "RuleName": "45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal",`
	`12`	`+ "RuleName": "45.GPPracticeCodeDoesNotExist.NBO.NonFatal",`
`17`	`13`	`"LocalParams": [`
`18`	`14`	`{`
`19`		`- "Name": "EnglishPostingCategory",`
`20`		`- "Expression": "string.Equals(dbLookup.RetrievePostingCategory(newParticipant.CurrentPosting), \"ENGLAND\", StringComparison.OrdinalIgnoreCase)"`
`21`		`- },`
`22`		`- {`
`23`		`- "Name": "InvalidPostingCategory",`
`24`		`- "Expression": "!(EnglishPostingCategory \|\| string.Equals(newParticipant.CurrentPosting, \"ENG\", StringComparison.OrdinalIgnoreCase) \|\| string.Equals(newParticipant.CurrentPosting, \"IM\", StringComparison.OrdinalIgnoreCase) \|\| string.Equals(newParticipant.CurrentPosting, \"DMS\", StringComparison.OrdinalIgnoreCase))"`
	`15`	`+ "Name": "WelshPostingCategory",`
	`16`	`+ "Expression": "string.Equals(dbLookup.RetrievePostingCategory(newParticipant.CurrentPosting), \"WALES\", StringComparison.OrdinalIgnoreCase)"`
`25`	`17`	`},`
`26`	`18`	`{`
`27`	`19`	`"Name": "IsExcluded",`
`28`	`20`	`"Expression": "dbLookup.CheckIfPrimaryCareProviderInExcludedSmuList(newParticipant.PrimaryCareProvider)"`
`29`	`21`	`}`
`30`	`22`	`],`
`31`		`- "Expression": "(InvalidPostingCategory \|\| ValidPrimaryCareProvider \|\| IsExcluded)",`
	`23`	`+ "Expression": "(WelshPostingCategory \|\| ValidPrimaryCareProvider \|\| IsExcluded)",`
`32`	`24`	`"Actions": {`
`33`	`25`	`"OnFailure": {`
`34`	`26`	`"Name": "OutputExpression",`
`@@ -62,7 +54,7 @@`
`62`	`54`	`"Expression": "!(reasonForRemoval AND postcode AND primaryCareProvider)"`
`63`	`55`	`},`
`64`	`56`	`{`
`65`		`- "RuleName": "17.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal",`
	`57`	`+ "RuleName": "71.AddressLinesNullAndPostcodeDoesNotMatchExisting.NBO.NonFatal",`
`66`	`58`	`"LocalParams": [`
`67`	`59`	`{`
`68`	`60`	`"Name": "addressLines",`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ features = {`
`11`	`11`	`private_service_connection_is_manual = false`
`12`	`12`	`public_network_access_enabled = false`
`13`	`13`	`frontdoor_endpoint_enabled = true`
`14`		`- alerts_enabled = true`
	`14`	`+ alerts_enabled = false`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`# these will be merged with compliance tags in locals.tf`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ features = {`
`10`	`10`	`private_service_connection_is_manual = false`
`11`	`11`	`public_network_access_enabled = false`
`12`	`12`	`frontdoor_endpoint_enabled = false`
`13`		`- alerts_enabled = true`
	`13`	`+ alerts_enabled = false`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`# these will be merged with compliance tags in locals.tf`