Merge branch 'dev' into LEGLINK-951-DRMP-500-error

Author: arianamihailescu

DotNet/Automation.UI/Services/Persistence/PatientBundleExternalizationMigrationService.cs

@@ -78,11 +78,6 @@ private async Task<int> MigrateEmbeddedPayloadsAsync(CancellationToken ct)
             var scenarios = await _scenarios
                 .Find(scenarioFilter)
                 .SortBy(s => s.Id)
-                .Project(s => new ScenarioEmbeddedPayloadProjection
-                {
-                    Id = s.Id,
-                    ImportedPatientBundlesJson = s.ImportedPatientBundlesJson
-                })
                 .Limit(MigrationBatchSize)
                 .ToListAsync(ct);
 
@@ -121,12 +116,6 @@ await _scenarios.UpdateOneAsync(
             var runInputs = await _runInputs
                 .Find(runInputFilter)
                 .SortBy(r => r.RunId)
-                .Project(r => new RunInputEmbeddedPayloadProjection
-                {
-                    RunId = r.RunId,
-                    RunConfigurationJson = r.RunConfigurationJson,
-                    ImportedBundleIds = r.ImportedBundleIds
-                })
                 .Limit(MigrationBatchSize)
                 .ToListAsync(ct);
 
@@ -158,19 +147,6 @@ await _runInputs.UpdateOneAsync(
         return migrated;
     }
 
-    private sealed class ScenarioEmbeddedPayloadProjection
-    {
-        public Guid Id { get; init; }
-        public string? ImportedPatientBundlesJson { get; init; }
-    }
-
-    private sealed class RunInputEmbeddedPayloadProjection
-    {
-        public Guid RunId { get; init; }
-        public string? RunConfigurationJson { get; init; }
-        public List<Guid> ImportedBundleIds { get; init; } = [];
-    }
-
     private async Task<(bool Changed, string? Json, List<ImportedBundleReference> References, int MigratedCount)> ExternalizeBundleJsonAsync(
         string? json,
         Guid? scenarioId,

DotNet/Shared/Application/Services/AzureAppConfigurationRefreshService.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Configuration.AzureAppConfiguration;
+using Microsoft.Extensions.Configuration.AzureAppConfiguration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
@@ -21,21 +21,28 @@ public AzureAppConfigurationRefreshService(
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        while (!stoppingToken.IsCancellationRequested)
+        try
         {
-            foreach (var refresher in _refreshers)
+            while (!stoppingToken.IsCancellationRequested)
             {
-                try
+                foreach (var refresher in _refreshers)
                 {
-                    await refresher.TryRefreshAsync(stoppingToken);
+                    try
+                    {
+                        await refresher.TryRefreshAsync(stoppingToken);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogDebug(ex, "Failed to refresh Azure App Configuration.");
+                    }
                 }
-                catch (Exception ex)
-                {
-                    _logger.LogDebug(ex, "Failed to refresh Azure App Configuration.");
-                }
-            }
 
-            await Task.Delay(RefreshInterval, stoppingToken);
+                await Task.Delay(RefreshInterval, stoppingToken);
+            }
+        }
+        catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
+        {
+            _logger.LogDebug("Azure App Configuration refresh service is stopping.");
         }
     }
 }