differentiate source type

GeoNode · Mar 20, 2024 · 5b6f2f9 · 5b6f2f9
1 parent 33709cf
commit 5b6f2f9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 2 deletions.
diff --git a/importer/api/serializer.py b/importer/api/serializer.py
@@ -15,6 +15,7 @@ class Meta:
             "store_spatial_files",
             "overwrite_existing_layer",
             "skip_existing_layers",
+            "source"
         )
 
     base_file = serializers.FileField()
@@ -23,3 +24,4 @@ class Meta:
     store_spatial_files = serializers.BooleanField(required=False, default=True)
     overwrite_existing_layer = serializers.BooleanField(required=False, default=False)
     skip_existing_layers = serializers.BooleanField(required=False, default=False)
+    source = serializers.CharField(required=False, default='upload')
diff --git a/importer/api/views.py b/importer/api/views.py
@@ -148,7 +148,7 @@ def create(self, request, *args, **kwargs):
                     legacy_upload_name=_file.name,
                     action=action,
                     name=_file.name,
-                    source="upload",
+                    source=extracted_params.get('source'),
                 )
 
                 sig = import_orchestrator.s(

diff --git a/importer/handlers/common/metadata.py b/importer/handlers/common/metadata.py
@@ -50,6 +50,7 @@ def extract_params_from_data(_data, action=None):
             "skip_existing_layers": _data.pop("skip_existing_layers", "False"),
             "overwrite_existing_layer": _data.pop("overwrite_existing_layer", "False"),
             "store_spatial_file": _data.pop("store_spatial_files", "True"),
+            "source": _data.pop("source", "True"),
         }, _data
 
     @staticmethod

diff --git a/importer/handlers/common/raster.py b/importer/handlers/common/raster.py
@@ -102,6 +102,7 @@ def extract_params_from_data(_data, action=None):
             "skip_existing_layers": _data.pop("skip_existing_layers", "False"),
             "overwrite_existing_layer": _data.pop("overwrite_existing_layer", "False"),
             "store_spatial_file": _data.pop("store_spatial_files", "True"),
+            "source": _data.pop("source", "upload"),
         }, _data
 
     @staticmethod

diff --git a/importer/handlers/common/vector.py b/importer/handlers/common/vector.py
@@ -112,6 +112,7 @@ def extract_params_from_data(_data, action=None):
             "skip_existing_layers": _data.pop("skip_existing_layers", "False"),
             "overwrite_existing_layer": _data.pop("overwrite_existing_layer", "False"),
             "store_spatial_file": _data.pop("store_spatial_files", "True"),
+            "source": _data.pop("source", "upload"),
         }, _data
 
     @staticmethod

diff --git a/importer/handlers/shapefile/handler.py b/importer/handlers/shapefile/handler.py
@@ -91,6 +91,7 @@ def extract_params_from_data(_data, action=None):
             "skip_existing_layers": _data.pop("skip_existing_layers", "False"),
             "overwrite_existing_layer": _data.pop("overwrite_existing_layer", "False"),
             "store_spatial_file": _data.pop("store_spatial_files", "True"),
+            "source": _data.pop("source", "upload"),
         }
 
         return additional_params, _data

diff --git a/importer/handlers/shapefile/serializer.py b/importer/handlers/shapefile/serializer.py
@@ -18,6 +18,7 @@ class Meta:
             "store_spatial_files",
             "overwrite_existing_layer",
             "skip_existing_layers",
+            "source"
         )
 
     base_file = serializers.FileField()
@@ -29,3 +30,4 @@ class Meta:
     store_spatial_files = serializers.BooleanField(required=False, default=True)
     overwrite_existing_layer = serializers.BooleanField(required=False, default=False)
     skip_existing_layers = serializers.BooleanField(required=False, default=False)
+    source = serializers.CharField(required=False, default='upload')
diff --git a/importer/handlers/xml/serializer.py b/importer/handlers/xml/serializer.py
@@ -8,7 +8,8 @@ class Meta:
         ref_name = "MetadataFileSerializer"
         model = Upload
         view_name = "importer_upload"
-        fields = ("dataset_title", "base_file")
+        fields = ("dataset_title", "base_file", "source")
 
     base_file = serializers.FileField()
     dataset_title = serializers.CharField(required=True)
+    source = serializers.CharField(required=False, default='resource_file_upload')