Move setting of instance ID to client

Altinn · Dec 9, 2024 · f915e07 · f915e07
1 parent 5bc79a4
commit f915e07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/Altinn.App.Api/Controllers/InstancesController.cs b/src/Altinn.App.Api/Controllers/InstancesController.cs
@@ -335,10 +335,6 @@ public async Task<ActionResult<Instance>> Post(
 
             // create the instance
             instance = await _instanceClient.CreateInstance(org, app, instanceTemplate);
-            foreach (var instanceEvent in result.ProcessStateChange?.Events ?? [])
-            {
-                instanceEvent.InstanceId = instance.Id;
-            }
         }
         catch (Exception exception)
         {
@@ -570,10 +566,6 @@ [FromBody] InstansiationInstance instansiationInstance
             }
 
             instance = await _instanceClient.CreateInstance(org, app, instanceTemplate);
-            foreach (var instanceEvent in processResult.ProcessStateChange?.Events ?? [])
-            {
-                instanceEvent.InstanceId = instance.Id;
-            }
 
             if (isCopyRequest && source is not null)
             {
@@ -691,10 +683,6 @@ [FromRoute] Guid instanceGuid
         ProcessChangeResult startResult = await _processEngine.GenerateProcessStartEvents(processStartRequest);
 
         targetInstance = await _instanceClient.CreateInstance(org, app, targetInstance);
-        foreach (var instanceEvent in startResult.ProcessStateChange?.Events ?? [])
-        {
-            instanceEvent.InstanceId = targetInstance.Id;
-        }
 
         await CopyDataFromSourceInstance(application, targetInstance, sourceInstance);
 

diff --git a/src/Altinn.App.Core/Infrastructure/Clients/Storage/InstanceClient.cs b/src/Altinn.App.Core/Infrastructure/Clients/Storage/InstanceClient.cs
@@ -168,6 +168,9 @@ public async Task<Instance> UpdateProcessAndEvents(Instance instance, List<Insta
         using var activity = _telemetry?.StartUpdateProcessActivity(instance, events.Count);
         ProcessState processState = instance.Process;
 
+        foreach (var instanceEvent in events)
+            instanceEvent.InstanceId = instance.Id;
+
         string apiUrl = $"instances/{instance.Id}/process/instanceandevents";
         string token = _userTokenProvider.GetUserToken();