Merge branch 'main' into fix/DTOSS-10107-fix-poscode-validation-rule

Author: sudipnhs

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

@@ -26,7 +26,7 @@
     })
     .AddJwtTokenSigning(config.UseFakePDSServices)
     .AddTelemetry()
-    .AddServiceBusClient(config.EffectiveServiceBusConnectionString)
+    .AddServiceBusClient(config.ServiceBusConnectionString_client_internal)
     .AddHttpClient(config.UseFakePDSServices)
     .Build();
 

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

@@ -5,7 +5,6 @@ namespace NHS.CohortManager.DemographicServices;
 
 public class RetrievePDSDemographicConfig
 {
-
     [Required]
     public required string RetrievePdsParticipantURL { get; set; }
 
@@ -25,32 +24,9 @@ public class RetrievePDSDemographicConfig
     public required string ParticipantManagementTopic { get; set; }
 
     [Required]
-    public required string ServiceBusConnectionString { get; set; }
+    public required string ServiceBusConnectionString_client_internal { get; set; }
 
     public required bool UseFakePDSServices { get; set; } = false;
-    public string ClientId { get; set; } = string.Empty;
-
-    [ConfigurationKeyName("ServiceBusConnectionString_client_internal")]
-    public string? ServiceBusConnectionStringClientInternal { get; set; }
 
-    [Required]
-    public string EffectiveServiceBusConnectionString
-    {
-        get
-        {
-            if (!string.IsNullOrWhiteSpace(ServiceBusConnectionString))
-            {
-                return ServiceBusConnectionString;
-            }
-
-            if (!string.IsNullOrWhiteSpace(ServiceBusConnectionStringClientInternal))
-            {
-                return ServiceBusConnectionStringClientInternal;
-            }
-
-            throw new InvalidOperationException(
-                "Missing Service Bus connection string. " +
-                "Set ServiceBusConnectionString or ServiceBusConnectionString_client_internal.");
-        }
-    }
+    public string ClientId { get; set; } = string.Empty;
 }