fix: removing rule 12.BlockedParticipant.Non.Fatal as it's not used and extending the HandleException to include category (#1630)

* fix: removing rule 12.BlockedParticipant.Non.Fatal as it's not actully used and updating HandleException in the ManageParticipant function to include category

* fix: updating tests

Author: SamRobinson75684

application/CohortManager/src/Functions/ParticipantManagementServices/ManageParticipant/ManageParticipant.cs

@@ -8,7 +8,6 @@ namespace NHS.CohortManager.ParticipantManagementServices;
 using System.Text.Json;
 using Model;
 using DataServices.Client;
-using Microsoft.AspNetCore.Components.Web;
 
 public class ManageParticipant
 {
@@ -67,7 +66,7 @@ public async Task Run([ServiceBusTrigger(topicName: "%ParticipantManagementTopic
             }
             else if (databaseParticipant.BlockedFlag == 1)
             {
-                await HandleException(new InvalidOperationException("Participant is blocked"), participant, participantRecord.FileName);
+                await HandleException(new InvalidOperationException("Participant is blocked"), participant, participantRecord.FileName, "0");
                 return;
             }
             else
@@ -93,9 +92,9 @@ public async Task Run([ServiceBusTrigger(topicName: "%ParticipantManagementTopic
         }
     }
 
-    private async Task HandleException(Exception ex, Participant participant, string fileName)
+    private async Task HandleException(Exception ex, Participant participant, string fileName, string category = "")
     {
         _logger.LogError(ex, "Manage Exception failed");
-        await _handleException.CreateSystemExceptionLog(ex, participant, fileName);
+        await _handleException.CreateSystemExceptionLog(ex, participant, fileName, category);
     }
 }

application/CohortManager/src/Functions/ScreeningValidationService/LookupValidation/Breast_Screening_lookupRules.json

@@ -12,18 +12,6 @@
       }
     ],
     "Rules": [
-      {
-        "RuleName": "12.BlockedParticipant.Non.Fatal",
-        "Expression": "existingParticipant.BlockedFlag != \"1\"",
-        "Actions": {
-          "OnFailure": {
-            "Name": "OutputExpression",
-            "Context": {
-              "Expression": "\"Participant is blocked\""
-            }
-          }
-        }
-      },
       {
         "RuleName": "45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal",
         "LocalParams": [

tests/UnitTests/ParticipantManagementServicesTests/ManageParticipantTests/ManageParticipantTests.cs

@@ -165,6 +165,8 @@ public async Task Run_ParticipantIsBlocked_CreateExceptionAndReturn()
         await _sut.Run(JsonSerializer.Serialize(_request));
 
         // Assert
+
+        //__handleException.CreateSystemExceptionLog(ex, participant, fileName, category);
         _participantManagementClientMock
             .Verify(x => x.Add(It.IsAny<ParticipantManagement>()), Times.Never);
         _participantManagementClientMock
@@ -176,7 +178,7 @@ public async Task Run_ParticipantIsBlocked_CreateExceptionAndReturn()
                 It.IsAny<InvalidOperationException>(),
                 It.IsAny<Participant>(),
                 It.IsAny<string>(),
-                ""), Times.Once);
+                "0"), Times.Once);
     }
 
     [TestMethod]

tests/UnitTests/ScreeningValidationServiceTests/LookupValidation/LookupValidationTests.cs

@@ -293,21 +293,6 @@ public async Task Run_ParticipantLocationRemainingOutsideOfCohortAndNotInExclude
         StringAssert.Contains(body, "45.GPPracticeCodeDoesNotExist.BSSelect.NonFatal");
     }
 
-    [TestMethod]
-    public async Task Run_BlockedParticipant_ReturnValidationException()
-    {
-        // Arrange
-        _requestBody.ExistingParticipant.BlockedFlag = "1";
-        var json = JsonSerializer.Serialize(_requestBody);
-        SetUpRequestBody(json);
-
-        // Act
-        var response = await _sut.RunAsync(_request.Object);
-        string body = await AssertionHelper.ReadResponseBodyAsync(response);
-
-        // Assert
-        StringAssert.Contains(body, "12.BlockedParticipant.Non.Fatal");
-    }
 
     [TestMethod]