[Fixes #13621] UPSERT failure leaves task payload in PENDING (#13622)

* Set the correct status instead of PENDING

* Fixing test

Author: Gpetrak

geonode/upload/celery_tasks.py

@@ -962,6 +962,9 @@ def upsert_data(self, execution_id, /, handler_module_path, action, **kwargs):
     layer_name = None  # ensure defined even if an exception occurs
     # Updating status to running
     try:
+        # we set the bulk is True to force the on_failure/on_success methods
+        # to set the corresponding status in case the task fails before the layer_name creation
+        self.bulk = True
         kwargs = kwargs.get("kwargs") if "kwargs" in kwargs else kwargs
 
         orchestrator.update_execution_request_status(

geonode/upload/datastore.py

@@ -96,7 +96,7 @@ def upsert_data(self, execution_id, task_name, **kwargs):
         result = self.handler().upsert_data(self.files, execution_id, **kwargs)
 
         # register the task as RUNNING
-        layer_name = result.pop("layer_name", None)
+        layer_name = result.get("layer_name", None)
 
         orchestrator.register_task_status(execution_id, layer_name, task_name, status="RUNNING")
 

geonode/upload/tests/end2end/test_env2end_upsert.py

@@ -215,6 +215,7 @@ def test_import_shapefile_upsert(self):
                 "update": 1,
                 "create": 2,
             },
+            "layer_name": "original",
         }
         self.assertDictEqual(expected, data)
         schema = ModelSchema.objects.filter(name=exec_obj.geonode_resource.alternate.split(":")[-1]).first()