Merge branch 'main' into feat/DTOSS-10476-snow-participant-to-cohort

Author: Warren-Pitterson

.azuredevops/pipelines/acr-image-promote-integration-to-preprod.yaml

@@ -0,0 +1,37 @@
+---
+
+name: $(Build.SourceBranchName)-$(Date:yyyyMMdd)_$(Rev:r)
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: dtos-devops-templates
+      type: github
+      name: NHSDigital/dtos-devops-templates
+      ref: 8570bd32f8da7dfbf2f88fcc9190181e4757fcca
+      endpoint: NHSDigital
+
+variables:
+  - group: PRD_hub_backend_remote_state
+
+stages:
+- stage: db_changes_stage
+  displayName: Database changes
+  jobs:
+  - job: db_changes
+    pool:
+      name: private-pool-prod-uks
+    displayName: Apply database changes
+    variables:
+      - group: PRE_core_backend
+      - group: PRE_image_pipelines
+    steps:
+      - checkout: self
+      - checkout: dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
+        parameters:
+          serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)

.azuredevops/pipelines/acr-image-promote-preprod-to-prod.yaml

@@ -0,0 +1,37 @@
+---
+
+name: $(Build.SourceBranchName)-$(Date:yyyyMMdd)_$(Rev:r)
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: dtos-devops-templates
+      type: github
+      name: NHSDigital/dtos-devops-templates
+      ref: 8570bd32f8da7dfbf2f88fcc9190181e4757fcca
+      endpoint: NHSDigital
+
+variables:
+  - group: PRD_hub_backend_remote_state
+
+stages:
+- stage: db_changes_stage
+  displayName: Database changes
+  jobs:
+  - job: db_changes
+    pool:
+      name: private-pool-prod-uks
+    displayName: Apply database changes
+    variables:
+      - group: PROD_core_backend
+      - group: PROD_image_pipelines
+    steps:
+      - checkout: self
+      - checkout: dtos-devops-templates
+      - template: .azuredevops/templates/steps/app-container-job-start.yaml@dtos-devops-templates
+        parameters:
+          serviceConnection: $(SERVICE_CONNECTION)
+          targetSubscriptionId: $(TF_VAR_TARGET_SUBSCRIPTION_ID)
+          resourceGroupName: $(RESOURCE_GROUP_NAME_SQL)
+          jobName: $(DATABASE_MANAGEMENT_JOB_NAME)

.gitignore

@@ -63,6 +63,7 @@ appsettings.json
 application/CohortManager/SampleData/
 *.csv
 *.parquet
+*.xml
 !tests/UnitTests/CaasIntegrationTests/receiveCaasFileTest/*.parquet
 
 # csv to sql statement scripts

application/CohortManager/compose.core.yaml

@@ -58,7 +58,7 @@ services:
       - ExceptionFunctionURL=http://create-exception:7070/api/CreateException
       - RetrievePdsDemographicURL=http://retrieve-pds-demographic:8082/api/RetrievePDSDemographic
       - UnsubscribeNemsSubscriptionUrl=http://manage-nems-subscription:9081/api/Unsubscribe
-      - ParticipantDemographicDataServiceURL=http://participant-demographic-data-service:7993/api/ParticipantDemographicDataService
+      - DemographicDataServiceURL=http://participant-demographic-data-service:7993/api/ParticipantDemographicDataService
       - ServiceBusConnectionString_client_internal=Endpoint=sb://service-bus;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;
       - ParticipantManagementTopic=participant-management-topic
 

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

@@ -49,13 +49,13 @@ public async Task<HttpResponseData> Subscribe([HttpTrigger(AuthorizationLevel.An
 
             string? nhsNumber = req.Query["nhsNumber"];
 
-            if (!ValidationHelper.ValidateNHSNumber(nhsNumber))
+            if (!ValidationHelper.ValidateNHSNumber(nhsNumber!))
             {
                 _logger.LogError("NHS number is required and must be valid format");
                 return await _createResponse.CreateHttpResponseWithBodyAsync(HttpStatusCode.BadRequest, req, "NHS number is required and must be valid format.");
             }
 
-            var result = await _subscriptionManager.CreateAndSendSubscriptionAsync(nhsNumber);
+            var result = await _subscriptionManager.CreateAndSendSubscriptionAsync(nhsNumber!);
 
             if (!result.Success)
             {

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

@@ -12,6 +12,8 @@ namespace NHS.CohortManager.DemographicServices;
 using Microsoft.Extensions.Options;
 using System.Threading.Tasks;
 using Model;
+using System.Net.Http.Json;
+using Hl7.Fhir.Support;
 
 public class RetrievePdsDemographic
 {
@@ -71,12 +73,8 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
 
             if (response.StatusCode == HttpStatusCode.NotFound)
             {
-                var demographicRecordDeletedFromDatabase = await DeleteDemographicRecord(nhsNumber);
-                if (!demographicRecordDeletedFromDatabase)
-                {
-                    return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, "could not delete record from database. See logs for more details.");
-                }
-                return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, "Record not found in PDS and successfully removed from cohort manager database.");
+                var pdsErrorResponse = await response.Content.ReadAsStringAsync();
+                return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req, pdsErrorResponse);
             }
 
             response.EnsureSuccessStatusCode();
@@ -129,36 +127,4 @@ private async Task<bool> UpsertDemographicRecordFromPDS(ParticipantDemographic p
         _logger.LogError("Failed to update Participant Demographic.");
         return false;
     }
-
-    private async Task<bool> DeleteDemographicRecord(string nhsNumber)
-    {
-        var nhsNumberParsed = long.TryParse(nhsNumber, out long parsedNhsNumber);
-        if (!nhsNumberParsed)
-        {
-            _logger.LogError("could not parse nhs number when trying to get record for deletion.");
-            return false;
-        }
-        var oldParticipantDemographic = await _participantDemographicClient.GetSingleByFilter(i => i.NhsNumber == parsedNhsNumber);
-
-        if (oldParticipantDemographic == null)
-        {
-
-            _logger.LogWarning("Failed to delete Participant Demographic as record did not exist in database.");
-            return false;
-        }
-
-        _logger.LogInformation("Participant Demographic record found, attempting to delete  Participant Demographic.");
-        bool updateSuccess = await _participantDemographicClient.Delete(oldParticipantDemographic.ParticipantId.ToString());
-
-        if (updateSuccess)
-        {
-            _logger.LogInformation("Successfully deleted Participant Demographic.");
-            return true;
-        }
-
-        _logger.LogError("Failed to delete Participant Demographic.");
-        return false;
-    }
-
-
 }

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

@@ -0,0 +1,9 @@
+namespace NHS.Screening.ProcessNemsUpdate;
+
+public class PdsCoding
+{
+    public string? code { get; set; }
+    public string? display { get; set; }
+    public string? system { get; set; }
+    public string? version { get; set; }
+}

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

@@ -0,0 +1,7 @@
+namespace NHS.Screening.ProcessNemsUpdate;
+
+public class PdsErrorResponse
+{
+    public List<PdsIssue>? issue { get; set; }
+    public string? resourceType { get; set; }
+}

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

@@ -0,0 +1,8 @@
+namespace NHS.Screening.ProcessNemsUpdate;
+
+public class PdsIssue
+{
+    public string? code { get; set; }
+    public PdsErrorDetails? details { get; set; }
+    public string? severity { get; set; }
+}

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

@@ -0,0 +1,7 @@
+namespace NHS.Screening.ProcessNemsUpdate;
+
+public class PdsErrorDetails
+{
+    public List<PdsCoding>? coding { get; set; }
+}
+