[#88967] server: src: database: Do not ovewrite completed status

Signed-off-by: Anna Roszkiewicz <[email protected]>

Author: anroszkiewicz

server/src/database/action_logs.py

@@ -61,19 +61,20 @@ def insert(self, action: models.action_log.ActionLog):
             session.refresh(action)
             return action.id
 
-    def get_status(self, id: str) -> str:
-        """Fetch the status of a specified action.
-        """
-        with Session(self.engine) as session:
-            return session.scalar(
-                select(models.action_log.ActionLog.status)
-                .where(models.action_log.ActionLog.id == id)
-            )
-
     def update_status(self, id: str, status: str, download_url: Optional[str] = None):
         """Update the status of a specified action.
         """
         with Session(self.engine) as session:
+            if status == "sent":
+                # Do not overwrite completed status
+                # if action control arrived after action result
+                old_status = (
+                    select(models.action_log.ActionLog.status)
+                    .where(models.action_log.ActionLog.id == id)
+                )
+                if old_status != "pending":
+                    return
+
             stmt = (
                 update(models.action_log.ActionLog)
                 .values({

server/src/device_mgmt/action.py

@@ -71,17 +71,7 @@ def execute_action(mac_address: str, action_id: str) -> Optional[tuple[int, str]
                 control_msg = execution.execution_control.get(timeout=QUEUE_RESPONSE_TIMEOUT)
                 if control_msg == "ok":
                     print(f"Queued execution '{execution.execution_id}'.", flush=True)
-
-                    # Action control may arrive after action result
-                    # We have to make sure we do not override completed status
-                    current_status = server.instance._action_logs_db.get_status(
-                        execution.execution_id
-                    )
-                    if current_status == "pending":
-                        server.instance._action_logs_db.update_status(
-                            execution.execution_id,
-                            "sent"
-                        )
+                    server.instance._action_logs_db.update_status(execution.execution_id, "sent")
                     break
                 elif control_msg == "full":
                     print(