fix: Add typeName check for AnyURI mapped to string in csharp (#13969)

Co-authored-by: Erling Hauan <[email protected]>
Altinn · Nov 6, 2024 · e845708 · e845708
1 parent fa78ece
commit e845708
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 0 deletions.
diff --git a/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs b/backend/src/DataModeling/Converter/Csharp/JsonMetadataToCsharpConverter.cs
@@ -514,6 +514,7 @@ or BaseValueType.GMonth
                     or BaseValueType.Time
                     or BaseValueType.TimePeriod
                     or BaseValueType.Date
+                    or BaseValueType.AnyURI
                     or null => ("string", false),
                 BaseValueType.Int => ("int", true),
                 BaseValueType.Short => ("short", true),

diff --git a/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs b/backend/tests/DataModeling.Tests/CsharpEnd2EndGenerationTests.cs
@@ -65,6 +65,17 @@ public void JsonSchemaShouldConvertToXsdAndCSharp(string jsonSchemaPath, params
                 .Then.ConvertedXsdSchema.Should().NotBeNull();
         }
 
+        [Theory]
+        [InlineData("Model/JsonSchema/General/StringUriFormat.json")]
+        public void JsonSchemaWithStringFieldInUriFormatShouldConvertToCSharp(string jsonSchemaPath)
+        {
+            Given.That.JsonSchemaLoaded(jsonSchemaPath)
+                .When.LoadedJsonSchemaConvertedToModelMetadata()
+                .And.ModelMetadataConvertedToCsharpClass()
+                .And.CSharpClassesCompiledToAssembly()
+                .Then.CompiledAssembly.Should().NotBeNull();
+        }
+
         private void GeneratedClassesShouldBeEquivalentToExpected(string expectedCsharpClassPath)
         {
             string expectedClasses = SharedResourcesHelper.LoadTestDataAsString(expectedCsharpClassPath);

diff --git a/testdata/Model/JsonSchema/General/StringUriFormat.json b/testdata/Model/JsonSchema/General/StringUriFormat.json
@@ -0,0 +1,27 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "schema.json",
+  "type": "object",
+  "@xsdNamespaces": {
+    "xsd": "http://www.w3.org/2001/XMLSchema",
+    "xsi": "http://www.w3.org/2001/XMLSchema-instance"
+  },
+  "@xsdSchemaAttributes": {
+    "AttributeFormDefault": "Unqualified",
+    "ElementFormDefault": "Qualified",
+    "BlockDefault": "None",
+    "FinalDefault": "None"
+  },
+  "@xsdRootElement": "Root",
+  "oneOf": [
+    {
+      "properties": {
+        "uriField": {
+          "type": "string",
+          "format": "uri",
+          "@xsdType": "string"
+        }
+      }
+    }
+  ]
+}