Mark onEntry as nullable and add check for null

Altinn · Jul 20, 2023 · 286dd81 · 286dd81
1 parent 4aaba48
commit 286dd81
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 4 deletions.
diff --git a/src/Altinn.App.Core/Implementation/AppResourcesSI.cs b/src/Altinn.App.Core/Implementation/AppResourcesSI.cs
@@ -113,10 +113,14 @@ public Application GetApplication()
             {
                 ApplicationMetadata applicationMetadata = _appMetadata.GetApplicationMetadata().Result;
                 Application application = applicationMetadata;
-                application.OnEntry = new OnEntryConfig()
+                if (applicationMetadata.OnEntry != null)
                 {
-                    Show = applicationMetadata.OnEntry.Show
-                };
+                    application.OnEntry = new OnEntryConfig()
+                    {
+                        Show = applicationMetadata.OnEntry.Show
+                    };
+                }
+
                 return application;
             }
             catch (AggregateException ex)

diff --git a/src/Altinn.App.Core/Models/ApplicationMetadata.cs b/src/Altinn.App.Core/Models/ApplicationMetadata.cs
@@ -43,7 +43,7 @@ public ApplicationMetadata(string id)
         /// Configure options for handling what happens when entering the application
         /// </summary>
         [JsonProperty(PropertyName = "onEntry")]
-        public new OnEntry OnEntry { get; set; }
+        public new OnEntry? OnEntry { get; set; }
 
         /// <summary>
         /// Get AppIdentifier based on ApplicationMetadata.Id

diff --git a/test/Altinn.App.Core.Tests/Implementation/AppResourcesSITests.cs b/test/Altinn.App.Core.Tests/Implementation/AppResourcesSITests.cs
@@ -67,6 +67,53 @@ public void GetApplication_desrializes_file_from_disk()
         actual.Should().NotBeNull();
         actual.Should().BeEquivalentTo(expected);
     }
+
+    [Fact]
+    public void GetApplication_handles_onEntry_null()
+    {
+        AppSettings appSettings = GetAppSettings("AppMetadata", "no-on-entry.applicationmetadata.json");
+        var settings = Options.Create<AppSettings>(appSettings);
+        IAppMetadata appMetadata = SetupAppMedata(Options.Create(appSettings));
+        IAppResources appResources = new AppResourcesSI(settings, appMetadata, null, new NullLogger<AppResourcesSI>());
+        Application expected = new Application()
+        {
+            Id = "tdd/bestilling",
+            Org = "tdd",
+            Created = DateTime.Parse("2019-09-16T22:22:22"),
+            CreatedBy = "username",
+            Title = new Dictionary<string, string>()
+            {
+                { "nb", "Bestillingseksempelapp" }
+            },
+            DataTypes = new List<DataType>()
+            {
+                new()
+                {
+                    Id = "vedlegg",
+                    AllowedContentTypes = new List<string>() { "application/pdf", "image/png", "image/jpeg" },
+                    MinCount = 0,
+                    TaskId = "Task_1"
+                },
+                new()
+                {
+                    Id = "ref-data-as-pdf",
+                    AllowedContentTypes = new List<string>() { "application/pdf" },
+                    MinCount = 1,
+                    TaskId = "Task_1"
+                }
+            },
+            PartyTypesAllowed = new PartyTypesAllowed()
+            {
+                BankruptcyEstate = true,
+                Organisation = true,
+                Person = true,
+                SubUnit = true
+            }
+        };
+        var actual = appResources.GetApplication();
+        actual.Should().NotBeNull();
+        actual.Should().BeEquivalentTo(expected);
+    }
 
     [Fact]
     public void GetApplication_second_read_from_cache()

diff --git a/...n.App.Core.Tests/Implementation/TestData/AppMetadata/no-on-entry.applicationmetadata.json b/...n.App.Core.Tests/Implementation/TestData/AppMetadata/no-on-entry.applicationmetadata.json
@@ -0,0 +1,27 @@
+{
+  "id": "tdd/bestilling",
+  "org": "tdd",
+  "created": "2019-09-16T22:22:22",
+  "createdBy": "username",
+  "title": { "nb": "Bestillingseksempelapp" },
+  "dataTypes": [
+    {
+      "id": "vedlegg",
+      "allowedContentTypes": [ "application/pdf", "image/png", "image/jpeg" ],
+      "minCount": 0,
+      "taskId":  "Task_1",
+    },
+    {
+      "id": "ref-data-as-pdf",
+      "allowedContentTypes": [ "application/pdf" ],
+      "minCount":  1,
+      "taskId":  "Task_1",
+    }
+  ],
+  "partyTypesAllowed": {
+    "bankruptcyEstate": true,
+    "organisation": true,
+    "person": true,
+    "subUnit": true
+  }
+}