scenario copy: more robust check for completed copy

frePPLe · Feb 7, 2022 · 4f72d23 · 4f72d23
1 parent b2a14ab
commit 4f72d23
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/freppledb/execute/management/commands/scenario_copy.py b/freppledb/execute/management/commands/scenario_copy.py
@@ -278,13 +278,8 @@ def handle(self, **options):
                     # Successful copy can still leave warnings and errors
                     # To confirm copy is ok, let's check that the scenario copy task exists
                     # in the destination database
-                    t = Task.objects.using(destination).order_by("-id").first()
-                    if not (
-                        t
-                        and t.id == task.id
-                        and t.name == task.name
-                        and t.submitted == task.submitted
-                    ):
+                    t = Task.objects.using(destination).filter(id=task.id).first()
+                    if not t or t.name != task.name or t.submitted != task.submitted:
                         destinationscenario.status = "Free"
                         destinationscenario.lastrefresh = datetime.today()
                         destinationscenario.save(using=DEFAULT_DB_ALIAS)