Merge branch 'main' into Fix/pds-participant-deserialisation-and-mock-mismatch-issue

Author: SamAinsworth-NHS

application/CohortManager/src/Functions/ScreeningValidationService/StaticValidation/Breast_Screening_staticRules.json

@@ -26,18 +26,6 @@
           }
         }
       },
-      {
-        "RuleName": "47.NewParticipantWithRemovalOrDeath.NBO.NonFatal",
-        "Expression": "participant.RecordType != Actions.New OR (string.IsNullOrEmpty(participant.ReasonForRemoval) AND string.IsNullOrEmpty(participant.ReasonForRemovalEffectiveFromDate) AND string.IsNullOrEmpty(participant.DateOfDeath))",
-        "Actions": {
-          "OnFailure": {
-            "Name": "OutputExpression",
-            "Context": {
-              "Expression": "\"Removal fields incompatible with record type\""
-            }
-          }
-        }
-      },
       {
         "RuleName": "62.ValidateReasonForRemoval.NBO.NonFatal",
         "Expression": "!(participant.ReasonForRemoval == \"LDN\" AND  string.IsNullOrEmpty(participant.SupersededByNhsNumber))",

tests/UnitTests/ScreeningValidationServiceTests/StaticValidation/StaticValidationTests.cs

@@ -565,57 +565,6 @@ public async Task Run_InvalidDateOfDeath_ReturnValidationException(string date)
     }
     #endregion
 
-    #region New Participant with Reason For Removal, Removal Date or Date Of Death (Rule 47)
-    [TestMethod]
-    [DataRow(Actions.New, null, null, null, "EA123AB", "1")]
-    [DataRow(Actions.New, "", "", "", "EA123AB", "1")]
-    [DataRow(Actions.Amended, "DEA", "20240101", "20240101", null, "1")]
-    [DataRow(Actions.Removed, "DEA", "20240101", "20240101", null, "0")]
-    public async Task Run_ValidRfrAndDeathDate_ReturnNoContent(
-        string recordType, string reasonForRemoval, string removalDate, string dateOfDeath, string pcp, string eligibilityFlag)
-    {
-        // Arrange
-        _participantCsvRecord.Participant.RecordType = recordType;
-        _participantCsvRecord.Participant.ReasonForRemoval = reasonForRemoval;
-        _participantCsvRecord.Participant.ReasonForRemovalEffectiveFromDate = removalDate;
-        _participantCsvRecord.Participant.DateOfDeath = dateOfDeath;
-        _participantCsvRecord.Participant.PrimaryCareProvider = pcp;
-        _participantCsvRecord.Participant.EligibilityFlag = eligibilityFlag;
-
-        var json = JsonSerializer.Serialize(_participantCsvRecord);
-        SetUpRequestBody(json);
-
-        // Act
-        var response = await _function.RunAsync(_request.Object);
-
-        // Assert
-        Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
-    }
-
-    [TestMethod]
-    [DataRow("ADD", "DEA", null, null)]
-    [DataRow("ADD", null, "20240101", null)]
-    [DataRow("ADD", null, null, "20240101")]
-    public async Task Run_AddRecordWithRfrOrDateOfDeath_ReturnValidationException(
-        string recordType, string reasonForRemoval, string removalDate, string dateOfDeath)
-    {
-        // Arrange
-        _participantCsvRecord.Participant.RecordType = recordType;
-        _participantCsvRecord.Participant.ReasonForRemoval = reasonForRemoval;
-        _participantCsvRecord.Participant.ReasonForRemovalEffectiveFromDate = removalDate;
-        _participantCsvRecord.Participant.DateOfDeath = dateOfDeath;
-        var json = JsonSerializer.Serialize(_participantCsvRecord);
-        SetUpRequestBody(json);
-
-        // Act
-        var response = await _function.RunAsync(_request.Object);
-        string body = await AssertionHelper.ReadResponseBodyAsync(response);
-
-        // Assert
-        StringAssert.Contains(body, "47.NewParticipantWithRemovalOrDeath.NBO.NonFatal");
-    }
-    #endregion
-
     #region IsInterpreterRequired (Rule 49)
     [TestMethod]
     [DataRow("1")]