Fix GetInstances async postprocess (#110)

* Make InstanceRepository.GetInstancesFromQuery async and await postProcess function call. * Check process.currentTask on InstanceRepository.GetInstancesFromQuery --------- Co-authored-by: Henrik Linde <[email protected]>
Altinn · Aug 9, 2024 · ad6047a · ad6047a
1 parent 812906e
commit ad6047a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Services/Storage/Implementation/InstanceRepository.cs b/src/Services/Storage/Implementation/InstanceRepository.cs
@@ -77,7 +77,7 @@ public async Task<Instance> GetOne(int instanceOwnerPartyId, Guid instanceGuid)
  return null;
  }
 
- public Task<InstanceQueryResponse> GetInstancesFromQuery(Dictionary<string, StringValues> queryParams, string continuationToken, int size)
+ public async Task<InstanceQueryResponse> GetInstancesFromQuery(Dictionary<string, StringValues> queryParams, string continuationToken, int size)
  {
  List<string> validQueryParams = new List<string>
  {
@@ -199,16 +199,20 @@ public Task<InstanceQueryResponse> GetInstancesFromQuery(Dictionary<string, Stri
  {
  RemoveForDateTime(instances, $"{nameof(Instance.Process)}.{nameof(Instance.Process.Ended)}", queryParams.GetValueOrDefault("process.ended"));
  }
+ if (queryParams.ContainsKey("process.currentTask"))
+ {
+ instances.RemoveAll(i => !queryParams["process.currentTask"].Contains(i.Process.CurrentTask.ElementId));
+ }
 
  instances.RemoveAll(i => i.Status.IsHardDeleted == true);
 
- instances.ForEach(async i => await PostProcess(i));
+ await Task.WhenAll(instances.Select(async i => await PostProcess(i)));
 
- return Task.FromResult(new InstanceQueryResponse
+ return new InstanceQueryResponse
  {
  Instances = instances,
  Count = instances.Count,
- });
+ };
  }
 
  public async Task<Instance> Update(Instance instance)