feat: ServicenowVariableData updated values, namespace updated (#1813)

* feat: ServicenowVariableData updated values, namespace updated

* test: Added test for new scenarios

* chore: inferred usage

Author: Warren-Pitterson

application/CohortManager/src/Functions/ParticipantManagementServices/ManageServiceNowParticipant/ManageServiceNowParticipantFunction.cs

@@ -12,6 +12,7 @@ namespace NHS.CohortManager.ParticipantManagementServices;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Model;
+using Model.Constants;
 using Model.Enums;
 
 public class ManageServiceNowParticipantFunction

application/CohortManager/src/Functions/ServiceNowIntegration/ServiceNowMessageHandler/Models/ServiceNowVariableData.cs

@@ -2,12 +2,12 @@ namespace NHS.CohortManager.ServiceNowIntegrationService.Models;
 
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
-using Model;
+using Model.Constants;
 
 public class ServiceNowVariableData
 {
     [Required]
-    [JsonPropertyName("forename_")]
+    [JsonPropertyName("forename")]
     public required string FirstName { get; set; }
     [Required]
     [JsonPropertyName("surname_family_name")]
@@ -21,7 +21,7 @@ public class ServiceNowVariableData
     [JsonPropertyName("BSO_code")]
     public required string BsoCode { get; set; }
     [JsonPropertyName("reason_for_adding")]
-    [AllowedValues([ServiceNowReasonsForAdding.VeryHighRisk, ServiceNowReasonsForAdding.RequiresCeasing, ServiceNowReasonsForAdding.RoutineScreening])]
+    [AllowedValues([ServiceNowReasonsForAdding.VeryHighRisk, ServiceNowReasonsForAdding.RequiresCeasing, ServiceNowReasonsForAdding.RoutineScreening, ServiceNowReasonsForAdding.OverAgeSelfReferral])]
     public required string ReasonForAdding { get; set; }
     [JsonPropertyName("enter_dummy_gp_code")]
     public string? RequiredGpCode { get; set; }

application/CohortManager/src/Functions/Shared/Model/Constants/ServiceNowReasonsForAdding.cs

@@ -1,8 +1,9 @@
-namespace Model;
+namespace Model.Constants;
 
 public static class ServiceNowReasonsForAdding
 {
     public const string VeryHighRisk = "eligible_for_very_high_risk_breast_screening_referral_form_must_be_attached";
     public const string RequiresCeasing = "requires_ceasing_following_surgery_bilateral_mastectomy";
     public const string RoutineScreening = "eligible_for_routine_screening_but_not_registered_with_a_gp_practice";
+    public const string OverAgeSelfReferral = "over_age_self_referral";
 }

tests/UnitTests/ParticipantManagementServicesTests/ManageServiceNowParticipantTests/ManageServiceNowParticipantFunctionTests.cs

@@ -9,6 +9,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Model;
+using Model.Constants;
 using Model.Enums;
 using Moq;
 using NHS.CohortManager.ParticipantManagementServices;

tests/UnitTests/ServiceNowMessageHandlerTests/ReceiveServiceNowMessageFunctionTests.cs

@@ -12,6 +12,7 @@ namespace NHS.CohortManager.Tests.UnitTests.ServiceNowMessageHandlerTests;
 using Model;
 using Microsoft.Extensions.Options;
 using DataServices.Client;
+using Model.Constants;
 
 [TestClass]
 public class ReceiveServiceNowMessageFunctionTests
@@ -57,6 +58,7 @@ public ReceiveServiceNowMessageFunctionTests()
     [DataRow("CS123", "1234567890", "Charlie", "Bloggs", "1970-01-01", "ABC", ServiceNowReasonsForAdding.VeryHighRisk, null)]
     [DataRow("CS123", "1234567890", "Charlie", "Bloggs", "1970-12-31", "ABC", ServiceNowReasonsForAdding.RequiresCeasing, "")]
     [DataRow("CS123", "1234567890", "Charlie", "Bloggs", "1970-01-01", "ABC", ServiceNowReasonsForAdding.RoutineScreening, "ZZZ")]
+    [DataRow("CS123", "1234567890", "Charlie", "Bloggs", "1985-06-15", "ABC", ServiceNowReasonsForAdding.OverAgeSelfReferral, "ZZZ")]
     public async Task Run_WhenRequestIsValidAndCaseSuccessfullySavedToDbAndMessageSuccessfullySentToServiceBus_ReturnsAccepted(
         string caseNumber, string nhsNumber, string forename, string familyName, string dateOfBirth, string bsoCode, string reasonForAdding, string dummyGpCode)
     {
@@ -148,11 +150,11 @@ public async Task Run_WhenRequestIsValidButMessageFailsToSaveToDb_ReturnsInterna
         var requestBodyJson = CreateRequestBodyJson(caseNumber, nhsNumber, forename, familyName, dateOfBirth, bsoCode, reasonForAdding, dummyGpCode);
         var requestBodyStream = new MemoryStream(Encoding.UTF8.GetBytes(requestBodyJson));
         _mockHttpRequest.Setup(r => r.Body).Returns(requestBodyStream);
-                _mockServiceNowCasesClient.Setup(x => x.Add(It.Is<ServicenowCase>(c =>
-                c.ServicenowId == caseNumber &&
-                c.NhsNumber == long.Parse(nhsNumber) &&
-                c.Status == ServiceNowStatus.New
-            ))).ReturnsAsync(false);
+        _mockServiceNowCasesClient.Setup(x => x.Add(It.Is<ServicenowCase>(c =>
+        c.ServicenowId == caseNumber &&
+        c.NhsNumber == long.Parse(nhsNumber) &&
+        c.Status == ServiceNowStatus.New
+    ))).ReturnsAsync(false);
 
         // Act
         var result = await _function.Run(_mockHttpRequest.Object);
@@ -171,11 +173,11 @@ public async Task Run_WhenRequestIsValidButMessageFailsToSendToServiceBus_Return
         var requestBodyJson = CreateRequestBodyJson(caseNumber, nhsNumber, forename, familyName, dateOfBirth, bsoCode, reasonForAdding, dummyGpCode);
         var requestBodyStream = new MemoryStream(Encoding.UTF8.GetBytes(requestBodyJson));
         _mockHttpRequest.Setup(r => r.Body).Returns(requestBodyStream);
-                _mockServiceNowCasesClient.Setup(x => x.Add(It.Is<ServicenowCase>(c =>
-                c.ServicenowId == caseNumber &&
-                c.NhsNumber == long.Parse(nhsNumber) &&
-                c.Status == ServiceNowStatus.New
-            ))).ReturnsAsync(true);
+        _mockServiceNowCasesClient.Setup(x => x.Add(It.Is<ServicenowCase>(c =>
+        c.ServicenowId == caseNumber &&
+        c.NhsNumber == long.Parse(nhsNumber) &&
+        c.Status == ServiceNowStatus.New
+    ))).ReturnsAsync(true);
         _mockQueueClient.Setup(x => x.AddAsync(It.Is<ServiceNowParticipant>(p =>
                 p.ScreeningId == 1 &&
                 p.ServiceNowCaseNumber == caseNumber &&
@@ -206,7 +208,7 @@ private static string CreateRequestBodyJson(
             u_case_variable_data = new
             {
                 nhs_number = nhsNumber,
-                forename_ = forename,
+                forename,
                 surname_family_name = familyName,
                 date_of_birth = dateOfBirth,
                 BSO_code = bsoCode,