Fix name conflicts

Altinn · Jan 16, 2025 · 9c6dbb9 · 9c6dbb9
1 parent d360473
commit 9c6dbb9
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 41 deletions.
diff --git a/backend/src/Designer/Controllers/ResourceAdminController.cs b/backend/src/Designer/Controllers/ResourceAdminController.cs
@@ -487,7 +487,7 @@ public async Task<ActionResult<List<AvailableService>>> GetAltinn2LinkServices(s
                 foreach (ServiceResource resource in allResources)
                 {
                     if (resource?.HasCompetentAuthority.Orgcode != null
-                        && resource.ResourceReferences != null && resource.ResourceReferences.Exists(r => r.ReferenceType != null && r.ReferenceType.Equals(ReferenceType.ServiceCode))
+                        && resource.ResourceReferences != null && resource.ResourceReferences.Exists(r => r.ReferenceType != null && r.ReferenceType.Equals(ResourceReferenceType.ServiceCode))
                         && resource.ResourceType == ResourceType.Altinn2Service)
                     {
                         AvailableService service = new AvailableService();
@@ -496,8 +496,8 @@ public async Task<ActionResult<List<AvailableService>>> GetAltinn2LinkServices(s
                             service.ServiceName = resource.Title["nb"];
                         }
 
-                        service.ExternalServiceCode = resource.ResourceReferences.First(r => r.ReferenceType.Equals(ReferenceType.ServiceCode)).Reference;
-                        service.ExternalServiceEditionCode = Convert.ToInt32(resource.ResourceReferences.First(r => r.ReferenceType.Equals(ReferenceType.ServiceEditionCode)).Reference);
+                        service.ExternalServiceCode = resource.ResourceReferences.First(r => r.ReferenceType.Equals(ResourceReferenceType.ServiceCode)).Reference;
+                        service.ExternalServiceEditionCode = Convert.ToInt32(resource.ResourceReferences.First(r => r.ReferenceType.Equals(ResourceReferenceType.ServiceEditionCode)).Reference);
                         service.ServiceOwnerCode = resource.HasCompetentAuthority.Orgcode;
                         unfiltered.Add(service);
                     }
@@ -551,7 +551,7 @@ private ValidationProblemDetails ValidateResource(ServiceResource resource)
 
             if (resource.ResourceType == ResourceType.MaskinportenSchema)
             {
-                if (resource.ResourceReferences == null || !resource.ResourceReferences.Any((x) => x.ReferenceType == ReferenceType.MaskinportenScope))
+                if (resource.ResourceReferences == null || !resource.ResourceReferences.Any((x) => x.ReferenceType == ResourceReferenceType.MaskinportenScope))
                 {
                     ModelState.AddModelError($"{resource.Identifier}.resourceReferences", "resourceerror.missingmaskinportenscope");
                 }

diff --git a/backend/src/Designer/Enums/ReferenceType.cs b/backend/src/Designer/Enums/ReferenceType.cs
@@ -1,31 +1,9 @@
-using System.Runtime.Serialization;
-
 namespace Altinn.Studio.Designer.Enums
 {
-    /// <summary>
-    /// Enum for reference types of resources in the resource registry
-    /// </summary>
     public enum ReferenceType
     {
-        [EnumMember(Value = "Default")]
-        Default = 0,
-
-        [EnumMember(Value = "Uri")]
-        Uri = 1,
-
-        [EnumMember(Value = "DelegationSchemeId")]
-        DelegationSchemeId = 2,
-
-        [EnumMember(Value = "MaskinportenScope")]
-        MaskinportenScope = 3,
-
-        [EnumMember(Value = "ServiceCode")]
-        ServiceCode = 4,
-
-        [EnumMember(Value = "ServiceEditionCode")]
-        ServiceEditionCode = 5,
-
-        [EnumMember(Value = "ApplicationId")]
-        ApplicationId = 6,
+        LayoutSet,
+        Layout,
+        Component
     }
 }
diff --git a/...end/src/Designer/Enums/ReferenceSource.cs → ...Designer/Enums/ResourceReferenceSource.cs b/...end/src/Designer/Enums/ReferenceSource.cs → ...Designer/Enums/ResourceReferenceSource.cs
@@ -5,7 +5,7 @@ namespace Altinn.Studio.Designer.Enums
     /// <summary>
     /// Enum for the different reference sources for resources in the resource registry
     /// </summary>
-    public enum ReferenceSource
+    public enum ResourceReferenceSource
     {
         [EnumMember(Value = "Default")]
         Default = 0,

diff --git a/backend/src/Designer/Enums/ResourceReferenceType.cs b/backend/src/Designer/Enums/ResourceReferenceType.cs
@@ -0,0 +1,31 @@
+using System.Runtime.Serialization;
+
+namespace Altinn.Studio.Designer.Enums
+{
+    /// <summary>
+    /// Enum for reference types of resources in the resource registry
+    /// </summary>
+    public enum ResourceReferenceType
+    {
+        [EnumMember(Value = "Default")]
+        Default = 0,
+
+        [EnumMember(Value = "Uri")]
+        Uri = 1,
+
+        [EnumMember(Value = "DelegationSchemeId")]
+        DelegationSchemeId = 2,
+
+        [EnumMember(Value = "MaskinportenScope")]
+        MaskinportenScope = 3,
+
+        [EnumMember(Value = "ServiceCode")]
+        ServiceCode = 4,
+
+        [EnumMember(Value = "ServiceEditionCode")]
+        ServiceEditionCode = 5,
+
+        [EnumMember(Value = "ApplicationId")]
+        ApplicationId = 6,
+    }
+}
diff --git a/backend/src/Designer/EventHandlers/ComponentDeleted/ComponentDeletedLayoutsHandler.cs b/backend/src/Designer/EventHandlers/ComponentDeleted/ComponentDeletedLayoutsHandler.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
 using Altinn.Studio.Designer.Events;
 using Altinn.Studio.Designer.Hubs.SyncHub;
 using Altinn.Studio.Designer.Models;

diff --git a/backend/src/Designer/EventHandlers/LayoutPageDeleted/LayoutPageDeletedLayoutsHandler.cs b/backend/src/Designer/EventHandlers/LayoutPageDeleted/LayoutPageDeletedLayoutsHandler.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
 using Altinn.Studio.Designer.Events;
 using Altinn.Studio.Designer.Hubs.SyncHub;
 using Altinn.Studio.Designer.Models;

diff --git a/backend/src/Designer/EventHandlers/LayoutSetDeleted/LayoutSetDeletedLayoutsHandler.cs b/backend/src/Designer/EventHandlers/LayoutSetDeleted/LayoutSetDeletedLayoutsHandler.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Enums;
 using Altinn.Studio.Designer.Events;
 using Altinn.Studio.Designer.Hubs.SyncHub;
 using Altinn.Studio.Designer.Models;

diff --git a/backend/src/Designer/Models/Reference.cs b/backend/src/Designer/Models/Reference.cs
@@ -1,10 +1,7 @@
-namespace Altinn.Studio.Designer.Models;
 
-public record Reference(ReferenceType Type, string LayoutSetName, string Id, string NewId = null);
+using Altinn.Studio.Designer.Enums;
 
-public enum ReferenceType
+namespace Altinn.Studio.Designer.Models
 {
-    LayoutSet,
-    Layout,
-    Component
+    public record Reference(ReferenceType Type, string LayoutSetName, string Id, string NewId = null);
 }
diff --git a/backend/src/Designer/Models/ResourceReference.cs b/backend/src/Designer/Models/ResourceReference.cs
@@ -13,7 +13,7 @@ public class ResourceReference
         /// The source the reference identifier points to
         /// </summary>
         [JsonConverter(typeof(JsonStringEnumConverter))]
-        public ReferenceSource? ReferenceSource { get; set; }
+        public ResourceReferenceSource? ReferenceSource { get; set; }
 
         /// <summary>
         /// The reference identifier
@@ -24,6 +24,6 @@ public class ResourceReference
         /// The reference type
         /// </summary>
         [JsonConverter(typeof(JsonStringEnumConverter))]
-        public ReferenceType? ReferenceType { get; set; }
+        public ResourceReferenceType? ReferenceType { get; set; }
     }
 }
diff --git a/backend/src/Designer/Services/Implementation/AppDevelopmentService.cs b/backend/src/Designer/Services/Implementation/AppDevelopmentService.cs
@@ -9,6 +9,7 @@
 using Altinn.App.Core.Internal.Process.Elements;
 using Altinn.App.Core.Models;
 using Altinn.Studio.DataModeling.Metamodel;
+using Altinn.Studio.Designer.Enums;
 using Altinn.Studio.Designer.Exceptions.AppDevelopment;
 using Altinn.Studio.Designer.Helpers;
 using Altinn.Studio.Designer.Infrastructure.GitRepository;

diff --git a/...signer.Tests/Controllers/ResourceAdminController/ResourceAdminControllerTestsBaseClass.cs b/...signer.Tests/Controllers/ResourceAdminController/ResourceAdminControllerTestsBaseClass.cs
@@ -1,11 +1,9 @@
 using System.Collections.Generic;
-using Altinn.Studio.Designer.Configuration;
 using Altinn.Studio.Designer.Enums;
 using Altinn.Studio.Designer.Models;
 using Altinn.Studio.Designer.Services.Interfaces;
 using Altinn.Studio.Designer.TypedHttpClients.Altinn2Metadata;
 using Designer.Tests.Controllers.ApiTests;
-using Designer.Tests.Mocks;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
@@ -38,7 +36,7 @@ protected static List<ResourceReference> GetTestResourceReferences()
         {
             List<ResourceReference> resourceReferences = new List<ResourceReference>
             {
-                new ResourceReference { Reference = string.Empty, ReferenceSource = ReferenceSource.Default, ReferenceType = ReferenceType.Default }
+                new ResourceReference { Reference = string.Empty, ReferenceSource = ResourceReferenceSource.Default, ReferenceType = ResourceReferenceType.Default }
             };
 
             return resourceReferences;