Remove get_default_access_permissions from harvester

GeoNode · Jul 22, 2021 · ff589be · ff589be
1 parent 06d2930
commit ff589be
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/geonode/harvesting/api/serializers.py b/geonode/harvesting/api/serializers.py
@@ -105,7 +105,6 @@ class Meta:
             "scheduling_enabled",
             "update_frequency",
             "default_owner",
-            "default_access_permissions",
             "harvester_type",
             "harvester_type_specific_configuration",
             "update_frequency",

diff --git a/geonode/harvesting/harvesters/base.py b/geonode/harvesting/harvesters/base.py
@@ -154,7 +154,6 @@ def update_geonode_resource(
             harvesting_session_id: int,
     ):
         """Create or update a local GeoNode resource with the input harvested information."""
-        harvester = models.Harvester.objects.get(pk=self.harvester_id)
         defaults = self.get_geonode_resource_defaults(
             harvested_info.resource_descriptor, harvestable_resource)
         geonode_resource = harvestable_resource.geonode_resource
@@ -177,6 +176,7 @@ def update_geonode_resource(
         keywords = list(
             harvested_info.resource_descriptor.identification.other_keywords
         ) + geonode_resource.keyword_list()
+        harvester = models.Harvester.objects.get(pk=self.harvester_id)
         keywords.append(
             harvester.name.lower().replace(
                 'harvester ', '').replace(
@@ -186,11 +186,6 @@ def update_geonode_resource(
         regions = harvested_info.resource_descriptor.identification.place_keywords
         resource_manager.update(
             str(harvested_info.resource_descriptor.uuid), regions=regions, keywords=list(set(keywords)))
-
-        resource_manager.set_permissions(
-            str(harvested_info.resource_descriptor.uuid),
-            instance=geonode_resource,
-            permissions=harvester.default_access_permissions)
         harvestable_resource.geonode_resource = geonode_resource
         harvestable_resource.save()
         self.finalize_resource_update(

diff --git a/geonode/harvesting/migrations/0022_alter_harvester_default_access_permissions.py b/geonode/harvesting/migrations/0022_alter_harvester_default_access_permissions.py
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='harvester',
             name='default_access_permissions',
-            field=models.JSONField(default=geonode.harvesting.models.get_default_access_permissions, help_text='Default access permissions of harvested resources'),
+            field=models.JSONField(help_text='Default access permissions of harvested resources'),
         ),
     ]
diff --git a/geonode/harvesting/migrations/0027_remove_harvester_default_access_permissions.py b/geonode/harvesting/migrations/0027_remove_harvester_default_access_permissions.py
@@ -0,0 +1,16 @@
+# Generated by Django 3.2.4 on 2021-07-08 13:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('harvesting', '0026_harvestableresource_last_harvesting_succeeded'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='harvester',
+            name='default_access_permissions',
+        ),
+    ]
diff --git a/geonode/harvesting/models.py b/geonode/harvesting/models.py
@@ -38,12 +38,6 @@
 logger = logging.getLogger(__name__)
 
 
-def get_default_access_permissions():
-    return {
-        "AnonymousUser": ["view"]
-    }
-
-
 class Harvester(models.Model):
     STATUS_READY = "ready"
     STATUS_UPDATING_HARVESTABLE_RESOURCES = "updating-harvestable-resources"
@@ -105,10 +99,6 @@ class Harvester(models.Model):
         on_delete=models.CASCADE,
         help_text=_("Default owner of harvested resources")
     )
-    default_access_permissions = models.JSONField(
-        default=get_default_access_permissions,
-        help_text=_("Default access permissions of harvested resources")
-    )
     harvest_new_resources_by_default = models.BooleanField(
         help_text=_(
             "Should new resources be harvested automatically without "