bug: get resources/instances empty response due to missing resource info (#2606)

* bug: get resources/instances empty response due to missing resource info

#2605

- Rename properties on InstanceDto to just return instance refId
- Utvidet connection query for å joine inn minimums info om ressurs knytt til instans-delegeringer

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Jon Kjetil Øye <acn-joye@ai-dev.no>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Author: 3 people

src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.Core/Services/ConnectionService.cs

@@ -301,23 +301,13 @@ private async Task<List<InstancePermissionDto>> MapConnectionsToInstancePermissi
         foreach (var group in grouped)
         {
             var firstInstance = group.First().Instance;
-            var firstConnection = group.First().Connection;
-
-            // Get the resource from the Resources collection
-            var resource = firstConnection.Resources?.FirstOrDefault(r => r.Id == firstInstance.ResourceId);
-
-            if (resource == null)
-            {
-                continue; // Skip if resource not found
-            }
 
             var dto = new InstancePermissionDto
             {
-                Resource = DtoMapper.Convert(resource),
+                Resource = new ResourceDto { Id = firstInstance.ResourceId, RefId = firstInstance.ResourceRefId, Name = firstInstance.ResourceName },
                 Instance = new InstanceDto
                 {
-                    Id = firstInstance.InstanceId,
-                    Urn = $"urn:altinn:instance-id:{firstInstance.InstanceId}",
+                    RefId = firstInstance.InstanceId,
                     Type = null // TODO: InstanceType support to be added later
                 },
                 Permissions = group.Select(x => DtoMapper.ConvertToPermission(x.Connection)).ToList()
@@ -1035,8 +1025,7 @@ public async Task<Result<InstanceCheckDto>> InstanceDelegationCheck(Guid authent
             Resource = resourceDto,
             Instance = new InstanceDto
             {
-                Id = instanceId,
-                Urn = $"urn:altinn:instance-id:{instanceId}",
+                RefId = instanceId,
                 Type = null
             },
             Rights = checkRights
@@ -2134,7 +2123,7 @@ private async Task<List<InstanceRightDto>> GetInstanceRights(Guid? fromId, Guid?
             {
                 Resource = DtoMapper.Convert(internalResource),
                 Instance = !string.IsNullOrEmpty(instanceId) 
-                    ? new InstanceDto { Id = instanceId, Urn = $"urn:altinn:instance-id:{instanceId}" }
+                    ? new InstanceDto { RefId = instanceId }
                     : null,
                 Rights = new List<RightPermission>()
             };

src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.PersistenceEF/Queries/Connection/ConnectionQuery.cs

@@ -1175,10 +1175,11 @@ private async Task<ConnectionIndex<ConnectionQueryInstance>> LoadInstancesByKeyA
         var flat = assignmentInstances.Select(x => new { x.c, x.ai.Id, x.ai.ResourceId, x.ai.InstanceId });
 
         var rows = await flat
-            .Select(x => new
+            .Join(db.Resources, x => x.ResourceId, r => r.Id, (x, r) => new
             {
                 Key = new ConnectionCompositeKey(x.c.FromId, x.c.ToId, x.c.RoleId, x.c.AssignmentId, x.c.DelegationId, x.c.ViaId, x.c.ViaRoleId),
-                Instance = new { x.Id, x.ResourceId, x.InstanceId }
+                Instance = new { x.Id, x.ResourceId, x.InstanceId },
+                Resource = new { r.Name, r.RefId }
             })
             .AsNoTracking()
             .ToListAsync(ct);
@@ -1191,6 +1192,8 @@ private async Task<ConnectionIndex<ConnectionQueryInstance>> LoadInstancesByKeyA
                 Id = z.Instance.Id,
                 ResourceId = z.Instance.ResourceId,
                 InstanceId = z.Instance.InstanceId,
+                ResourceName = z.Resource.Name,
+                ResourceRefId = z.Resource.RefId,
             }).DistinctBy(p => p.Id);
 
             index.AddRange(g.Key, mapped);

src/apps/Altinn.AccessManagement/src/Altinn.AccessMgmt.PersistenceEF/Queries/Connection/Models/ConnectionQueryInstance.cs

@@ -19,4 +19,14 @@ public sealed class ConnectionQueryInstance
     /// Instance identifier (e.g., "51599233/df333e75-5896-4254-a69f-146736eaf668")
     /// </summary>
     public string InstanceId { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the name of the resource associated with this instance.
+    /// </summary>
+    public string ResourceName { get; init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the reference ID of the resource associated with this instance.
+    /// </summary>
+    public string ResourceRefId { get; init; } = string.Empty;
 }

src/libs/Altinn.Authorization.Api.Contracts/src/Altinn.Authorization.Api.Contracts/AccessManagement/InstanceDto.cs

@@ -6,14 +6,9 @@
 public class InstanceDto
 {
     /// <summary>
-    /// InstanceId
+    /// Instance RefId
     /// </summary>
-    public string Id { get; set; }
-
-    /// <summary>
-    /// InstanceUrn
-    /// </summary>
-    public string Urn { get; set; }
+    public string RefId { get; set; }
 
     /// <summary>
     /// Type