Merge branch 'main' into feat/DTOSS-7351-adding-new-ReceiveServiceNowMessage-function

Author: SamRobinson75684

application/CohortManager/compose.core.yaml

@@ -376,6 +376,16 @@ services:
       - DemographicDataServiceURI=http://localhost:7072/api/DemographicDataService
       - ExceptionFunctionURL=http://localhost:7070/api/CreateException
       - ParticipantDemographicDataServiceURL=http://localhost:7993/api/ParticipantDemographicDataService
+  retrieve-pds-demographic:
+    container_name: retrieve-pds-demographic
+    network_mode: host
+    build:
+      context: ./src/Functions/
+      dockerfile: DemographicServices/RetrievePDSDemographic/Dockerfile
+    environment:
+      - ASPNETCORE_URLS=http://*:8082
+      - ExceptionFunctionURL=http://localhost:7070/api/CreateException
+      - ParticipantDemographicDataServiceURL=http://localhost:7993/api/ParticipantDemographicDataService
 
   durable-demographic-function:
     container_name: durable-demographic-function

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/ITransformDataLookupFacade.cs

@@ -3,4 +3,5 @@ public interface ITransformDataLookupFacade
 {
     bool ValidateOutcode(string postcode);
     string GetBsoCode(string postcode);
+    public string GetBsoCodeUsingPCP(string primaryCareProvider);
 }

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/Program.cs

@@ -21,7 +21,6 @@
     .ConfigureServices(services =>
     {
         services.AddSingleton<ICreateResponse, CreateResponse>();
-        services.AddScoped<IBsTransformationLookups, BsTransformationLookups>();
         services.AddSingleton<ITransformDataLookupFacade, TransformDataLookupFacade>();
         services.AddSingleton<ITransformReasonForRemoval, TransformReasonForRemoval>();
     })

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformDataLookupFacade.cs

@@ -8,10 +8,14 @@ public class TransformDataLookupFacade : ITransformDataLookupFacade
 {
     private readonly ILogger<TransformDataLookupFacade> _logger;
     private readonly IDataServiceClient<BsSelectOutCode> _outcodeClient;
-    public TransformDataLookupFacade(ILogger<TransformDataLookupFacade> logger, IDataServiceClient<BsSelectOutCode> outcodeClient)
+    private readonly IDataServiceClient<BsSelectGpPractice> _bsSelectGPPracticeClient;
+    public TransformDataLookupFacade(ILogger<TransformDataLookupFacade> logger,
+                                    IDataServiceClient<BsSelectOutCode> outcodeClient,
+                                    IDataServiceClient<BsSelectGpPractice> bsSelectGPPracticeClient)
     {
         _logger = logger;
         _outcodeClient = outcodeClient;
+        _bsSelectGPPracticeClient = bsSelectGPPracticeClient;
     }
 
     public bool ValidateOutcode(string postcode)
@@ -30,4 +34,20 @@ public string GetBsoCode(string postcode){
     }
 
 
+    /// <summary>
+    /// Used in the 4 chained ParticipantNotRegisteredToGPWithReasonForRemoval rules.
+    /// Gets the participant's BSO code using their existing primary care provider.
+    /// </summary>
+    /// <param name="primaryCareProvider">The participant's existing primary care provider.</param>
+    /// <returns>string, the participant's BSO code.<returns>
+    public string GetBsoCodeUsingPCP(string primaryCareProvider)
+    {
+        var gpPractice = _bsSelectGPPracticeClient.GetSingle(primaryCareProvider).Result;
+
+        if (gpPractice == null)
+        {
+            return string.Empty;
+        }
+        return gpPractice.BsoCode;
+    }
 }

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformDataService.cs

@@ -26,24 +26,21 @@ public class TransformDataService
     private readonly ILogger<TransformDataService> _logger;
     private readonly ICreateResponse _createResponse;
     private readonly IExceptionHandler _exceptionHandler;
-    private readonly IBsTransformationLookups _transformationLookups;
     private readonly ITransformReasonForRemoval _transformReasonForRemoval;
-    private readonly IDataServiceClient<CohortDistribution> _CohortDistributionClient;
+    private readonly IDataServiceClient<CohortDistribution> _cohortDistributionClient;
     public TransformDataService(
         ICreateResponse createResponse,
         IExceptionHandler exceptionHandler,
         ILogger<TransformDataService> logger,
-        IBsTransformationLookups transformationLookups,
         ITransformReasonForRemoval transformReasonForRemoval,
         IDataServiceClient<CohortDistribution> cohortDistributionClient
     )
     {
         _createResponse = createResponse;
         _exceptionHandler = exceptionHandler;
         _logger = logger;
-        _transformationLookups = transformationLookups;
         _transformReasonForRemoval = transformReasonForRemoval;
-        _CohortDistributionClient = cohortDistributionClient;
+        _cohortDistributionClient = cohortDistributionClient;
     }
 
     [Function("TransformDataService")]
