Updating the PDN harvester in order to work with recent changes to upstream GeoNode

Author: Ricardo Garcia Silva

src/pdn/harvesters.py

@@ -258,7 +258,6 @@ def get_geonode_resource_type(self, remote_resource_type: str) -> ResourceBase:
     def get_resource(
             self,
             harvestable_resource: harvesting_models.HarvestableResource,
-            harvesting_session_id: int
     ) -> typing.Optional[resourcedescriptor.RecordDescription]:
         """Harvest a single resource from the remote service"""
         remote_id = harvestable_resource.unique_identifier.rpartition(self._UNIQUE_ID_SEPARATOR)[-1]
@@ -281,6 +280,15 @@ def get_resource(
                 )
         return result
 
+    def get_geonode_resource_defaults(
+            self,
+            harvested_info: base.HarvestedResourceInfo,
+            harvestable_resource: harvesting_models.HarvestableResource,
+    ) -> typing.Dict:
+        defaults = super().get_geonode_resource_defaults(harvested_info, harvestable_resource)
+        defaults["doc_url"] = harvested_info.resource_descriptor.distribution.download_url
+        return defaults
+
     def update_geonode_resource(
             self,
             harvested_info: base.HarvestedResourceInfo,
@@ -298,21 +306,6 @@ def update_geonode_resource(
         else:
             raise RuntimeError(f"Invalid resource type: {harvestable_resource.remote_resource_type}")
 
-    def finalize_resource_update(
-            self,
-            geonode_resource: ResourceBase,
-            harvested_info: base.HarvestedResourceInfo,
-            harvestable_resource: harvesting_models.HarvestableResource,
-            harvesting_session_id: int
-    ) -> ResourceBase:
-        if harvestable_resource.remote_resource_type != PdnResourceType.DOCUMENT.value:
-            raise RuntimeError(f"Unexpected resource type: {harvestable_resource.remote_resource_type}")
-        else:
-            geonode_resource.thumbnail_url = harvested_info.resource_descriptor.distribution.thumbnail_url
-            geonode_resource.doc_url = harvested_info.resource_descriptor.distribution.original_format_url
-            geonode_resource.save()
-        return geonode_resource
-
     def finalize_resource_deletion(self, harvestable_resource: harvesting_models.HarvestableResource):
         record_class = {
             PdnResourceType.ALERT: models.Alert,
@@ -658,6 +651,7 @@ def _get_resource_descriptor_for_document_resource(
             point_of_contact=point_of_contact,
             author=author,
             date_stamp=date_stamp,
+            reference_systems=["EPSG:4326"],
             identification=resourcedescriptor.RecordIdentification(
                 name=raw_resource.get("title"),
                 title=raw_resource.get("title"),
@@ -666,7 +660,6 @@ def _get_resource_descriptor_for_document_resource(
                 abstract=raw_resource.get("description", ""),
                 purpose=raw_resource.get("targetaudicent"),
                 originator=author,
-                graphic_overview_uri=graphic_overview_url,
                 place_keywords=[country] if country is not None else [],
                 other_keywords=tuple(),
                 license=[],
@@ -680,6 +673,10 @@ def _get_resource_descriptor_for_document_resource(
             distribution=resourcedescriptor.RecordDistribution(
                 link_url=f"{self.remote_url}/document/{raw_resource['id']}",
                 thumbnail_url=graphic_overview_url,
-                original_format_url=download_url,
+                download_url=download_url,
             ),
+            additional_parameters={
+                "extension": raw_resource.get("filename", "").rpartition(".")[-1],
+                "doc_url": download_url,
+            }
         )