Add property ["instanceContext", "instanceOwnerPartyType"] (#149)

Co-authored-by: Ivar <ivar.nesje@finanstilsynet.no>

Author: ivarne

src/Altinn.App.Core/Internal/Expressions/LayoutEvaluatorState.cs

@@ -170,6 +170,16 @@ public string GetInstanceContext(string key)
             "instanceOwnerPartyId" => _instanceContext.InstanceOwner.PartyId,
             "appId" => _instanceContext.AppId,
             "instanceId" => _instanceContext.Id,
+            "instanceOwnerPartyType" => 
+            (
+                !string.IsNullOrWhiteSpace(_instanceContext.InstanceOwner.OrganisationNumber)
+                ? "org"
+                : !string.IsNullOrWhiteSpace(_instanceContext.InstanceOwner.PersonNumber)
+                ? "person"
+                : !string.IsNullOrWhiteSpace(_instanceContext.InstanceOwner.Username)
+                ? "selfIdentified"
+                : "unknown"
+            ),
             _ => throw new ExpressionEvaluatorTypeErrorException($"Unknown Instance context property {key}"),
         };
     }

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/ExpressionTestCaseRoot.cs

@@ -51,55 +51,15 @@ public class ExpressionTestCaseRoot
     [JsonPropertyName("frontendSettings")]
     public FrontEndSettings? FrontEndSettings { get; set; }
 
-    [JsonPropertyName("instanceContext")]
-    [JsonConverter(typeof(InstanceConverter))]
-    public Instance? InstanceContext { get; set; }
+    [JsonPropertyName("instance")]
+    public Instance? Instance { get; set; }
 
     public override string ToString()
     {
         return $"{Filename}: {Name}";
     }
 }
 
-public class InstanceConverter : JsonConverter<Instance>
-{
-    public override Instance? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-    {
-        var testInstance = JsonSerializer.Deserialize<InstanceForTestSpec>(ref reader, options);
-        if (testInstance is null)
-        {
-            return null;
-        }
-
-        return new Instance
-        {
-            AppId = testInstance.AppId,
-            Id = testInstance.InstanceId,
-            InstanceOwner = new()
-            {
-                PartyId = testInstance.InstanceOwnerPartyId,
-            }
-        };
-    }
-
-    public override void Write(Utf8JsonWriter writer, Instance value, JsonSerializerOptions options)
-    {
-        throw new NotImplementedException();
-    }
-
-    public class InstanceForTestSpec
-    {
-        [JsonPropertyName("instanceId")]
-        public string InstanceId { get; set; } = default!;
-
-        [JsonPropertyName("appId")]
-        public string AppId { get; set; } = default!;
-
-        [JsonPropertyName("instanceOwnerPartyId")]
-        public string InstanceOwnerPartyId { get; set; } = default!;
-    }
-}
-
 public class ComponentContextForTestSpec
 {
     [JsonPropertyName("component")]

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/TestFunctions.cs

@@ -93,7 +93,7 @@ private void RunTestCase(ExpressionTestCaseRoot test)
             new JsonDataModel(test.DataModel),
             test.ComponentModel,
             test.FrontEndSettings ?? new(),
-            test.InstanceContext ?? new());
+            test.Instance ?? new());
 
         if (test.ExpectsFailure is not null)
         {
@@ -176,6 +176,7 @@ public override IEnumerable<object[]> GetData(MethodInfo methodInfo)
                     new JsonSerializerOptions
                     {
                         ReadCommentHandling = JsonCommentHandling.Skip,
+                        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
                     })!;
             }
             catch (Exception e)

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/TestInvalid.cs

@@ -29,12 +29,18 @@ public void Simple_Theory(InvalidTestCase testCase)
         _output.WriteLine(testCase.FullPath);
         Action act = () =>
         {
-            var test = JsonSerializer.Deserialize<ExpressionTestCaseRoot>(testCase.RawJson!)!;
+            var test = JsonSerializer.Deserialize<ExpressionTestCaseRoot>(
+                testCase.RawJson!,
+                new JsonSerializerOptions
+                {
+                    ReadCommentHandling = JsonCommentHandling.Skip,
+                    PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+                })!;
             var state = new LayoutEvaluatorState(
                 new JsonDataModel(test.DataModel),
                 test.ComponentModel,
                 test.FrontEndSettings ?? new(),
-                test.InstanceContext ?? new());
+                test.Instance ?? new());
             ExpressionEvaluator.EvaluateExpression(state, test.Expression, test.Context?.ToContext(test.ComponentModel) ?? null!);
         };
         act.Should().Throw<Exception>().WithMessage(testCase.ExpectsFailure);

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/null.json

@@ -2,9 +2,11 @@
   "name": "Looking up null",
   "expression": ["instanceContext", null],
   "expectsFailure": "Unknown Instance context property ",
-  "instanceContext": {
-    "instanceId": "d00ce51c-800b-416a-a906-ccab55f597e9",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
     "appId": "org/app-name",
-    "instanceOwnerPartyId": "12345"
+    "instanceOwner": {
+      "partyId": "12345"
+    }
   }
 }

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/only-dict.json

@@ -2,7 +2,7 @@
   "name": "Only works on one level (as a dictionary)",
   "expression": ["equals", ["instanceContext", "deep.key"], null],
   "expectsFailure": "Unknown Instance context property deep.key",
-  "instanceContext": {
+  "instance": {
     "deep": {
       "key": "should not be found"
     }

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/partyTypeOrg.json

@@ -0,0 +1,13 @@
+{
+  "name": "PartyType is Org",
+  "expression": ["instanceContext", "instanceOwnerPartyType"],
+  "expects": "org",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "partyId": "12345",
+      "organisationNumber": "1234567"
+    }
+  }
+}

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/partyTypePerson.json

@@ -0,0 +1,13 @@
+{
+  "name": "PartyType is Person",
+  "expression": ["instanceContext", "instanceOwnerPartyType"],
+  "expects": "person",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "partyId": "12345",
+      "personNumber": "1234567"
+    }
+  }
+}

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/partyTypeSelfIdentified.json

@@ -0,0 +1,13 @@
+{
+  "name": "PartyType is Self Identified",
+  "expression": ["instanceContext", "instanceOwnerPartyType"],
+  "expects": "selfIdentified",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "partyId": "12345",
+      "username": "1234567"
+    }
+  }
+}

test/Altinn.App.Core.Tests/LayoutExpressions/CommonTests/shared-tests/functions/instanceContext/partyTypeUnknown.json

@@ -0,0 +1,12 @@
+{
+  "name": "Party type unknown",
+  "expression": ["instanceContext", "instanceOwnerPartyType"],
+  "expects": "unknown",
+  "instance": {
+    "id": "d00ce51c-800b-416a-a906-ccab55f597e9",
+    "appId": "org/app-name",
+    "instanceOwner": {
+      "partyId": "12345"
+    }
+  }
+}