feat: RetrievePdsDemographic function adds demographic data to database (#1179)

* refactor: Updated namespace for consistency

* feat: Implemented insert behaviour for when participant demographic doesn't exist

* test: Updated unit tests

* test: Fixed broken unit test

Author: alex-clayton-1

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

@@ -30,4 +30,3 @@ await response.WriteAsJsonAsync(new
         return response;
     }
 }
-

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

@@ -4,8 +4,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using DataServices.Client;
-using NHS.Screening.RetrievePDSDemographic;
 using Model;
+using NHS.CohortManager.DemographicServices;
 
 var host = new HostBuilder()
     .AddConfiguration<RetrievePDSDemographicConfig>(out RetrievePDSDemographicConfig config)

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

@@ -10,8 +10,6 @@ namespace NHS.CohortManager.DemographicServices;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Model;
-using Model.Enums;
-using NHS.Screening.RetrievePDSDemographic;
 
 public class RetrievePdsDemographic
 {
@@ -56,71 +54,59 @@ public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymou
 
             var response = await _httpClientFunction.SendPdsGet(url);
 
-            if (response.StatusCode == HttpStatusCode.OK)
-            {
-                var jsonResponse = await _httpClientFunction.GetResponseText(response);
-                var demographic = _fhirPatientDemographicMapper.ParseFhirJson(jsonResponse);
-                var updatedParticipantDemographic = demographic.ToParticipantDemographic();
-                var updateResult = await UpdateDemographicRecordFromPDS(updatedParticipantDemographic);
-                return updateResult switch
-                {
-                    UpdateResult.Success => CreateSuccessResponse(req, demographic),
-                    UpdateResult.NotFound => HandleParticipantNotFound(req),
-                    UpdateResult.UpdateFailed => HandleUpdateFailure(req),
-                    _ => HandleUnexpectedUpdateResult(req)
-                };
-            }
-
             if (response.StatusCode == HttpStatusCode.NotFound)
             {
                 return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req);
             }
 
-            return _createResponse.CreateHttpResponse(HttpStatusCode.InternalServerError, req);
+            response.EnsureSuccessStatusCode();
+
+            var jsonResponse = await _httpClientFunction.GetResponseText(response);
+            var pdsDemographic = _fhirPatientDemographicMapper.ParseFhirJson(jsonResponse);
+            var participantDemographic = pdsDemographic.ToParticipantDemographic();
+            var upsertResult = await UpsertDemographicRecordFromPDS(participantDemographic);
 
+            return upsertResult ?
+                _createResponse.CreateHttpResponse(HttpStatusCode.OK, req, JsonSerializer.Serialize(participantDemographic)) :
+                _createResponse.CreateHttpResponse(HttpStatusCode.InternalServerError, req);
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "There has been an error fetching PDS participant data: {Message}", ex.Message);
+            _logger.LogError(ex, "There has been an error retrieving PDS participant data.");
             return _createResponse.CreateHttpResponse(HttpStatusCode.InternalServerError, req);
         }
     }
 
-    private async Task<UpdateResult> UpdateDemographicRecordFromPDS(ParticipantDemographic updatedParticipantDemographic)
+    private async Task<bool> UpsertDemographicRecordFromPDS(ParticipantDemographic participantDemographic)
     {
-        // Check participant exists in Participant Demographic table.
-        ParticipantDemographic oldParticipantDemographic = await _participantDemographicClient.GetSingleByFilter(i => i.NhsNumber == updatedParticipantDemographic.NhsNumber);
+        ParticipantDemographic oldParticipantDemographic = await _participantDemographicClient.GetSingleByFilter(i => i.NhsNumber == participantDemographic.NhsNumber);
+
         if (oldParticipantDemographic == null)
         {
-            _logger.LogWarning("The participant could not be found, when trying to update old Participant from PDS.");
-            return UpdateResult.NotFound;
-        }
-        updatedParticipantDemographic.ParticipantId = oldParticipantDemographic.ParticipantId;
-        bool updateSuccess = await _participantDemographicClient.Update(updatedParticipantDemographic);
-        return updateSuccess ? UpdateResult.Success : UpdateResult.UpdateFailed;
-    }
+            _logger.LogInformation("Participant Demographic record not found, attemping to add Participant Demographic.");
+            bool addSuccess = await _participantDemographicClient.Add(participantDemographic);
 
-    private HttpResponseData CreateSuccessResponse(HttpRequestData req, PdsDemographic demographic)
-    {
-        return _createResponse.CreateHttpResponse(HttpStatusCode.OK,req,JsonSerializer.Serialize(demographic));
-    }
+            if (addSuccess)
+            {
+                _logger.LogInformation("Successfully added Participant Demographic.");
+                return true;
+            }
 
-    private HttpResponseData HandleParticipantNotFound(HttpRequestData req)
-    {
-        _logger.LogWarning("Participant not found when updating from PDS for NHS number");
-        return _createResponse.CreateHttpResponse(HttpStatusCode.NotFound, req);
-    }
+            _logger.LogError("Failed to add Participant Demographic.");
+            return false;
+        }
 
-    private HttpResponseData HandleUpdateFailure(HttpRequestData req)
-    {
-        _logger.LogError("Failed to update Demographic record from PDS.");
-        return _createResponse.CreateHttpResponse(HttpStatusCode.InternalServerError, req);
-    }
+        _logger.LogInformation("Participant Demographic record found, attempting to update Participant Demographic.");
+        participantDemographic.ParticipantId = oldParticipantDemographic.ParticipantId;
+        bool updateSuccess = await _participantDemographicClient.Update(participantDemographic);
 
-    private HttpResponseData HandleUnexpectedUpdateResult(HttpRequestData req)
-    {
-        _logger.LogError("Unexpected result when updating participant demographic record from PDS.");
-        return _createResponse.CreateHttpResponse(HttpStatusCode.InternalServerError, req);
-    }
+        if (updateSuccess)
+        {
+            _logger.LogInformation("Successfully updated Participant Demographic.");
+            return true;
+        }
 
+        _logger.LogError("Failed to update Participant Demographic.");
+        return false;
+    }
 }

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

@@ -1,12 +1,12 @@
-namespace NHS.Screening.RetrievePDSDemographic;
+namespace NHS.CohortManager.DemographicServices;
 
 using System.ComponentModel.DataAnnotations;
 
 public class RetrievePDSDemographicConfig
 {
     [Required]
-    public string RetrievePdsParticipantURL { get; set; }
+    public required string RetrievePdsParticipantURL { get; set; }
 
     [Required]
-    public string DemographicDataServiceURL { get; set; }
+    public required string DemographicDataServiceURL { get; set; }
 }