merge and deploy

atdb/taskdatabase/services/activities_handler.py

@@ -189,17 +189,6 @@ def update_processed_and_aggregate(task):
         if t.status != State.DISCARDED.value:
             non_discarded_found = True
 
-    # only save when changed
-    if activity.is_processed != current_is_processed:
-        # if the whole activity has become processed, then set the status of this activity to 'AGGREGATE'
-        # unless it was already aggregated
-        if (activity.is_processed & non_discarded_found):
-            if not (activity.is_aggregated):
-                activity.status = State.AGGREGATE.value
-
-        activity.save()
-
-
     if (task.workflow.aggregation_strategy == AggregationStrategy.COLLECT_H5.value):
 
         # check if there is already a storage_location, if not, add it.
@@ -227,6 +216,15 @@ def update_processed_and_aggregate(task):
             activity.save()
 
 
+    # only save when changed
+    if activity.is_processed != current_is_processed:
+        # if the whole activity has become processed, then set the status of this activity to 'AGGREGATE'
+        # unless it was already aggregated
+        if (activity.is_processed & non_discarded_found):
+            if not (activity.is_aggregated):
+                activity.status = State.AGGREGATE.value
+
+        activity.save()
 
 def update_is_verified(task):
     """