Merge branch 'main' into fix/DTOSS-10515-Handling-not-found-in-pds-func

Author: SamRobinson75684

application/CohortManager/compose.core.yaml

@@ -28,7 +28,7 @@ services:
     build:
       context: ./src/Functions/
       dockerfile: NemsSubscriptionService/NemsMeshRetrieval/Dockerfile
-    profiles: [non-essential]
+    profiles: [nems]
     environment:
       - AzureWebJobsStorage=${AZURITE_CONNECTION_STRING}
       - nemsmeshfolder_STORAGE=${AZURITE_CONNECTION_STRING}
@@ -241,7 +241,9 @@ services:
     build:
       context: ./src/Functions/
       dockerfile: DemographicServices/RetrievePDSDemographic/Dockerfile
-    profiles: [not-implemented]
+    profiles: [service-now, nems]
+    ports:
+      - 8082:8082
     environment:
       - ASPNETCORE_URLS=http://*:8082
       - ExceptionFunctionURL=http://create-exception:7070/api/CreateException
@@ -251,13 +253,14 @@ services:
       - Audience=https://int.api.service.nhs.uk/oauth2/token
       - AuthTokenURL=https://int.api.service.nhs.uk/oauth2/token
       - LocalPrivateKeyFileName=RetrievePdsDemographic-DEV1.pem.key
-      - ClientId="Get-private-key-from-NHS-dev-portal"
+      - ClientId=Get-private-key-from-NHS-dev-portal
+      - UseFakePDSServices=true
 
   manage-nems-subscription:
       container_name: manage-nems-subscription
       image: cohort-manager-manage-nems-subscription
       networks: [cohman-network]
-      profiles: [non-essential]
+      profiles: [nems]
       build:
         context: ./src/Functions/
         dockerfile: DemographicServices/ManageNemsSubscription/Dockerfile
@@ -306,7 +309,7 @@ services:
     build:
       context: ./src/Functions/
       dockerfile: ServiceNowIntegration/ServiceNowMessageHandler/Dockerfile
-    profiles: [non-essential]
+    profiles: [service-now]
     environment:
       - ASPNETCORE_URLS=http://*:9092
       - ServiceNowRefreshAccessTokenUrl=https://nhsdigitaldev.service-now.com/oauth_token.do
@@ -315,9 +318,10 @@ services:
       - ServiceNowClientId=${SERVICENOW_CLIENT_ID}
       - ServiceNowClientSecret=${SERVICENOW_CLIENT_SECRET}
       - ServiceNowRefreshToken=${SERVICENOW_REFRESH_TOKEN}
+      - ServiceNowParticipantManagementTopic=servicenow-participant-management-topic
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
     ports:
-      - "9092:9092"
+      - 9092:9092
 
   servicenow-cohort-lookup:
     container_name: servicenow-cohort-lookup
@@ -326,7 +330,7 @@ services:
     build:
       context: ./src/Functions/
       dockerfile: ServiceNowIntegration/ServiceNowCohortLookup/Dockerfile
-    profiles: [non-essential]
+    profiles: [service-now]
     environment:
       - ASPNETCORE_URLS=http://*:7180
       - ExceptionFunctionURL=http://create-exception:7070/api/CreateException

application/CohortManager/compose.data-services.yaml

@@ -112,6 +112,7 @@ services:
     container_name: nems-subscription-data-service
     image: cohort-manager-nems-subscription-data-service
     networks: [cohman-network]
+    profiles: [nems]
     build:
       context: ./src/Functions/
       dockerfile: screeningDataServices/NemsSubscriptionDataService/Dockerfile
@@ -136,6 +137,7 @@ services:
      container_name: servicenow-cases-data-service
      image: cohort-manager-servicenow-cases-data-service
      networks: [cohman-network]
+     profiles: [service-now]
      build:
        context: ./src/Functions/
        dockerfile: screeningDataServices/ServiceNowCasesDataService/Dockerfile

application/CohortManager/src/Functions/DemographicServices/RetrievePDSDemographic/RetrievePDSDemographic.cs

@@ -69,16 +69,17 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
             var response = await _httpClientFunction.SendPdsGet(url, bearerToken);
             string jsonResponse = "";
 
-            if (response.StatusCode == HttpStatusCode.NotFound)
+            jsonResponse = await _httpClientFunction.GetResponseText(response);
+            var pdsDemographic = _fhirPatientDemographicMapper.ParseFhirJson(jsonResponse);
+
+            if (response.StatusCode == HttpStatusCode.NotFound || pdsDemographic.ConfidentialityCode == "R")
             {
                 await _pdsProcessor.ProcessPdsNotFoundResponse(response, nhsNumber);
                 return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, "PDS returned a 404 please database for details");
             }
 
             response.EnsureSuccessStatusCode();
 
-            jsonResponse = await _httpClientFunction.GetResponseText(response);
-            var pdsDemographic = _fhirPatientDemographicMapper.ParseFhirJson(jsonResponse);
             var participantDemographic = pdsDemographic.ToParticipantDemographic();
             var upsertResult = await _pdsProcessor.UpsertDemographicRecordFromPDS(participantDemographic);
 

application/CohortManager/src/Functions/NemsSubscriptionService/ProcessNemsUpdate/ProcessNemsUpdate.cs

@@ -12,6 +12,7 @@
 using Microsoft.Extensions.Options;
 using Model;
 using DataServices.Client;
+using System.Net;
 using FluentValidation.Validators;
 
 public class ProcessNemsUpdate
