Merge branch 'main' into feat/392-data-element-metadata

Altinn · Sep 10, 2024 · 0ea4599 · 0ea4599
2 parents da21f21 + 7a50cca
commit 0ea4599
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 5 deletions.
diff --git a/src/Services/Storage/Implementation/DataRepository.cs b/src/Services/Storage/Implementation/DataRepository.cs
@@ -71,7 +71,7 @@ public async Task<List<DataElement>> ReadAll(Guid instanceGuid)
                     dataElements.Add(instance);
                 }
             }
-            return dataElements;
+            return dataElements.OrderBy(x => x.Created).ToList();
         }
 
         public async Task<Stream> ReadDataFromStorage(string org, string blobStoragePath)

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)

diff --git a/testdata/Profile/User/1004.json b/testdata/Profile/User/1004.json
@@ -0,0 +1,12 @@
+{
+  "UserId": 1004,
+  "UserName": "SelvRegistrert",
+  "PhoneNumber": null,
+  "Email": "[email protected]",
+  "PartyId": 510004,
+  "Party": {},
+  "UserType": 2,
+  "ProfileSettingPreference": {
+    "Language": "nb"
+  }
+}
diff --git a/testdata/Register/Party/510004.json b/testdata/Register/Party/510004.json
@@ -0,0 +1,13 @@
+{
+  "partyId": "510004",
+  "partyTypeName": 3,
+  "orgNumber": null,
+  "ssn": null,
+  "unitType": null,
+  "name": "Selvregistrert Bruker",
+  "isDeleted": false,
+  "onlyHierarchyElementWithNoAccess": false,
+  "person": null,
+  "organisation": null,
+  "childParties": null
+}
diff --git a/testdata/authorization/partylist/1004.json b/testdata/authorization/partylist/1004.json
@@ -0,0 +1,13 @@
+[
+    {
+      "partyId": "510004",
+      "partyTypeName": 3,
+      "ssn": null,
+      "name": "Selvregistrert Bruker",
+      "isDeleted": false,
+      "onlyHierarchyElementWithNoAccess": false,
+      "person": null,
+      "organisation": null,
+      "childParties": null
+    }
+  ]
diff --git a/testdata/authorization/roles/User_1004/party_510004/roles.json b/testdata/authorization/roles/User_1004/party_510004/roles.json
@@ -0,0 +1,6 @@
+[
+  {
+    "Type": "altinn",
+    "value": "seln"
+  }
+]