[To be reviewed] Fix some quirks occured while testing

geonode/base/models.py

@@ -24,6 +24,7 @@
 import uuid
 import logging
 import traceback
+import tempfile
 from typing import List, Optional, Union, Tuple
 from sequences.models import Sequence
 from sequences import get_next_value
@@ -37,7 +38,7 @@
 from django.utils.timezone import now
 from django.db.models import Q, signals
 from django.db.utils import IntegrityError, OperationalError
-from django.contrib.auth.models import Group
+from django.core.files import File
 from django.core.files.base import ContentFile
 from django.contrib.auth import get_user_model
 from django.db.models.query import QuerySet
@@ -781,7 +782,7 @@ class ResourceBase(PolymorphicModel, PermissionLevelMixin, ItemBase):
     data_quality_statement = models.TextField(
         _("data quality statement"), max_length=2000, blank=True, null=True, help_text=data_quality_statement_help_text
     )
-    group = models.ForeignKey(Group, null=True, blank=True, on_delete=models.SET_NULL)
+    group = models.ForeignKey(GroupProfile, null=True, blank=True, on_delete=models.SET_NULL)
 
     # Section 9
     # see metadata_author property definition below
@@ -1559,9 +1560,11 @@ def save_thumbnail(self, filename, image, thumbnail_algorithm=ThumbnailAlgorithm
                     tmp_location = os.path.abspath(f"{settings.MEDIA_ROOT}/{upload_path}")
                     im.save(tmp_location, quality="high")
 
+                    lf = tempfile.NamedTemporaryFile(dir="media")
                     with open(tmp_location, "rb+") as img:
+                        lf.write(img.read())
                         # Saving the img via storage manager
-                        storage_manager.save(storage_manager.path(upload_path), img)
+                        storage_manager.save(storage_manager.path(upload_path), File(img))
 
                     # If we use a remote storage, the local img is deleted
                     if tmp_location != storage_manager.path(upload_path):

geonode/metadata/handlers/group.py

@@ -59,11 +59,7 @@ def update_schema(self, jsonschema, context, lang=None):
         return jsonschema
 
     def get_jsonschema_instance(self, resource, field_name, context, errors, lang=None):
-        return (
-            {"id": str(resource.group.groupprofile.pk), "label": resource.group.groupprofile.title}
-            if resource.group
-            else None
-        )
+        return {"id": str(resource.group.pk), "label": resource.group.title} if resource.group else None
 
     def update_resource(self, resource, field_name, json_instance, context, errors, **kwargs):
         data = json_instance.get(field_name, None)

geonode/metadata/tests/test_handlers.py

@@ -1184,8 +1184,8 @@ def test_group_handler_get_jsonschema_instance_with_group(self):
         field_name = "group"
 
         expected_group_instance = {
-            "id": str(self.resource.group.groupprofile.pk),
-            "label": self.resource.group.groupprofile.title,
+            "id": str(self.resource.group.pk),
+            "label": self.resource.group.title,
         }
 
         group_instance = self.group_handler.get_jsonschema_instance(

geonode/resource/manager.py

@@ -258,7 +258,9 @@ def delete(self, uuid: str, /, instance: ResourceBase = None) -> int:
                 ResourceBase.objects.filter(uuid=uuid).delete()
         return 0
 
-    def create(self, uuid: str, /, resource_type: typing.Optional[object] = None, defaults: dict = {}, *args, **kwargs) -> ResourceBase:
+    def create(
+        self, uuid: str, /, resource_type: typing.Optional[object] = None, defaults: dict = {}, *args, **kwargs
+    ) -> ResourceBase:
         if resource_type.objects.filter(uuid=uuid).exists():
             return resource_type.objects.filter(uuid=uuid).get()
         uuid = uuid or str(uuid4())

geonode/templates/user_messages/thread_detail.html

@@ -19,7 +19,7 @@ <h3>{{ thread.subject }}</h3>
             ,
         {% endif %}
         {% for group in thread.registered_groups.all%}
-            <a href={{  group.groupprofile.get_absolute_url }}>{{ group.groupprofile.title }}</a>
+            <a href={{  group.get_absolute_url }}>{{ group.title }}</a>
             {%if not forloop.last%},{%endif%}
         {% endfor %}
 </div>

geonode/upload/handlers/common/remote.py

@@ -104,12 +104,16 @@ def extract_params_from_data(_data, action=None):
             title = json.loads(_data.get("defaults"))
             return {"title": title.pop("title"), "store_spatial_file": True}, _data
 
-        return BaseHandler.extract_params_from_data(_data)[0] | {
-            "action": _data.pop("action", "upload"),
-            "title": _data.pop("title", None),
-            "url": _data.pop("url", None),
-            "type": _data.pop("type", None),
-        }, _data
+        return (
+            BaseHandler.extract_params_from_data(_data)[0]
+            | {
+                "action": _data.pop("action", "upload"),
+                "title": _data.pop("title", None),
+                "url": _data.pop("url", None),
+                "type": _data.pop("type", None),
+            },
+            _data,
+        )
 
     def pre_validation(self, files, execution_id, **kwargs):
         """

geonode/upload/handlers/common/vector.py

@@ -163,9 +163,13 @@ def extract_params_from_data(_data, action=None):
             title = json.loads(_data.get("defaults"))
             return {"title": title.pop("title"), "store_spatial_file": True}, _data
 
-        return BaseHandler.extract_params_from_data(_data)[0] | {
-            "action": _data.pop("action", "upload"),
-        }, _data
+        return (
+            BaseHandler.extract_params_from_data(_data)[0]
+            | {
+                "action": _data.pop("action", "upload"),
+            },
+            _data,
+        )
 
     @staticmethod
     def publish_resources(resources: List[str], catalog, store, workspace):

geonode/upload/handlers/remote/tiles3d.py

@@ -83,7 +83,9 @@ def create_geonode_resource(
         asset=None,
         custom: object = {},
     ):
-        resource = super().create_geonode_resource(layer_name, alternate, execution_id, resource_type, asset=asset, custom=custom)
+        resource = super().create_geonode_resource(
+            layer_name, alternate, execution_id, resource_type, asset=asset, custom=custom
+        )
         _exec = orchestrator.get_execution_object(exec_id=execution_id)
         try:
             js_file = requests.get(_exec.input_params.get("url"), timeout=10).json()

geonode/upload/handlers/remote/wms.py

@@ -131,7 +131,9 @@ def create_geonode_resource(
         Use the default RemoteResourceHandler to create the geonode resource
         after that, we assign the bbox and re-generate the thumbnail
         """
-        resource = super().create_geonode_resource(layer_name, alternate, execution_id, Dataset, asset=asset, custom=custom)
+        resource = super().create_geonode_resource(
+            layer_name, alternate, execution_id, Dataset, asset=asset, custom=custom
+        )
         _exec = orchestrator.get_execution_object(execution_id)
         remote_bbox = _exec.input_params.get("bbox")
         if remote_bbox:

geonode/upload/handlers/shapefile/handler.py

@@ -89,9 +89,13 @@ def extract_params_from_data(_data, action=None):
             title = json.loads(_data.get("defaults"))
             return {"title": title.pop("title"), "store_spatial_file": True}, _data
 
-        return BaseHandler.extract_params_from_data(_data)[0] | {
-            "action": _data.pop("action", "upload"),
-        }, _data
+        return (
+            BaseHandler.extract_params_from_data(_data)[0]
+            | {
+                "action": _data.pop("action", "upload"),
+            },
+            _data,
+        )
 
     @staticmethod
     def is_valid(files, user, **kwargs):

geonode/upload/handlers/tiles3d/handler.py

@@ -162,9 +162,13 @@ def extract_params_from_data(_data, action=None):
             title = json.loads(_data.get("defaults"))
             return {"title": title.pop("title"), "store_spatial_file": True}, _data
 
-        return BaseHandler.extract_params_from_data(_data)[0] | {
-            "action": _data.pop("action", "upload"),
-        }, _data
+        return (
+            BaseHandler.extract_params_from_data(_data)[0]
+            | {
+                "action": _data.pop("action", "upload"),
+            },
+            _data,
+        )
 
     def import_resource(self, files: dict, execution_id: str, **kwargs) -> str:
         logger.info("Total number of layers available: 1")
@@ -226,7 +230,9 @@ def create_geonode_resource(
         asset.location = [path for path in asset.location if path.endswith(".json")]
         asset.save()
 
-        resource = super().create_geonode_resource(layer_name, alternate, execution_id, ResourceBase, asset=asset, custom=custom)
+        resource = super().create_geonode_resource(
+            layer_name, alternate, execution_id, ResourceBase, asset=asset, custom=custom
+        )
 
         # fixing-up bbox for the 3dtile object
         js_file = None