Merge branch 'dev' into user/ariana/LEGLINK-961-MeasureEval-handleFhirResourceswithIdenticalds

Author: arianamihailescu

DotNet/Automation.UI/Controllers/OrganizationResourceMapsController.cs

@@ -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/Services/Persistence/MongoIndexManager.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/MongoOrganizationResourceMapTemplateStore.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/OrganizationResourceMapTemplateDocument.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/Views/OrganizationResourceMaps/Index.cshtml

@@ -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,