@@ -73,7 +74,7 @@ public async Task Run([BlobTrigger("nems-updates/{name}", Connection = "nemsmesh
             nhsNumberLong = long.Parse(nhsNumber!);
 
             var pdsResponse = await RetrievePdsRecord(nhsNumber!);
-            if (pdsResponse!.StatusCode == System.Net.HttpStatusCode.NotFound)
+            if (pdsResponse!.StatusCode == HttpStatusCode.NotFound)
             {
                 _logger.LogError("the PDS function has returned a 404 error. function now stopping processing");
                 // we can stop processing here as we know that not found means the participant ether needed an update or they were actually not found
@@ -166,7 +167,7 @@ private async Task<HttpResponseMessage> RetrievePdsRecord(string nhsNumber)
             {"nhsNumber", nhsNumber }
         };
 
-        return await _httpClientFunction.SendGetHttpResponse(_config.RetrievePdsDemographicURL, queryParams);
+        return await _httpClientFunction.SendGetResponse(_config.RetrievePdsDemographicURL, queryParams);
     }
 
     private async Task ProcessRecord(Participant participant)

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

@@ -76,13 +76,14 @@ public async Task Run([ServiceBusTrigger(topicName: "%ServiceNowParticipantManag
     private async Task<ParticipantDemographic?> ValidateAndRetrieveParticipantFromPds(ServiceNowParticipant serviceNowParticipant)
     {
         var pdsResponse = await _httpClientFunction.SendGetResponse($"{_config.RetrievePdsDemographicURL}?nhsNumber={serviceNowParticipant.NhsNumber}");
+        string responseMessage = await _httpClientFunction.GetResponseText(pdsResponse);
 
         if (pdsResponse.StatusCode == HttpStatusCode.NotFound)
         {
-            await HandleException(new Exception("Request to PDS for ServiceNow Participant returned a 404 NotFound response."), serviceNowParticipant, ServiceNowMessageType.UnableToAddParticipant);
+            await HandleException(new Exception(responseMessage), serviceNowParticipant, ServiceNowMessageType.UnableToAddParticipant);
             return null;
         }
-
+        
         if (pdsResponse.StatusCode != HttpStatusCode.OK)
         {
             await HandleException(new Exception($"Request to PDS for ServiceNow Participant returned an unexpected response. Status code: {pdsResponse.StatusCode}"), serviceNowParticipant, ServiceNowMessageType.AddRequestInProgress);

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))",

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

@@ -60,7 +60,7 @@ public async Task<string> SendGet(string url, Dictionary<string, string> paramet
         return await GetAsync(client);
     }
 
-    public async Task<HttpResponseMessage> SendGetHttpResponse(string url, Dictionary<string, string> parameters)
+    public async Task<HttpResponseMessage> SendGetResponse(string url, Dictionary<string, string> parameters)
     {
         using var client = _factory.CreateClient();
 

application/CohortManager/src/Functions/Shared/Common/Interfaces/IHttpClientFunction.cs

@@ -24,15 +24,21 @@ public interface IHttpClientFunction
     /// <returns>string</returns>
     Task<string> SendGet(string url, Dictionary<string, string> parameters);
 
-    Task<HttpResponseMessage> SendGetHttpResponse(string url, Dictionary<string, string> parameters);
-
     /// <summary>
     /// Performs a GET request using HttpClient and returns the entire HTTP response.
     /// </summary>
     /// <param name="url">URL to be used in request.</param>
     /// <returns>HttpResponseMessage</returns>
     Task<HttpResponseMessage> SendGetResponse(string url);
 
+    /// <summary>
+    /// Performs a GET request using HttpClient and returns the entire HTTP response.
+    /// </summary>
+    /// <param name="url">URL to be used in request.</param>
+    /// <param name="parameters">Parameters to be added to the url and used in request.</param>
+    /// <returns>HttpResponseMessage</returns>
+    Task<HttpResponseMessage> SendGetResponse(string url, Dictionary<string, string> parameters);
+
     /// <summary>
     /// Sends a get request or throws an error
     /// </summary>

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

@@ -99,6 +99,11 @@ public async Task<HttpResponseMessage> SendGetResponse(string url)
         throw new NotImplementedException();
     }
 
+    public async Task<HttpResponseMessage> SendGetResponse(string url, Dictionary<string, string> parameters)
+    {
+        await Task.CompletedTask;
+        throw new NotImplementedException();
+    }
 
     /// <summary>
     /// takes in a fake string content and returns 200 OK response
@@ -119,9 +124,4 @@ private static HttpResponseMessage CreateFakeHttpResponse(string url, string con
         httpResponseData.StatusCode = HttpStatusCode.OK;
         return httpResponseData;
     }
-
-    public Task<HttpResponseMessage> SendGetHttpResponse(string url, Dictionary<string, string> parameters)
-    {
-        throw new NotImplementedException();
-    }
 }

docs/user-guides/user_guide.md

@@ -56,9 +56,10 @@ To make the application more manageable to run, some functions have had [docker
 
 Key of profiles:
 
-- bi-analytics - Functions that are only used by the external BI & Analytics product
 - bs-select - Functions that are only used by external requests from BS Select
 - ui - only used by the user interface
+- service-now - Functions that are only used in manual service now adds
+- nems - Functions that are only used in NEMS requests
 - non-essential - Functions that are not needed to run the application
 - not-implemented - Functions that do not yet have an implementation and are not in use