From 7d91737daccb2da15b14949c34440c39107ccece Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Thu, 11 Jun 2026 14:16:21 -0400
Subject: [PATCH] feat(uns): carry created id on UnsMutationResult for
 equipment create

---
 .../Uns/UnsMutationResult.cs                   |  4 +++-
 .../Uns/UnsTreeService.cs                      |  2 +-
 .../Uns/UnsTreeServiceEquipmentTests.cs        | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsMutationResult.cs b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsMutationResult.cs
index ff5be32b..0a8a9699 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsMutationResult.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsMutationResult.cs
@@ -8,4 +8,6 @@ namespace ZB.MOM.WW.OtOpcUa.AdminUI.Uns;
 /// </summary>
 /// <param name="Ok">Whether the mutation was applied.</param>
 /// <param name="Error">The operator-facing failure message, or <c>null</c> on success.</param>
-public readonly record struct UnsMutationResult(bool Ok, string? Error);
+/// <param name="CreatedId">On a successful create, the new entity's system id (e.g. the generated
+/// <c>EQ-…</c> equipment id) so the caller can navigate to it; <c>null</c> for updates/deletes/failures.</param>
+public readonly record struct UnsMutationResult(bool Ok, string? Error, string? CreatedId = null);
diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
index 8632ba13..dd21f0b3 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.AdminUI/Uns/UnsTreeService.cs
@@ -539,7 +539,7 @@ public sealed class UnsTreeService(IDbContextFactory<OtOpcUaConfigDbContext> dbF
             Enabled = input.Enabled,
         });
         await db.SaveChangesAsync(ct);
-        return new UnsMutationResult(true, null);
+        return new UnsMutationResult(true, null, equipmentId);
     }
 
     /// <inheritdoc />
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
index b5831e0a..2c4ec37d 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/Uns/UnsTreeServiceEquipmentTests.cs
@@ -348,6 +348,24 @@ public sealed class UnsTreeServiceEquipmentTests
         verify.Equipment.Single(e => e.EquipmentId == equipmentId).DriverInstanceId.ShouldBe("DRV-1");
     }
 
+    /// <summary>CreateEquipmentAsync returns the generated EQ- id in <c>CreatedId</c> so callers can navigate to the new page.</summary>
+    [Fact]
+    public async Task CreateEquipment_returns_generated_id_in_CreatedId()
+    {
+        var dbName = $"uns-eq-createdid-{Guid.NewGuid():N}";
+        UnsTreeTestDb.SeedNamed(dbName);
+        var service = new UnsTreeService(UnsTreeTestDb.Factory(dbName));
+
+        var input = new EquipmentInput("machine-2", "machine_002", "LINE-1",
+            null, null, null, null, null, null, null, null, null, null, null, null, true);
+
+        var result = await service.CreateEquipmentAsync(input);
+
+        result.Ok.ShouldBeTrue();
+        result.CreatedId.ShouldNotBeNull();
+        result.CreatedId!.ShouldStartWith("EQ-");
+    }
+
     // ----- DeleteEquipment -----
 
     /// <summary>Deleting equipment removes the row.</summary>