Altinn · ivarne · Nov 11, 2024 · Nov 8, 2024
diff --git a/src/Altinn.App.Api/Controllers/ActionsController.cs b/src/Altinn.App.Api/Controllers/ActionsController.cs
@@ -75,7 +75,7 @@
    [ProducesResponseType(409)]
    [ProducesResponseType(500)]
    [ProducesResponseType(401)]
    public async Task<ActionResult<UserActionResponse>> Perform(
        [FromRoute] string org,
        [FromRoute] string app,
        [FromRoute] int instanceOwnerPartyId,
@@ -213,10 +213,9 @@
         );
         await saveTask;
 
-        var updatedDataModels = changes.FormDataChanges.ToDictionary(
-            c => c.DataElementIdentifier.Id,
-            c => c.CurrentFormData
-        );
+        var updatedDataModels = changes
+            .FormDataChanges.Where(c => c.Type != ChangeType.Deleted)
+            .ToDictionary(c => c.DataElementIdentifier.Id, c => c.CurrentFormData);
 
         return Ok(
             new UserActionResponse()
@@ -242,7 +241,7 @@
    {
        var taskId =
            dataAccessor.Instance.Process?.CurrentTask?.ElementId
            ?? throw new Exception("Unable to validate instance without a started process.");
        var validationIssues = await _validationService.ValidateIncrementalFormData(
            dataAccessor,
            taskId,

diff --git a/src/Altinn.App.Core/Internal/Data/InstanceDataUnitOfWork.cs b/src/Altinn.App.Core/Internal/Data/InstanceDataUnitOfWork.cs
@@ -147,7 +147,7 @@
         if (modelType.FullName != classRef)
         {
             throw new InvalidOperationException(
-                $"Data object registered for {dataTypeId} is not of type {classRef} as specified in application metadata"
+                $"Tried to save {modelType.FullName} as {dataTypeId}, but applicationmetadata.json specifies {classRef}"
             );
         }
 
@@ -587,14 +587,14 @@
        var changes = GetDataElementChanges(initializeAltinnRowId: false);
        if (changes.AllChanges.Count != previousChanges.AllChanges.Count)
        {
            throw new Exception("Number of data elements have changed by validators");
        }

        foreach (var previousChange in previousChanges.AllChanges)
        {
            var currentChange =
                changes.AllChanges.FirstOrDefault(c => c.DataElement?.Id == previousChange.DataElement?.Id)
                ?? throw new Exception("Number of data elements have changed by validators");

            var equal = (currentChange, previousChange) switch
            {
@@ -605,11 +605,11 @@
                    => currentSpan.SequenceEqual(previousSpan),
                (BinaryDataChange current, BinaryDataChange previous)
                    => current.CurrentBinaryData.Span.SequenceEqual(previous.CurrentBinaryData.Span),
                _ => throw new Exception("Data element type has changed by validators")
            };
            if (!equal)
            {
                throw new Exception(
                    $"Data element {previousChange.DataType.Id} with id {previousChange.DataElement?.Id} has been changed by validators"
                );
            }

diff --git a/src/Altinn.App.Core/Models/UserAction/UserActionContext.cs b/src/Altinn.App.Core/Models/UserAction/UserActionContext.cs
@@ -40,7 +40,7 @@
    /// <param name="buttonId">The id of the button that triggered the action (optional)</param>
    /// <param name="actionMetadata"></param>
    /// <param name="language">The currently used language by the user (or null if not available)</param>
    [Obsolete("Use the constructor with IInstanceDataAccessor instead")]
    public UserActionContext(
        Instance instance,
        int? userId,
@@ -50,7 +50,7 @@
    )
    {
        Instance = instance;
        // ! TODO: Deprecated constructor, remove in v9
        DataMutator = null!;
        UserId = userId;
        ButtonId = buttonId;
@@ -66,7 +66,7 @@
     /// <summary>
     /// Access dataElements through this accessor to ensure that changes gets saved in storage and returned to frontend
     /// </summary>
-    public IInstanceDataAccessor DataMutator { get; }
+    public IInstanceDataMutator DataMutator { get; }
 
     /// <summary>
     /// The user performing the action

diff --git a/test/Altinn.App.Api.Tests/Controllers/ActionsControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/ActionsControllerTests.cs
diff --git a/test/Altinn.App.Api.Tests/Controllers/DataControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/DataControllerTests.cs
@@ -30,7 +30,6 @@ public async Task PutDataElement_MissingDataType_ReturnsBadRequest()
         string token = PrincipalUtil.GetOrgToken("nav", "160694123");
         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
 
-        TestData.DeleteInstanceAndData(org, app, instanceOwnerPartyId, guid);
         TestData.PrepareInstance(org, app, instanceOwnerPartyId, guid);
 
         using var content = new StringContent("{}", System.Text.Encoding.UTF8, "application/json"); // empty valid json
@@ -53,7 +52,6 @@ public async Task PostBinaryElement_ContentTooLarge_ReturnsBadRequest()
         string token = PrincipalUtil.GetOrgToken("nav", "160694123");
         client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
 
-        TestData.DeleteInstanceAndData(org, app, instanceOwnerPartyId, guid);
         TestData.PrepareInstance(org, app, instanceOwnerPartyId, guid);
 
         using var content = new ByteArrayContent(new byte[1024 * 1024 + 1]); // 1 mb
@@ -93,7 +91,6 @@ public async Task CreateDataElement_BinaryPdf_AnalyserShouldRunOk()
         HttpClient client = GetRootedClient(org, app);
 
         Guid guid = new Guid("0fc98a23-fe31-4ef5-8fb9-dd3f479354cd");
-        TestData.DeleteInstanceAndData(org, app, 1337, guid);
         TestData.PrepareInstance(org, app, 1337, guid);
 
         // Setup the request
@@ -127,7 +124,6 @@ public async Task CreateDataElement_ZeroBytes_BinaryPdf_AnalyserShouldReturnBadR
         HttpClient client = GetRootedClient(org, app);
 
         Guid guid = new Guid("0fc98a23-fe31-4ef5-8fb9-dd3f479354cd");
-        TestData.DeleteInstanceAndData(org, app, 1337, guid);
         TestData.PrepareInstance(org, app, 1337, guid);
 
         // Setup the request
@@ -163,7 +159,6 @@ public async Task CreateDataElement_JpgFakedAsPdf_AnalyserShouldRunAndFail()
         HttpClient client = GetRootedClient(org, app);
 
         Guid guid = new Guid("1fc98a23-fe31-4ef5-8fb9-dd3f479354ce");
-        TestData.DeleteInstanceAndData(org, app, 1337, guid);
         TestData.PrepareInstance(org, app, 1337, guid);
 
         // Setup the request

diff --git a/test/Altinn.App.Api.Tests/Controllers/DataController_LayoutEvaluatorTests.cs b/test/Altinn.App.Api.Tests/Controllers/DataController_LayoutEvaluatorTests.cs
@@ -74,7 +74,6 @@ public async Task PutDataElement_LegacyLayoutEvaluatorState_ReturnsOk()
         Guid dataGuid = Guid.Parse("f3e04c65-aa70-40ec-84df-087cc2583402");
         HttpClient client = GetRootedClient(org, app, 1337, instanceOwnerPartyId);
 
-        TestData.DeleteInstanceAndData(org, app, instanceOwnerPartyId, instanceGuid);
         TestData.PrepareInstance(org, app, instanceOwnerPartyId, instanceGuid);
 
         // Update data element

diff --git a/test/Altinn.App.Api.Tests/Controllers/DataController_PatchTests.cs b/test/Altinn.App.Api.Tests/Controllers/DataController_PatchTests.cs
@@ -66,7 +66,6 @@ public DataControllerPatchTests(WebApplicationFactory<Program> factory, ITestOut
             services.AddSingleton(_dataProcessorMock.Object);
             services.AddSingleton(_formDataValidatorMock.Object);
         };
-        TestData.DeleteInstanceAndData(Org, App, InstanceOwnerPartyId, _instanceGuid);
         TestData.PrepareInstance(Org, App, InstanceOwnerPartyId, _instanceGuid);
     }
 

diff --git a/test/Altinn.App.Api.Tests/Controllers/DataController_PostTests.cs b/test/Altinn.App.Api.Tests/Controllers/DataController_PostTests.cs
@@ -33,7 +33,6 @@ public class DataController_PostTests : ApiTestBase, IClassFixture<WebApplicatio
     public DataController_PostTests(WebApplicationFactory<Program> factory, ITestOutputHelper outputHelper)
         : base(factory, outputHelper)
     {
-        TestData.DeleteInstanceAndData(_org, _app, _instanceOwnerPartyId, _instanceGuid);
         TestData.PrepareInstance(_org, _app, _instanceOwnerPartyId, _instanceGuid);
         OverrideServicesForAllTests = (services) =>
         {

diff --git a/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs b/test/Altinn.App.Api.Tests/Controllers/ProcessControllerTests.cs
@@ -60,7 +60,6 @@ public ProcessControllerTests(WebApplicationFactory<Program> factory, ITestOutpu
             services.AddSingleton(_dataProcessorMock.Object);
             services.AddSingleton(_formDataValidatorMock.Object);
         };
-        TestData.DeleteInstanceAndData(Org, App, InstanceOwnerPartyId, _instanceGuid);
         TestData.PrepareInstance(Org, App, InstanceOwnerPartyId, _instanceGuid);
     }
 
@@ -74,7 +73,6 @@ public async Task Get_ShouldReturnProcessTasks()
 
         HttpClient client = GetRootedClient(org, app, 1337, partyId, 3);
 
-        TestData.DeleteInstanceAndData(org, app, partyId, instanceId);
         TestData.PrepareInstance(org, app, partyId, instanceId);
 
         string url = $"/{org}/{app}/instances/{partyId}/{instanceId}/process";

diff --git a/test/Altinn.App.Api.Tests/Controllers/ValidateController_ValidateInstanceTests.cs b/test/Altinn.App.Api.Tests/Controllers/ValidateController_ValidateInstanceTests.cs
@@ -51,7 +51,6 @@ ITestOutputHelper outputHelper
             services.AddSingleton(_dataProcessorMock.Object);
             services.AddSingleton(_formDataValidatorMock.Object);
         };
-        TestData.DeleteInstanceAndData(Org, App, InstanceOwnerPartyId, InstanceGuid);
         TestData.PrepareInstance(Org, App, InstanceOwnerPartyId, InstanceGuid);
     }
 

diff --git a/test/Altinn.App.Api.Tests/CustomWebApplicationFactory.cs b/test/Altinn.App.Api.Tests/CustomWebApplicationFactory.cs
@@ -215,7 +215,8 @@ private void ConfigureFakeHttpClientHandler(IServiceCollection services)
     }
 
     /// <summary>
-    /// Set this in your test class constructor
+    /// Helper to quickly verify the status code and deserialize the content of a response.
+    /// and print the content to output helper
     /// </summary>
     protected async Task<T> VerifyStatusAndDeserialize<T>(
         HttpResponseMessage response,
@@ -224,7 +225,10 @@ HttpStatusCode expectedStatusCode
     {
         // Deserialize content and log everything if it fails
         var content = await response.Content.ReadAsStringAsync();
-        OutputHelper.WriteLine($"Response content: {content}");
+        OutputHelper.WriteLine(
+            $"{response.RequestMessage?.Method} {response.RequestMessage?.RequestUri?.PathAndQuery}"
+        );
+        OutputHelper.WriteLine(JsonUtils.IndentJson(content));
         // Verify status code
         response.Should().HaveStatusCode(expectedStatusCode);
         try
@@ -239,8 +243,6 @@ HttpStatusCode expectedStatusCode
             OutputHelper.WriteLine(
                 $"Failed to deserialize content of {response.RequestMessage?.Method} request to {response.RequestMessage?.RequestUri} as {ReflectionUtils.GetTypeNameWithGenericArguments<T>()}:"
             );
-
-            OutputHelper.WriteLine(JsonUtils.IndentJson(content));
             OutputHelper.WriteLine(string.Empty);
             throw;
         }

diff --git a/...p.Api.Tests/Data/Instances/tdd/.gitignore → ...n.App.Api.Tests/Data/Instances/.gitignore b/...p.Api.Tests/Data/Instances/tdd/.gitignore → ...n.App.Api.Tests/Data/Instances/.gitignore
@@ -1,4 +1,4 @@
 # Ignore guid.json files
 ????????-????-????-????-????????????.json
 # ignore copied blobs
-*/*/*/blob/????????-????-????-????-????????????
+**/blob/????????-????-????-????-????????????
diff --git a/...sts/Data/Instances/tdd/task-action/1337/b1135209-628e-4a6e-9efd-e4282068ef41.pretest.json b/...sts/Data/Instances/tdd/task-action/1337/b1135209-628e-4a6e-9efd-e4282068ef41.pretest.json
@@ -26,14 +26,5 @@
     "isSoftDeleted": false,
     "isHardDeleted": false,
     "readStatus": "Read"
-  },
-  "data": [
-    {
-      "id": "de288942-a8af-4f77-a1f1-6e1ede1cd502",
-      "dataType": "default",
-      "contentType": "application/xml",
-      "size": 0,
-      "locked": false
-    }
-  ]
+  }
 }
