fix(worker): make the delta_apply jobs to be runnable again

Author: suricactus

docker-app/qfieldcloud/core/management/commands/dequeue.py

@@ -10,7 +10,7 @@
 from django.db.models import Q
 from qfieldcloud.core.models import Job
 from worker_wrapper.wrapper import (
-    DeltaApplyJobRun,
+    ApplyDeltaJobRun,
     JobRun,
     PackageJobRun,
     ProcessProjectfileJobRun,
@@ -117,7 +117,7 @@ def handle(
     def _run(self, job: Job) -> None:
         job_run_classes: dict[Job.Type, type[JobRun]] = {
             Job.Type.PACKAGE: PackageJobRun,
-            Job.Type.DELTA_APPLY: DeltaApplyJobRun,
+            Job.Type.DELTA_APPLY: ApplyDeltaJobRun,
             Job.Type.PROCESS_PROJECTFILE: ProcessProjectfileJobRun,
         }
 

docker-app/worker_wrapper/wrapper.py

@@ -450,9 +450,9 @@ def after_docker_run(self) -> None:
         packages.delete_obsolete_packages(projects=[self.job.project])
 
 
-class DeltaApplyJobRun(JobRun):
+class ApplyDeltaJobRun(JobRun):
     job_class = ApplyJob
-    command = ["delta_apply", "%(project__id)s", "%(project__the_qgis_file_name)s"]
+    command = ["apply_deltas", "%(project__id)s", "%(project__the_qgis_file_name)s"]
 
     def __init__(self, job_id: str) -> None:
         super().__init__(job_id)

docker-qgis/qfc_worker/commands/apply_deltas.py

@@ -1173,17 +1173,17 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
             help="Inverses the direction of the deltas. Makes the delta `old` to `new` and `new` to `old`. Mainly used to rollback the applied changes using the same delta file..",
         )
         parser.add_argument(
-            "--delta-filename",
+            "--delta-file",
             type=str,
             default="/io/deltafile.json",
             help="Path to the delta file JSON file",
         )
-        parser.add_argument("--delta-log", type=str, help="Path to delta log file")
 
     def handle(  # type: ignore
         self,
         project_id: UUID,
         project_file: str,
+        delta_file: str,
         overwrite_conflicts: bool,
         inverse: bool,
     ) -> None:
@@ -1214,7 +1214,7 @@ def handle(  # type: ignore
                     name="Apply Deltas",
                     arguments={
                         "the_qgis_file_name": WorkDirPath("files", project_file),
-                        "delta_filename": "/io/deltafile.json",
+                        "delta_filename": delta_file,
                         "inverse": inverse,
                         "overwrite_conflicts": overwrite_conflicts,
                     },