From 70a028779450ec9d80768c295d5009a459387a43 Mon Sep 17 00:00:00 2001
From: Houkime <>
Date: Fri, 8 Mar 2024 09:28:58 +0000
Subject: [PATCH] refactor(service): move finishing the job out of moving
 function

---
 selfprivacy_api/services/service.py               | 15 +++++++--------
 selfprivacy_api/services/test_service/__init__.py |  1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/selfprivacy_api/services/service.py b/selfprivacy_api/services/service.py
index c44f51e..a5d7d64 100644
--- a/selfprivacy_api/services/service.py
+++ b/selfprivacy_api/services/service.py
@@ -365,14 +365,6 @@ class Service(ABC):
         report_progress(95, job, f"Finishing moving {service_name}...")
         self.set_location(new_volume)
 
-        Jobs.update(
-            job=job,
-            status=JobStatus.FINISHED,
-            result=f"{service_name} moved successfully.",
-            status_text=f"Starting {service_name}...",
-            progress=100,
-        )
-
     def move_to_volume(self, volume: BlockDevice, job: Job) -> Job:
         service_name = self.get_display_name()
 
@@ -384,6 +376,13 @@ class Service(ABC):
         with StoppedService(self):
             report_progress(9, job, "Stopped service, starting the move...")
             self.do_move_to_volume(volume, job)
+            Jobs.update(
+                job=job,
+                status=JobStatus.FINISHED,
+                result=f"{service_name} moved successfully.",
+                status_text=f"Starting {service_name}...",
+                progress=100,
+            )
 
         return job
 
diff --git a/selfprivacy_api/services/test_service/__init__.py b/selfprivacy_api/services/test_service/__init__.py
index f869bb3..48f84c6 100644
--- a/selfprivacy_api/services/test_service/__init__.py
+++ b/selfprivacy_api/services/test_service/__init__.py
@@ -192,6 +192,5 @@ class DummyService(Service):
         if self.simulate_moving is False:
             return super(DummyService, self).do_move_to_volume(volume, job)
         else:
-            Jobs.update(job, status=JobStatus.FINISHED)
             self.set_drive(volume.name)
             return job