diff --git a/test/Altinn.App.Api.Tests/Data/TestData.cs b/test/Altinn.App.Api.Tests/Data/TestData.cs
@@ -96,6 +96,18 @@ Guid dataGuid
         return Path.Combine(dataDirectory, $"{dataGuid}.json");
     }
 
+    public static string GetDataElementBlobContnet(
+        string org,
+        string app,
+        int instanceOwnerId,
+        Guid instanceGuid,
+        Guid dataGuid
+    )
+    {
+        string dataElementPath = GetDataBlobPath(org, app, instanceOwnerId, instanceGuid, dataGuid);
+        return File.ReadAllText(dataElementPath);
+    }
+
     public static string GetDataBlobPath(string org, string app, int instanceOwnerId, Guid instanceGuid, Guid dataGuid)
     {
         string dataDirectory = GetDataDirectory(org, app, instanceOwnerId, instanceGuid);
@@ -142,6 +154,7 @@ public static string GetInstancePath(string org, string app, int instanceOwnerId
 
     public static void PrepareInstance(string org, string app, int instanceOwnerId, Guid instanceGuid)
     {
+        DeleteInstanceAndData(org, app, instanceOwnerId, instanceGuid);
         string instancePath = GetInstancePath(org, app, instanceOwnerId, instanceGuid);
 
         string preInstancePath = instancePath.Replace(".json", ".pretest.json");
@@ -185,7 +198,7 @@ public static void DeleteInstanceAndData(string org, string app, int instanceOwn
         }
     }
 
-    public static void DeleteDataForInstance(string org, string app, int instanceOwnerId, Guid instanceGuid)
+    private static void DeleteDataForInstance(string org, string app, int instanceOwnerId, Guid instanceGuid)
     {
         string path = GetDataDirectory(org, app, instanceOwnerId, instanceGuid);
 

diff --git a/test/Altinn.App.Api.Tests/Data/apps/tdd/task-action/config/applicationmetadata.json b/test/Altinn.App.Api.Tests/Data/apps/tdd/task-action/config/applicationmetadata.json
@@ -1,6 +1,6 @@
 {
-  "id": "ttd/task-action",
-  "org": "ttd",
+  "id": "tdd/task-action",
+  "org": "tdd",
   "title": {
     "nb": "task-action"
   },
@@ -25,7 +25,7 @@
       ],
       "appLogic": {
         "autoCreate": true,
-        "classRef": "Altinn.App.Models.Scheme",
+        "classRef": "Altinn.App.Api.Tests.Data.apps.tdd.task_action.config.models.Scheme",
         "allowAnonymousOnStateless": false,
         "autoDeleteOnProcessEnd": false
       },
@@ -50,4 +50,4 @@
   "createdBy": "tjololo",
   "lastChanged": "2023-05-31T08:03:25.9385925Z",
   "lastChangedBy": "tjololo"
-}
+}
diff --git a/test/Altinn.App.Api.Tests/Data/apps/tdd/task-action/config/models/Scheme.cs b/test/Altinn.App.Api.Tests/Data/apps/tdd/task-action/config/models/Scheme.cs
@@ -0,0 +1,18 @@
+#pragma warning disable IDE1006 // Naming Styles
+namespace Altinn.App.Api.Tests.Data.apps.tdd.task_action.config.models;
+
+/// <summary>
+/// Class for the model
+/// </summary>
+public class Scheme
+{
+    public string? name { get; set; }
+
+    public string? description { get; set; }
+
+    public string? TestCustomButtonInput { get; set; }
+
+    public string? TestCustomButtonReadOnlyInput { get; set; }
+}
+
+#pragma warning restore IDE1006 // Naming Styles