Merge branch 'dev' of https://github.com/lantanagroup/link-cloud into LEGLINK-186-KafkaRetryImplementation

Author: arianamihailescu

Azure_Pipelines/azure-pipelines.db-schema-creation.yaml

@@ -1,6 +1,7 @@
 using Automation.UI.Models;
 using Automation.UI.Services.Persistence;
 using Microsoft.AspNetCore.Mvc;
+using MongoDB.Driver;
 
 namespace Automation.UI.Controllers;
 
@@ -23,22 +24,40 @@ public async Task<IActionResult> GetJson(Guid id, CancellationToken ct)
 
     [HttpPost]
     [ValidateAntiForgeryToken]
-    public async Task<IActionResult> SaveInline([FromBody] OrganizationResourceMapTemplate model, CancellationToken ct)
+    public async Task<IActionResult> SaveInline(
+    [FromBody] OrganizationResourceMapTemplate model,
+    CancellationToken ct)
     {
         if (string.IsNullOrWhiteSpace(model.Name))
             return BadRequest("Template name is required.");
+
         if (model.Conditions == null || model.Conditions.Count == 0)
             return BadRequest("At least one mapping condition is required.");
+
         if (model.Conditions.Any(c => string.IsNullOrWhiteSpace(c.FhirPath)))
             return BadRequest("All mapping conditions must include a FHIRPath.");
 
+        model.Name = model.Name.Trim();
+
+        var templates = await store.GetAllAsync(ct);
+
+        if (HasDuplicateName(templates, model.Name, model.Id))
+        {
+            return Conflict(
+                $"An Organization Resource Map named '{model.Name}' already exists.");
+        }
+
         var existing = await store.GetByIdAsync(model.Id, ct);
+
         if (existing is { IsSystem: true })
-            return StatusCode(StatusCodes.Status403Forbidden, "System template cannot be modified.");
+            return StatusCode(
+                StatusCodes.Status403Forbidden,
+                "System template cannot be modified.");
 
         model.IsSystem = false;
         model.IsDefault = existing?.IsDefault ?? model.IsDefault;
         model.UpdatedAt = DateTimeOffset.UtcNow;
+
         await store.UpsertAsync(model, ct);
         return Json(new { id = model.Id });
     }
@@ -71,10 +90,21 @@ public async Task<IActionResult> CloneInline([FromBody] IdRequest request, Cance
         var source = await store.GetByIdAsync(request.Id, ct);
         if (source == null) return NotFound();
 
+        var templates = await store.GetAllAsync(ct);
+
+        var cloneName = BuildCloneName(source.Name);
+        var copyNumber = 2;
+
+        while (HasDuplicateName(templates, cloneName))
+        {
+            cloneName = BuildCloneName(source.Name, copyNumber);
+            copyNumber++;
+        }
+
         var clone = new OrganizationResourceMapTemplate
         {
             Id = Guid.NewGuid(),
-            Name = $"{source.Name} (Copy)",
+            Name = cloneName,
             Description = source.Description,
             Conditions = source.Conditions.Select(c => new OrganizationResourceMapCondition
             {
@@ -87,7 +117,8 @@ public async Task<IActionResult> CloneInline([FromBody] IdRequest request, Cance
         };
 
         await store.UpsertAsync(clone, ct);
-        return Json(new { id = clone.Id });
+
+        return CreatedAtAction(nameof(GetJson), new { id = clone.Id }, new { id = clone.Id });
     }
 
     [HttpPost]
@@ -104,4 +135,26 @@ public async Task<IActionResult> SetDefaultInline([FromBody] IdRequest request,
         return Ok();
     }
 
+    private static bool HasDuplicateName(
+    IEnumerable<OrganizationResourceMapTemplate> templates,
+    string name,
+    Guid? excludeId = null)
+    {
+        return templates.Any(t =>
+            (!excludeId.HasValue || t.Id != excludeId.Value) &&
+            string.Equals(t.Name, name, StringComparison.OrdinalIgnoreCase));
+    }
+
+    private static string BuildCloneName(
+    string sourceName,
+    int? copyNumber = null)
+    {
+        var suffix = copyNumber.HasValue
+            ? $" (Copy {copyNumber.Value})"
+            : " (Copy)";
+
+        var baseName = sourceName.Trim();
+
+        return baseName + suffix;
+    }
 }

DotNet/Automation.UI/Controllers/OrganizationResourceMapsController.cs

@@ -540,4 +540,4 @@ public static class ValidationSteps
         public const string ResultsGet200Seeded = "Results GET → 200 (seeded)";
         public const string ResultsGet200Empty = "Results GET → 200 (empty)";
     }
-}
+}

