[Backport 5.0.x] [Fixes #14061] Upsert does not work after performing a replace on the… (#14063)

Author: github-actions[bot]

geonode/upload/celery_tasks.py

@@ -535,7 +535,7 @@ def create_geonode_resource(
             handler.create_resourcehandlerinfo(handler_module_path, resource, _exec, **kwargs)
 
         if _overwrite and handler.have_table:
-            handler.fixup_dynamic_model_fields(_exec, _files)
+            handler.fixup_dynamic_model_fields(_exec, _files, resource=resource)
 
         # at the end recall the import_orchestrator for the next step
         import_orchestrator.apply_async(

geonode/upload/handlers/common/raster.py

@@ -569,7 +569,7 @@ def _publish_resource_rollback(self, exec_id, instance_name=None, *args, **kwarg
         publisher = DataPublisher(handler_module_path=handler_module_path)
         publisher.delete_resource(instance_name)
 
-    def fixup_dynamic_model_fields(self, _exec, files):
+    def fixup_dynamic_model_fields(self, _exec, files, **kwargs):
         """
         Raster dataset does not have the dynamic model, so this can be skept
         """

geonode/upload/handlers/common/vector.py

@@ -1473,14 +1473,17 @@ def refresh_geonode_resource(self, execution_id, asset=None, dataset=None, creat
         self.__fixup_primary_key(dataset)
         return dataset
 
-    def fixup_dynamic_model_fields(self, _exec, files):
+    def fixup_dynamic_model_fields(self, _exec, files, **kwargs):
         """
         Utility needed during the replace workflow,
         it will sync all the FieldSchema along with the current resource uploaded.
         This is mandatory in order to have a reliable field structure in the DB
         """
         fields_schema, needed_field_schema = self.__get_new_and_original_schema(files, str(_exec.exec_id))
         fields_schema.filter(~Q(name__in=(x["name"] for x in needed_field_schema))).delete()
+        if dataset := kwargs.get("resource", None):
+            self.__fixup_primary_key(dataset)
+
 
 
 @importer_app.task(