@@ -75,25 +72,24 @@ public async Task<HttpResponseData> RunAsync([HttpTrigger(AuthorizationLevel.Ano
                 return _createResponse.CreateHttpResponse(HttpStatusCode.BadRequest, req, "NHS Number couldn't be parsed to long");
             }
 
-            var existingParticipantsList = await _CohortDistributionClient.GetByFilter(x => x.NHSNumber == nhsNumberLong);
-
+            var existingParticipantsList = await _cohortDistributionClient.GetByFilter(x => x.NHSNumber == nhsNumberLong);
             var lastParticipant = existingParticipantsList.OrderByDescending(x => x.CohortDistributionId).FirstOrDefault();
 
             // Character transformation
             var transformString = new TransformString();
             participant = await transformString.TransformStringFields(participant);
 
-            // Database lookup transformations
-            participant = await LookupTransformations(participant);
+            // Address transformation
+            participant = TransformAddress(lastParticipant, participant);
 
             // Other transformation rules
-            participant = await TransformParticipantAsync(participant);
+            participant = await TransformParticipantAsync(participant, lastParticipant);
 
             // Name prefix transformation
             if (participant.NamePrefix != null)
                 participant.NamePrefix = await TransformNamePrefixAsync(participant.NamePrefix);
 
-            participant = await _transformReasonForRemoval.ReasonForRemovalTransformations(participant,lastParticipant);
+            participant = await _transformReasonForRemoval.ReasonForRemovalTransformations(participant, lastParticipant);
 
             var response = JsonSerializer.Serialize(participant);
 
@@ -112,7 +108,8 @@ public async Task<HttpResponseData> RunAsync([HttpTrigger(AuthorizationLevel.Ano
         }
     }
 
-    public async Task<CohortDistributionParticipant> TransformParticipantAsync(CohortDistributionParticipant participant)
+    public async Task<CohortDistributionParticipant> TransformParticipantAsync(CohortDistributionParticipant participant,
+                                                                            CohortDistribution databaseParticipant)
     {
         string json = await File.ReadAllTextAsync("transformRules.json");
         var rules = JsonSerializer.Deserialize<Workflow[]>(json);
@@ -126,8 +123,8 @@ public async Task<CohortDistributionParticipant> TransformParticipantAsync(Cohor
         var re = new RulesEngine.RulesEngine(rules, reSettings);
 
         var ruleParameters = new[] {
+            new RuleParameter("databaseParticipant", databaseParticipant),
             new RuleParameter("participant", participant),
-            new RuleParameter("transformLookups", _transformationLookups)
         };
 
         var resultList = await re.ExecuteAllRulesAsync("TransformData", ruleParameters);
@@ -170,60 +167,34 @@ private static async Task<string> TransformNamePrefixAsync(string namePrefix)
     }
 
     /// <summary>
-    /// Performs transformations that require database lookups using the BsTransformationLookups class
+    /// If the request participant's address is missing, this method updates it with the address from
+    /// the existing record in the database.
     /// </summary>
-    /// <param name="participant">The CohortDistributionParticipant to be transformed.</param>
-    /// <returns>The transformed participant</returns>
-    public async Task<CohortDistributionParticipant> LookupTransformations(CohortDistributionParticipant participant)
+    /// <exception cref="ArgumentException">Throws an error if the record's postcodes do not match</exception>
+    private static CohortDistributionParticipant TransformAddress(CohortDistribution databaseParticipant,
+                                                        CohortDistributionParticipant requestParticipant)
     {
-        // Set up rules engine
-        string json = await File.ReadAllTextAsync("lookupTransformationRules.json");
-        var rules = JsonSerializer.Deserialize<Workflow[]>(json);
-        var reSettings = new ReSettings { CustomTypes = [typeof(Actions)] };
-        var re = new RulesEngine.RulesEngine(rules, reSettings);
-
-        var ruleParameters = new[] {
-            new RuleParameter("participant", participant),
-            new RuleParameter("transformationLookups", _transformationLookups)
-        };
-
-        // Execute rules
-        var rulesList = await re.ExecuteAllRulesAsync("LookupTransformations", ruleParameters);
-
-        await HandleExceptions(rulesList, participant);
-
-        participant.FirstName = GetTransformedData<string>(rulesList, "FirstName", participant.FirstName);
-        participant.FamilyName = GetTransformedData<string>(rulesList, "FamilyName", participant.FamilyName);
-
-        // address transformation
-        if (!string.IsNullOrEmpty(participant.Postcode) &&
-            string.IsNullOrEmpty(participant.AddressLine1) &&
-            string.IsNullOrEmpty(participant.AddressLine2) &&
-            string.IsNullOrEmpty(participant.AddressLine3) &&
-            string.IsNullOrEmpty(participant.AddressLine4) &&
-            string.IsNullOrEmpty(participant.AddressLine5))
+        if (requestParticipant.RecordType != Actions.Amended)
+            return requestParticipant;
+
+        if (!string.IsNullOrEmpty(requestParticipant.Postcode) &&
+            string.IsNullOrEmpty(requestParticipant.AddressLine1) &&
+            string.IsNullOrEmpty(requestParticipant.AddressLine2) &&
+            string.IsNullOrEmpty(requestParticipant.AddressLine3) &&
+            string.IsNullOrEmpty(requestParticipant.AddressLine4) &&
+            string.IsNullOrEmpty(requestParticipant.AddressLine5))
         {
-            participant = _transformationLookups.GetAddress(participant);
+            if (requestParticipant.Postcode != databaseParticipant.PostCode)
+                throw new ArgumentException("Participant has an empty address and postcode does not match existing record");
+
+            requestParticipant.AddressLine1 = databaseParticipant.AddressLine1;
+            requestParticipant.AddressLine2 = databaseParticipant.AddressLine2;
+            requestParticipant.AddressLine3 = databaseParticipant.AddressLine3;
+            requestParticipant.AddressLine4 = databaseParticipant.AddressLine4;
+            requestParticipant.AddressLine5 = databaseParticipant.AddressLine5;
         }
 
-        return participant;
-    }
-
-    /// <summary>
-    /// Gets the result of the transformation from the rule output and assigns it to the relevant field.
-    /// Only being used for the rules that require database lookup as the other assignment method does not work.
-    /// </summary>
-    /// <param name="results">The rule result tree produced from the rule execution</param>
-    /// <param name="field">The name of the field</param>
-    /// <param name="currentValue">The current value of the field in the participant</param>
-    /// <returns>The transformed value, or the current value if null</returns>
-    private static T GetTransformedData<T>(List<RuleResultTree> results, string field, T currentValue)
-    {
-        // The field is the 3rd part of the rule
-        var result = results.Find(x => x.Rule.RuleName.Split('.')[2] == field);
-        if (result == null) return currentValue;
-
-        return result.ActionResult.Output == null ? currentValue : (T)result.ActionResult.Output;
+        return requestParticipant;
     }
 
     private async Task HandleExceptions(List<RuleResultTree> exceptions, CohortDistributionParticipant participant)

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/TransformReasonForRemoval.cs

@@ -8,12 +8,10 @@ namespace NHS.CohortManager.CohortDistribution;
 public class TransformReasonForRemoval : ITransformReasonForRemoval
 {
     private readonly IExceptionHandler _exceptionHandler;
-    private readonly IBsTransformationLookups _transformationLookups;
     private readonly ITransformDataLookupFacade _dataLookup;
-    public TransformReasonForRemoval(IExceptionHandler exceptionHandler, IBsTransformationLookups transformationLookups, ITransformDataLookupFacade dataLookup)
+    public TransformReasonForRemoval(IExceptionHandler exceptionHandler, ITransformDataLookupFacade dataLookup)
     {
         _exceptionHandler = exceptionHandler;
-        _transformationLookups = transformationLookups;
         _dataLookup = dataLookup;
     }
 
@@ -75,7 +73,7 @@ private string GetDummyPrimaryCareProvider(string postcode, string existingPrima
         }
         else
         {
-            return dummyPrimaryCareProvider + _transformationLookups.GetBsoCodeUsingPCP(existingPrimaryCareProvider);
+            return dummyPrimaryCareProvider + _dataLookup.GetBsoCodeUsingPCP(existingPrimaryCareProvider);
         }
     }
 }

application/CohortManager/src/Functions/CohortDistributionServices/TransformDataService/lookupTransformationRules.json

@@ -4,7 +4,7 @@
     "GlobalParams": [
         {
           "Name":"ValidNamePrefixes",
-          "Expression": "new string[] {\"A.ML\",\"ADM\",\"BRIG\",\"BRO\",\"CAN\",\"CAPT\",\"CMDR\",\"COL\",\"DAME\",\"DEAN\",\"DR\",\"EARL\",\"FR\",\"G.C\",\"GEN\",\"HON\",\"HRH\",\"LADY\",\"LORD\",\"LT.C\",\"MJR\",\"MISS\",\"MR\",\"MRS\",\"MS\",\"MX\",\"PROF\",\"R.RN\",\"R.HV\",\"REV\",\"SIR\",\"SQLD\",\"SR\",\"VISC\",\"WCOM\"}"
+          "Expression": "new string[] {\"A.ML\",\"ADM\",\"BRIG\",\"BRO\",\"CAN\",\"CAPT\",\"CMDR\",\"COL\",\"DAME\",\"DEAN\",\"DR\",\"EARL\",\"FR\",\"G.C\",\"GEN\",\"HON\",\"HRH\",\"LADY\",\"LORD\",\"LT.C\",\"MAJ\",\"MISS\",\"MR\",\"MRS\",\"MS\",\"MX\",\"PROF\",\"R.RN\",\"R.HV\",\"REV\",\"SIR\",\"SQLD\",\"SR\",\"VISC\",\"WCOM\"}"
         }
       ],
     "Rules": [