DotNet/Automation.UI/Services/ApiHealth/TestSuites/ApiEndPointLibrary.cs

@@ -47,9 +47,21 @@ public void EnsureAllIndexes()
 
     private void EnsureOrganizationResourceMapTemplateIndexes()
     {
-        var collection = _database.GetCollection<BsonDocument>("automation_org_resource_map_templates");
-        CreateIndexSafe(collection, new BsonDocument { { "Name", 1 } }, unique: false, "idx_name_asc");
-        CreateIndexSafe(collection, new BsonDocument { { "IsDefault", 1 } }, unique: false, "idx_isDefault");
+        var collection = _database.GetCollection<BsonDocument>(
+            "automation_org_resource_map_templates");
+
+        // Retain Name index because GetAllAsync sorts by display Name.
+        CreateIndexSafe(
+            collection,
+            new BsonDocument { { "Name", 1 } },
+            unique: false,
+            "idx_name_asc");
+
+        CreateIndexSafe(
+            collection,
+            new BsonDocument { { "IsDefault", 1 } },
+            unique: false,
+            "idx_isDefault");
     }
 
     // --- automation_runs ---

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

@@ -1,6 +1,6 @@
-using System.Text.Json;
-using Automation.UI.Models;
+using Automation.UI.Models;
 using MongoDB.Driver;
+using System.Text.Json;
 
 namespace Automation.UI.Services.Persistence;
 
@@ -72,7 +72,7 @@ public async Task DeleteAsync(Guid id, CancellationToken ct = default)
     private static OrganizationResourceMapTemplateDocument ToDocument(OrganizationResourceMapTemplate model) => new()
     {
         Id = model.Id,
-        Name = model.Name,
+        Name = model.Name.Trim(),
         Description = model.Description,
         IsSystem = model.IsSystem,
         IsDefault = model.IsDefault,
@@ -87,7 +87,8 @@ public async Task DeleteAsync(Guid id, CancellationToken ct = default)
         Description = doc.Description,
         IsSystem = doc.IsSystem,
         IsDefault = doc.IsDefault,
-        Conditions = Deserialize<List<OrganizationResourceMapCondition>>(doc.ConditionsJson) ?? [],
+        Conditions = Deserialize<List<OrganizationResourceMapCondition>>(
+        doc.ConditionsJson) ?? [],
         UpdatedAt = doc.UpdatedAt
     };
 

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

@@ -8,7 +8,6 @@ internal sealed class OrganizationResourceMapTemplateDocument
     [BsonId]
     [BsonRepresentation(BsonType.String)]
     public Guid Id { get; set; }
-
     public string Name { get; set; } = string.Empty;
     public string? Description { get; set; }
     public bool IsSystem { get; set; }

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

@@ -462,7 +462,7 @@
             const conditions = collectConditions();
             const model={
                 id: document.getElementById('MapId').value || crypto.randomUUID(),
-                name: document.getElementById('MapName').value,
+                        name: document.getElementById('MapName').value.trim(),
                 description: document.getElementById('MapDescription').value || null,
                 conditions: conditions,
                 isSystem:false,

DotNet/Automation.UI/Views/OrganizationResourceMaps/Index.cshtml

@@ -265,7 +265,10 @@
                     </button>
                 </div>
                 <div class="col-md-2">
-                    <a asp-controller="Scenarios" asp-action="Index" class="btn btn-outline-secondary w-100">
+                    <a asp-controller="Scenarios"
+                       asp-action="Index"
+                       class="btn btn-outline-secondary w-100"
+                       id="btnManageScenario">
                         <i class="bi bi-journal-text me-1"></i> Manage
                     </a>
                 </div>
@@ -302,6 +305,7 @@
     var recentRunsPartialUrl = '@Url.Action("RecentRunsPartial", "Runs")';
     var cancelUrl = '@Url.Action("CancelJson", "Runs")';
     var deleteUrl = '@Url.Action("DeleteJson", "Runs")';
+            var scenariosUrl = '@Url.Action("Index", "Scenarios")';
 
     // --- KPI elements ---
     var kpiActive = document.getElementById('kpiActive');
@@ -612,6 +616,7 @@
     var noResults = document.getElementById('quickLaunchNoResults');
     var quickTypeFilter = document.getElementById('quickLaunchTypeFilter');
     var quickSort = document.getElementById('quickLaunchSort');
+            var manageLink = document.getElementById('btnManageScenario');
 
     function getQuickLaunchOptions() {
         return Array.from(
@@ -689,6 +694,12 @@
             dropdownButton.textContent =
                 label || '-- Select a scenario --';
         }
+
+        if (manageLink) {
+            manageLink.href = id
+                ? scenariosUrl + '?editScenarioId=' + encodeURIComponent(id)
+                : scenariosUrl;
+        }
     }
 
     if (quickSearch) {
@@ -1019,6 +1030,7 @@
         refreshRecentRunsCard({ pageSize: sel.value, pageNumber: '1' });
     });
 })();
