[Fixes #14035] Implementation of a common ResourceManager base class for all resource types (#14053)

* [Fixes #14035] Implementation of a common ResourceManager base class for all resource types

* [Fixes #14035] Add lazy wrapper for custom resource managers

---------

Co-authored-by: Mattia Giupponi <mattia.giupponi@gmail.com>

Author: sijandh35

geonode/assets/tests.py

@@ -381,7 +381,7 @@ def test_download_with_attachment_for_anonymous(self):
         any user without download permissions
         cannot download the asset
         """
-        from geonode.resource.manager import resource_manager
+        from geonode.resource.registry import resource_manager_registry, dataset_manager
         from geonode.layers.models import Dataset
         from guardian.shortcuts import get_anonymous_user
 
@@ -393,7 +393,7 @@ def test_download_with_attachment_for_anonymous(self):
             resource = None
             try:
                 # creating resoruce
-                resource = resource_manager.create(
+                resource = dataset_manager.create(
                     None, resource_type=Dataset, defaults={"owner": bobby, "asset": asset}
                 )
                 # getting perms
@@ -403,7 +403,9 @@ def test_download_with_attachment_for_anonymous(self):
                 # and anonymous just to be sure
                 resource_perms["groups"][get_anonymous_user().groups.first()] = ["view_resourcebase"]
                 # resetting the permissions for the resource
-                resource_manager.set_permissions(resource.uuid, instance=resource, permissions=resource_perms)
+                resource_manager_registry.get_for_instance(resource).set_permissions(
+                    resource.uuid, instance=resource, permissions=resource_perms
+                )
                 url = reverse("assets-download", kwargs={"pk": asset.pk})
                 response = self.client.get(url)
                 self.assertEqual(response.status_code, 403)

geonode/base/admin.py

@@ -390,9 +390,9 @@ def delete_queryset(self, request, queryset):
         through the admin batch action
         """
         for obj in queryset:
-            from geonode.resource.manager import resource_manager
+            from geonode.resource.registry import resource_manager_registry
 
-            resource_manager.delete(obj.uuid, instance=obj)
+            resource_manager_registry.get_for_instance(obj).delete(obj.uuid, instance=obj)
 
     class Meta:
         pass

geonode/base/api/tests.py

@@ -52,7 +52,7 @@
 from geonode.catalogue.models import catalogue_post_save
 from geonode.catalogue.views import csw_global_dispatch
 
-from geonode.resource.manager import resource_manager
+from geonode.resource.registry import resource_manager_registry, dataset_manager
 from guardian.shortcuts import get_anonymous_user
 
 from geonode.assets.utils import create_asset_and_link
@@ -2108,7 +2108,7 @@ def test_set_thumbnail_from_bbox_from_Anonymous_user_raise_permission_error(self
         self.assertEqual(response.status_code, 401)
         self.assertEqual(expected, response.json())
 
-    @patch("geonode.base.api.views.resource_manager.set_thumbnail")
+    @patch("geonode.layers.manager.DatasetResourceManager.set_thumbnail")
     def test_set_thumbnail_from_bbox_from_logged_user_for_existing_dataset(self, mock_set_thumbnail):
         """
         Given a logged User and an existing dataset, should successfully trigger thumbnail generation.
@@ -2167,7 +2167,7 @@ def test_set_thumbnail_from_bbox_from_logged_user_for_existing_doc(self):
         self.assertEqual(response.status_code, 405)
         self.assertEqual(expected, response.json())
 
-    @patch("geonode.base.api.views.resource_manager.set_thumbnail", return_value=False)
+    @patch("geonode.layers.manager.DatasetResourceManager.set_thumbnail", return_value=False)
     def test_set_thumbnail_from_bbox_from_logged_user_for_existing_dataset_raise_exp(self, mock_set_thumbnail):
         """
         Given a logged User and an existing dataset, should raise a ThumbnailException.
@@ -2602,7 +2602,7 @@ def test_resource_service_permissions_with_partial_restriction(self):
     def test_resource_service_copy(self):
         files = os.path.join(gisdata.GOOD_DATA, "vector/single_point.shp")
         files_as_dict, _ = get_files(files)
-        resource = resource_manager.create(
+        resource = dataset_manager.create(
             str(uuid4()),
             Dataset,
             defaults={
@@ -2701,7 +2701,7 @@ def test_resource_service_copy_with_perms_dataset_set_default_perms(self):
         with self.settings(ASYNC_SIGNALS=False):
             files = os.path.join(gisdata.GOOD_DATA, "vector/single_point.shp")
             files_as_dict, _ = get_files(files)
-            resource = resource_manager.create(
+            resource = dataset_manager.create(
                 None,
                 resource_type=Dataset,
                 defaults={
@@ -3140,10 +3140,12 @@ def test_delete_will_delete_single_metadata(self):
         self.assertEqual([], response.json())
 
     def test_user_without_view_perms_cannot_see_the_endpoint(self):
-        from geonode.resource.manager import resource_manager
+        from geonode.resource.registry import resource_manager_registry
 
         self.client.login(username="bobby", password="bob")
-        resource_manager.remove_permissions(self.layer.uuid, instance=self.layer.get_self_resource())
+        resource_manager_registry.get_for_instance(self.layer.get_self_resource()).remove_permissions(
+            self.layer.uuid, instance=self.layer.get_self_resource()
+        )
         url = reverse("base-resources-extra-metadata", args=[self.layer.id])
         response = self.client.get(url, content_type="application/json")
         self.assertTrue(401, response.status_code)
@@ -3753,7 +3755,7 @@ def setUpClass(cls) -> None:
 
     def test_simple_resourcebase_can_be_created_by_resourcemanager(self):
         self.maxDiff = None
-        resource = resource_manager.create(
+        resource = resource_manager_registry.get_for_model(ResourceBase).create(
             str(uuid4()), resource_type=ResourceBase, defaults={"title": "simple resourcebase", "owner": self.user}
         )
 
@@ -3807,19 +3809,21 @@ def test_simple_resourcebase_can_be_created_by_resourcemanager(self):
         self.assertEqual(record.identification[0].title, resource.title)
 
     def test_resource_index_created(self):
-        resource = resource_manager.create(
+        resource = resource_manager_registry.get_for_model(ResourceBase).create(
             str(uuid4()), resource_type=ResourceBase, defaults={"title": "simple resourcebase", "owner": self.user}
         )
 
-        resource = resource_manager.update(resource.uuid, instance=resource, vals={})
+        resource = resource_manager_registry.get_for_instance(resource).update(
+            resource.uuid, instance=resource, vals={}
+        )
 
         self.assertTrue(ResourceIndex.objects.filter(resource=resource).exists())
 
     def test_csw_should_not_return_resourcebase_by_default(self):
-        resource = resource_manager.create(
+        resource = resource_manager_registry.get_for_model(ResourceBase).create(
             str(uuid4()), resource_type=ResourceBase, defaults={"title": "simple resourcebase", "owner": self.user}
         )
-        dt = resource_manager.create(
+        dt = dataset_manager.create(
             str(uuid4()), resource_type=Dataset, defaults={"title": "simple dataset", "owner": self.user}
         )
 
@@ -3836,10 +3840,10 @@ def test_csw_should_not_return_resourcebase_by_default(self):
 
     @override_settings(PYCSW=pycsw_settings_all)
     def test_csw_should_return_resourcebase_if_defined_in_settings(self):
-        resource = resource_manager.create(
+        resource = resource_manager_registry.get_for_model(ResourceBase).create(
             str(uuid4()), resource_type=ResourceBase, defaults={"title": "simple resourcebase", "owner": self.user}
         )
-        dt = resource_manager.create(
+        dt = dataset_manager.create(
             str(uuid4()), resource_type=Dataset, defaults={"title": "simple dataset", "owner": self.user}
         )
 

geonode/base/api/views.py

@@ -87,7 +87,7 @@
 from geonode.security.registry import permissions_registry
 from geonode.resource.models import ExecutionRequest
 from geonode.resource.api.tasks import resouce_service_dispatcher
-from geonode.resource.manager import resource_manager
+from geonode.resource.registry import resource_manager_registry
 
 from .permissions import (
     IsOwnerOrAdmin,
@@ -711,7 +711,7 @@ def set_thumbnail_from_bbox(self, request, resource_id, *args, **kwargs):
                 bbox = request_body["bbox"] + [request_body["srid"]]
                 zoom = request_body.get("zoom", None)
 
-            success = resource_manager.set_thumbnail(
+            success = resource_manager_registry.get_for_instance(resource).set_thumbnail(
                 resource.uuid,
                 instance=resource,
                 bbox=bbox,
@@ -1278,7 +1278,9 @@ def set_thumbnail(self, request, pk, *args, **kwargs):
             except Exception:
                 raise ValidationError(detail="Invalid data provided")
         if thumbnail:
-            resource_manager.set_thumbnail(resource.uuid, instance=resource, thumbnail=thumbnail)
+            resource_manager_registry.get_for_instance(resource).set_thumbnail(
+                resource.uuid, instance=resource, thumbnail=thumbnail
+            )
             return Response({"thumbnail_url": resource.thumbnail_url})
         return Response("Unable to set thumbnail", status=status.HTTP_400_BAD_REQUEST)
 

geonode/base/models.py

@@ -1085,9 +1085,11 @@ def delete(self, notify=True, *args, **kwargs):
         """
         Send a notification when a layer, map or document is deleted
         """
-        from geonode.resource.manager import resource_manager
+        from geonode.resource.registry import resource_manager_registry
 
-        resource_manager.remove_permissions(self.uuid, instance=self.get_real_instance())
+        resource_manager_registry.get_for_instance(self).remove_permissions(
+            self.uuid, instance=self.get_real_instance()
+        )
 
         # delete assets. TODO: when standalone Assets will be allowed, only dependable Assets shall be removed
         links_with_assets = Link.objects.filter(resource=self, asset__isnull=False).prefetch_related("asset")

geonode/base/tests.py

@@ -82,7 +82,7 @@
 from geonode.base.templatetags.user_messages import show_notification
 from geonode import geoserver
 from geonode.decorators import on_ogc_backend
-from geonode.resource.manager import resource_manager
+from geonode.resource.registry import dataset_manager
 from geonode.base.api.serializers import ResourceBaseSerializer
 
 test_image = Image.new("RGBA", size=(50, 50), color=(155, 0, 0))
@@ -1205,7 +1205,7 @@ def test_region_assignment_for_extent(self):
 
     @override_settings(METADATA_STORERS=["geonode.resource.regions_storer.spatial_predicate_region_assignor"])
     def test_regions_are_assigned_if_handler_is_used(self):
-        dataset = resource_manager.create(
+        dataset = dataset_manager.create(
             None,
             resource_type=Dataset,
             defaults=dict(owner=get_user_model().objects.first(), title="test_region_dataset", is_approved=True),

geonode/base/views.py

@@ -43,7 +43,7 @@
 from geonode.utils import resolve_object
 from geonode.groups.models import GroupProfile
 from geonode.tasks.tasks import set_permissions
-from geonode.resource.manager import resource_manager
+from geonode.resource.registry import resource_manager_registry
 from geonode.security.utils import get_visible_resources
 from geonode.notifications_helper import send_notification
 from geonode.base.utils import OwnerRightsRequestViewUtils, remove_country_from_languagecode
@@ -374,13 +374,14 @@ def resourcebase_embed(request, resourcebaseid, template="base/base_edit.html"):
 
     r = resourcebase_obj
     if request.method in ("POST", "PATCH", "PUT"):
-        r = resource_manager.update(resourcebase_obj.uuid, instance=resourcebase_obj, notify=True)
+        resolved_resource_manager = resource_manager_registry.get_for_instance(resourcebase_obj)
+        r = resolved_resource_manager.update(resourcebase_obj.uuid, instance=resourcebase_obj, notify=True)
 
-        resource_manager.set_permissions(
+        resolved_resource_manager.set_permissions(
             resourcebase_obj.uuid, instance=resourcebase_obj, permissions=ast.literal_eval(permissions_json)
         )
 
-        resource_manager.set_thumbnail(resourcebase_obj.uuid, instance=resourcebase_obj, overwrite=False)
+        resolved_resource_manager.set_thumbnail(resourcebase_obj.uuid, instance=resourcebase_obj, overwrite=False)
 
     access_token = None
     if request and request.user:

geonode/documents/admin.py

@@ -77,9 +77,9 @@ def delete_queryset(self, request, queryset):
         through the admin batch action
         """
         for obj in queryset:
-            from geonode.resource.manager import resource_manager
+            from geonode.resource.registry import resource_manager_registry
 
-            resource_manager.delete(obj.uuid, instance=obj)
+            resource_manager_registry.get_for_instance(obj).delete(obj.uuid, instance=obj)
 
 
 admin.site.register(Document, DocumentAdmin)

geonode/documents/api/views.py

@@ -19,14 +19,14 @@
 
 from drf_spectacular.utils import extend_schema
 from pathlib import Path
+from uuid import uuid4
 from dynamic_rest.viewsets import DynamicModelViewSet
 from dynamic_rest.filters import DynamicFilterBackend, DynamicSortingFilter
 
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticatedOrReadOnly
 from geonode import settings
 
-from geonode.assets.utils import create_asset_and_link
 from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, AdvertisedFilter
 from geonode.base.api.pagination import GeoNodeApiPagination
 from geonode.base.api.permissions import UserHasPerms
@@ -36,10 +36,7 @@
 from geonode.documents.api.exceptions import DocumentException
 from geonode.documents.models import Document
 from geonode.metadata.multilang.views import MultiLangViewMixin
-from geonode.metadata.manager import metadata_manager
-from geonode.resource.utils import resourcebase_post_save, infer_default_metadata
-from geonode.storage.manager import StorageManager
-from geonode.resource.manager import resource_manager
+from geonode.resource.registry import document_manager
 
 from .serializers import DocumentSerializer
 from .permissions import DocumentPermissionsFilter
@@ -94,7 +91,6 @@ def perform_create(self, serializer):
         --form 'doc_file=@"/C:/Users/user/Pictures/BcMc-a6T9IM.jpg"' \
         --form 'metadata_only="False"'
         """
-        manager = None
         serializer.is_valid(raise_exception=True)
         file = serializer.validated_data.pop("file_path", None) or serializer.validated_data.pop("doc_file", None)
         doc_url = serializer.validated_data.pop("doc_url", None)
@@ -106,51 +102,35 @@ def perform_create(self, serializer):
         if file and doc_url:
             raise DocumentException(detail="Either a file or a URL must be specified, not both")
 
-        if not extension:
+        if not extension and file:
             filename = file if isinstance(file, str) else file.name
             extension = Path(filename).suffix.replace(".", "")
 
         if extension not in settings.ALLOWED_DOCUMENT_TYPES:
             raise DocumentException("The file provided is not in the supported extensions list")
 
         try:
-            resolved_owner = resource_manager.resolve_creation_owner(self.request.user)
+            request_user = self.request.user
             payload = {
-                "owner": resolved_owner,
+                **serializer.validated_data,
+                "owner": request_user,
                 "extension": extension,
                 "resource_type": "document",
             }
             if doc_url:
                 payload["doc_url"] = doc_url
                 payload["sourcetype"] = enumerations.SOURCE_TYPE_REMOTE
 
-            resource = serializer.save(**payload)
-
-            if file:
-                manager = StorageManager(remote_files={"base_file": file})
-                manager.clone_remote_files()
-                create_asset_and_link(
-                    resource, self.request.user, [manager.get_retrieved_paths().get("base_file")], clone_files=True
-                )
-                manager.delete_retrieved_paths(force=True)
-
-            resource.set_missing_info()
-            metadata_manager.update_schema_instance_partial(
-                resource,
-                infer_default_metadata(resource.get_real_instance()),
-                user=self.request.user,
+            instance = document_manager.create(
+                str(uuid4()),
+                resource_type=Document,
+                defaults=payload,
+                file=file,
+                user=request_user,
             )
-            resourcebase_post_save(resource.get_real_instance())
-            resource_manager.finalize_creation_permissions(
-                resource, owner=resolved_owner, initial_user=self.request.user
-            )
-            resource.handle_moderated_uploads()
-            resource_manager.set_thumbnail(resource.uuid, instance=resource, overwrite=False)
-            return resource
+            serializer.instance = instance
         except Exception as e:
             logger.error(f"Error creating document {serializer.validated_data}", exc_info=e)
-            if manager:
-                manager.delete_retrieved_paths()
             raise e
 
     @extend_schema(