+
 </script>
 
 @await Html.PartialAsync("_ScenarioEditorModal")

DotNet/Automation.UI/Views/Runs/Index.cshtml

@@ -247,5 +247,18 @@
         }
 
         applyScenarioView();
+
+        // Open a scenario passed from Quick Launch directly in the editor.
+        var editScenarioId = new URLSearchParams(window.location.search).get('editScenarioId');
+
+        if (editScenarioId && typeof window.openScenarioEditor === 'function') {
+            window.openScenarioEditor(editScenarioId, 'edit');
+
+            // Remove the one-time navigation parameter so saving/reloading the
+            // Scenarios page does not automatically reopen the editor.
+            var url = new URL(window.location.href);
+            url.searchParams.delete('editScenarioId');
+            window.history.replaceState(null, '', url.toString());
+        }
     })();
 </script>

DotNet/Automation.UI/Views/Scenarios/Index.cshtml

@@ -10,6 +10,8 @@
 import com.lantanagroup.link.shared.entities.ReportScheduleModel;
 import com.lantanagroup.link.shared.exceptions.ValidationException;
 import com.lantanagroup.link.shared.services.ReportClient;
+import com.lantanagroup.link.shared.utils.LogUtils;
+import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.r4.model.IdType;
 import org.hl7.fhir.r4.model.MeasureReport;
 import org.hl7.fhir.r4.model.Reference;
@@ -19,10 +21,10 @@
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 public class BlobStorageService {
@@ -114,9 +116,18 @@ private List<Resource> normalize(MeasureReport measureReport) {
         }
 
         List<Resource> contained = measureReport.getContained();
-        Map<String, Resource> containedByIdPart = contained.stream().collect(Collectors.toMap(
-                resource -> stripHash(resource.getIdPart()),
-                Function.identity()));
+
+        // Contained resource IDs are only guaranteed unique within a resource type (e.g. Condition/A and
+        // Observation/A can legally coexist), so the primary lookup is type-qualified. A secondary,
+        // id-part-only index is kept to resolve untyped "#id" references, but only when unambiguous.
+        Map<String, Resource> containedByTypedId = new HashMap<>();
+        Map<String, List<Resource>> containedByIdPart = new HashMap<>();
+        for (Resource resource : contained) {
+            String idPart = stripHash(resource.getIdPart());
+            containedByTypedId.put(resource.getResourceType().name() + "/" + idPart, resource);
+            containedByIdPart.computeIfAbsent(idPart, key -> new ArrayList<>()).add(resource);
+        }
+
         measureReport.setContained(null);
         measureReport.setEvaluatedResource(null);
         for (Resource resource : contained) {
@@ -127,8 +138,26 @@ private List<Resource> normalize(MeasureReport measureReport) {
         }
         for (Reference reference :
                 fhirContext.newTerser().getAllPopulatedChildElementsOfType(measureReport, Reference.class)) {
-            String idPart = stripHash(reference.getReferenceElement().getIdPart());
-            Resource resource = containedByIdPart.get(idPart);
+            IIdType referenceElement = reference.getReferenceElement();
+            String idPart = stripHash(referenceElement.getIdPart());
+            String resourceType = referenceElement.getResourceType();
+
+            Resource resource;
+            if (resourceType != null) {
+                resource = containedByTypedId.get(resourceType + "/" + idPart);
+            } else {
+                List<Resource> candidates = containedByIdPart.getOrDefault(idPart, List.of());
+                if (candidates.size() > 1) {
+                    String candidateTypes = candidates.stream()
+                            .map(candidate -> candidate.getResourceType().name())
+                            .collect(Collectors.joining(", "));
+                    logger.warn("Contained reference '#{}' is ambiguous between {} resources ({}); leaving reference unresolved",
+                            LogUtils.sanitize(idPart), candidates.size(), LogUtils.sanitize(candidateTypes));
+                    continue;
+                }
+                resource = candidates.isEmpty() ? null : candidates.get(0);
+            }
+
             if (resource == null) {
                 continue;
             }