duron-sy
diff --git a/‎.env
+1 b/‎.env
+1
diff --git a/‎.env_dev
+1 b/‎.env_dev
+1
diff --git a/‎.env_local
+1 b/‎.env_local
+1
diff --git a/‎.env_test
+1 b/‎.env_test
+1
diff --git a/‎celery-cmd
+3-3 b/‎celery-cmd
+3-3
diff --git a/‎celery.sh
+1-1 b/‎celery.sh
+1-1
diff --git a/‎celery_dev.sh
+1-1 b/‎celery_dev.sh
+1-1
diff --git a/‎geonode/base/api/tests.py
+9-4 b/‎geonode/base/api/tests.py
+9-4
diff --git a/‎geonode/base/api/views.py
+21-7 b/‎geonode/base/api/views.py
+21-7
diff --git a/‎geonode/base/models.py
+19-15 b/‎geonode/base/models.py
+19-15
diff --git a/‎geonode/base/templatetags/base_tags.py
+3-11 b/‎geonode/base/templatetags/base_tags.py
+3-11
diff --git a/‎geonode/geoserver/helpers.py
+16-16 b/‎geonode/geoserver/helpers.py
+16-16
diff --git a/‎geonode/geoserver/manager.py
+2-2 b/‎geonode/geoserver/manager.py
+2-2
diff --git a/‎geonode/geoserver/signals.py
+1-1 b/‎geonode/geoserver/signals.py
+1-1
diff --git a/‎geonode/geoserver/tasks.py
+6-1 b/‎geonode/geoserver/tasks.py
+6-1
diff --git a/‎geonode/groups/tests.py
+1-1 b/‎geonode/groups/tests.py
+1-1
diff --git a/‎geonode/harvesting/admin.py
+3 b/‎geonode/harvesting/admin.py
+3
@@ -37,6 +37,7 @@ GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
 BROKER_URL=amqp://guest:guest@rabbitmq:5672/
+CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=True
 
 SITEURL=http://localhost/
 
@@ -37,6 +37,7 @@ GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
 BROKER_URL=amqp://admin:admin@localhost:5672//
+CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=False
 
 SITEURL=http://localhost:8000/
 
@@ -37,6 +37,7 @@ GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
 BROKER_URL=amqp://admin:admin@localhost:5672//
+CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=False
 
 SITEURL=http://localhost/
 
@@ -37,6 +37,7 @@ GEONODE_DB_CONN_MAX_AGE=0
 GEONODE_DB_CONN_TOUT=5
 DEFAULT_BACKEND_DATASTORE=datastore
 BROKER_URL=amqp://guest:guest@rabbitmq:5672/
+CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=False
 
 SITEURL=http://localhost:8001/
 
@@ -3,20 +3,20 @@
 # Luca Pasquali <luca.pasquali@geo-solutions.it>
 CELERY_BIN=${CELERY_BIN:-"$(which celery||echo celery)"}
 CELERY_APP=${CELERY_APP:-"geonode.celery_app:app"}
-# CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker.state"}
+CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker.state"}
 # expressed in KB
 CELERY__MAX_MEMORY_PER_CHILD=${CELERY__MAX_MEMORY_PER_CHILD:-"200000"}
 CELERY__AUTOSCALE_VALUES=${CELERY__AUTOSCALE_VALUES:-"2,4"}
 CELERY__MAX_TASKS_PER_CHILD=${CELERY__MAX_TASKS_PER_CHILD:-"10"}
 CELERY__OPTS=${CELERY__OPTS:-"--without-gossip --without-mingle -Ofair -B -E"}
-CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"django_celery_beat.schedulers:DatabaseScheduler"}
+CELERY__BEAT_SCHEDULE=${CELERY__BEAT_SCHEDULE:-"celery.beat:PersistentScheduler"}
 CELERY__LOG_LEVEL=${CELERY__LOG_LEVEL:-"INFO"}
 CELERY__LOG_FILE=${CELERY__LOG_FILE:-"/var/log/celery.log"}
 CELERY__WORKER_NAME=${CELERY__WORKER_NAME:-"worker1@%h"}
 CELERY__WORKER_CONCURRENCY=${CELERY__WORKER_CONCURRENCY:-"4"}
 
 $CELERY_BIN -A $CELERY_APP worker --autoscale=$CELERY__AUTOSCALE_VALUES \
     --max-memory-per-child=$CELERY__MAX_MEMORY_PER_CHILD $CELERY__OPTS \
-    -s $CELERY__BEAT_SCHEDULE \
+    --statedb=$CELERY__STATE_DB --scheduler=$CELERY__BEAT_SCHEDULE \
     --loglevel=$CELERY__LOG_LEVEL -n $CELERY__WORKER_NAME -f $CELERY__LOG_FILE \
     --concurrency=$CELERY__WORKER_CONCURRENCY --max-tasks-per-child=$CELERY__MAX_TASKS_PER_CHILD
@@ -1,4 +1,4 @@
 #!/bin/bash
 nohup celery -A geonode.celery_app:app beat -l DEBUG -f /var/log/celery.log &>/dev/null &
-nohup celery -A geonode.celery_app:app worker --without-gossip --without-mingle -Ofair -B -E -s django_celery_beat.schedulers:DatabaseScheduler --loglevel=INFO --concurrency=2 -n worker1@%h -f /var/log/celery.log &>/dev/null &
+nohup celery -A geonode.celery_app:app worker --without-gossip --without-mingle -Ofair -B -E --statedb=worker.state --scheduler=celery.beat:PersistentScheduler --loglevel=INFO --concurrency=2 -n worker1@%h -f /var/log/celery.log &>/dev/null &
 nohup celery -A geonode.celery_app:app flower --auto_refresh=True --debug=False --broker=${BROKER_URL} --basic_auth=${ADMIN_USERNAME}:${ADMIN_PASSWORD} --address=0.0.0.0 --port=5555 &>/dev/null &
@@ -2,4 +2,4 @@ set -a
 . ./.env_dev
 set +a
 
-celery -A geonode.celery_app:app worker --without-gossip --without-mingle -Ofair -B -E -s django_celery_beat.schedulers:DatabaseScheduler --loglevel=DEBUG --concurrency=2 -n worker1@%h
+celery -A geonode.celery_app:app worker --without-gossip --without-mingle -Ofair -B -E --statedb=worker.state --scheduler=celery.beat:PersistentScheduler --loglevel=DEBUG --concurrency=2 -n worker1@%h
@@ -1019,7 +1019,9 @@ def test_set_thumbnail_from_bbox_from_logged_user_for_existing_dataset(self, moc
         response = self.client.post(url, data=payload, format='json')
 
         expected = {
-            "thumbnail_url": "http://localhost:8000/mocked_url.jpg"
+            'message': 'Thumbnail correctly created.',
+            'success': True,
+            'thumbnail_url': 'http://localhost:8000/mocked_url.jpg'
         }
         self.assertEqual(response.status_code, 200)
         self.assertEqual(expected, response.json())
@@ -1044,7 +1046,8 @@ def test_set_thumbnail_from_bbox_from_logged_user_for_not_existing_dataset(self)
         response = self.client.post(url, data=payload, format='json')
 
         expected = {
-            "message": f"Resource selected with id {dataset_id} does not exists"
+            'message': f'Resource selected with id {dataset_id} does not exists',
+            'success': False
         }
         self.assertEqual(response.status_code, 404)
         self.assertEqual(expected, response.json())
@@ -1064,7 +1067,8 @@ def test_set_thumbnail_from_bbox_from_logged_user_for_existing_doc(self):
         response = self.client.post(url, data=payload, format='json')
 
         expected = {
-            "message": "Not implemented: Endpoint available only for Dataset and Maps"
+            'message': 'Not implemented: Endpoint available only for Dataset and Maps',
+            'success': False
         }
         self.assertEqual(response.status_code, 405)
         self.assertEqual(expected, response.json())
@@ -1085,7 +1089,8 @@ def test_set_thumbnail_from_bbox_from_logged_user_for_existing_dataset_raise_exp
         response = self.client.post(url, data=payload, format='json')
 
         expected = {
-            "message": "Some exception during thumb creation"
+            'message': 'Some exception during thumb creation',
+            'success': False
         }
         self.assertEqual(response.status_code, 500)
         self.assertEqual(expected, response.json())
@@ -553,30 +553,44 @@ def resource_service_permissions(self, request, pk=None):
             IsAuthenticated,
         ])
     def set_thumbnail_from_bbox(self, request, resource_id):
+        import traceback
+        from django.utils.datastructures import MultiValueDictKeyError
         try:
             resource = ResourceBase.objects.get(id=ast.literal_eval(resource_id))
 
             if not isinstance(resource.get_real_instance(), (Dataset, Map)):
                 raise NotImplementedError("Not implemented: Endpoint available only for Dataset and Maps")
 
             request_body = request.data if request.data else json.loads(request.body)
-            bbox = request_body["bbox"] + [request_body["srid"]]
-            zoom = request_body.get("zoom", None)
+            try:
+                bbox = request_body["bbox"] + [request_body["srid"]]
+                zoom = request_body.get("zoom", None)
+            except MultiValueDictKeyError:
+                for _k, _v in request_body.items():
+                    request_body = json.loads(_k)
+                    break
+                bbox = request_body["bbox"] + [request_body["srid"]]
+                zoom = request_body.get("zoom", None)
 
             thumbnail_url = create_thumbnail(resource.get_real_instance(), bbox=bbox, background_zoom=zoom, overwrite=True)
-            return Response({"thumbnail_url": thumbnail_url}, status=200)
+            return Response({"message": "Thumbnail correctly created.", "success": True, "thumbnail_url": thumbnail_url}, status=200)
         except ResourceBase.DoesNotExist:
+            traceback.print_exc()
             logger.error(f"Resource selected with id {resource_id} does not exists")
-            return Response(data={"message": f"Resource selected with id {resource_id} does not exists"}, status=404, exception=True)
+            return Response(
+                data={"message": f"Resource selected with id {resource_id} does not exists", "success": False}, status=404, exception=True)
         except NotImplementedError as e:
+            traceback.print_exc()
             logger.error(e)
-            return Response(data={"message": e.args[0]}, status=405, exception=True)
+            return Response(data={"message": e.args[0], "success": False}, status=405, exception=True)
         except ThumbnailError as e:
+            traceback.print_exc()
             logger.error(e)
-            return Response(data={"message": e.args[0]}, status=500, exception=True)
+            return Response(data={"message": e.args[0], "success": False}, status=500, exception=True)
         except Exception as e:
+            traceback.print_exc()
             logger.error(e)
-            return Response(data={"message": e.args[0]}, status=500, exception=True)
+            return Response(data={"message": e.args[0], "success": False}, status=500, exception=True)
 
     @extend_schema(
         methods=["post"], responses={200}, description="Instructs the Async dispatcher to execute a 'INGEST' operation."
 
@@ -1022,10 +1022,13 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         # Provide legacy support for bbox fields
-        bbox = [kwargs.pop(key, None) for key in ('bbox_x0', 'bbox_y0', 'bbox_x1', 'bbox_y1')]
-        if all(bbox):
-            kwargs['bbox_polygon'] = Polygon.from_bbox(bbox)
-            kwargs['ll_bbox_polygon'] = Polygon.from_bbox(bbox)
+        try:
+            bbox = [kwargs.pop(key, None) for key in ('bbox_x0', 'bbox_y0', 'bbox_x1', 'bbox_y1')]
+            if all(bbox):
+                kwargs['bbox_polygon'] = Polygon.from_bbox(bbox)
+                kwargs['ll_bbox_polygon'] = Polygon.from_bbox(bbox)
+        except Exception as e:
+            logger.exception(e)
         super().__init__(*args, **kwargs)
 
     def __str__(self):
@@ -1507,17 +1510,18 @@ def set_center_zoom(self):
         """
         Sets the center coordinates and zoom level in EPSG:4326
         """
-        bbox = self.ll_bbox_polygon
-        center_x, center_y = self.ll_bbox_polygon.centroid.coords
-        center = Point(center_x, center_y, srid=4326)
-        self.center_x, self.center_y = center.coords
-        try:
-            ext = bbox.extent
-            width_zoom = math.log(360 / (ext[2] - ext[0]), 2)
-            height_zoom = math.log(360 / (ext[3] - ext[1]), 2)
-            self.zoom = math.ceil(min(width_zoom, height_zoom))
-        except ZeroDivisionError:
-            pass
+        if self.ll_bbox_polygon and len(self.ll_bbox_polygon.centroid.coords) > 0:
+            bbox = self.ll_bbox_polygon.clone()
+            center_x, center_y = bbox.centroid.coords
+            center = Point(center_x, center_y, srid=4326)
+            self.center_x, self.center_y = center.coords
+            try:
+                ext = bbox.extent
+                width_zoom = math.log(360 / (ext[2] - ext[0]), 2)
+                height_zoom = math.log(360 / (ext[3] - ext[1]), 2)
+                self.zoom = math.ceil(min(width_zoom, height_zoom))
+            except ZeroDivisionError:
+                pass
 
     def download_links(self):
         """assemble download links for pycsw"""
 
@@ -29,12 +29,12 @@
 from pinax.ratings.models import Rating
 from guardian.shortcuts import get_objects_for_user
 
-from geonode.base.models import ResourceBase
-from geonode.base.bbox_utils import filter_bbox
-from geonode.layers.models import Dataset
 from geonode.maps.models import Map
+from geonode.layers.models import Dataset
+from geonode.base.models import ResourceBase
 from geonode.documents.models import Document
 from geonode.groups.models import GroupProfile
+from geonode.base.bbox_utils import filter_bbox
 from geonode.base.models import (
     HierarchicalKeyword, Menu, MenuItem
 )
@@ -423,11 +423,3 @@ def display_change_perms_button(resource, user, perms):
         return True
     else:
         return not getattr(settings, 'ADMIN_MODERATE_UPLOADS', False)
-
-
-@register.simple_tag
-def get_dataset_count_by_services(service_id, user):
-    return get_visible_resources(
-        queryset=Dataset.objects.filter(remote_service=service_id),
-        user=user
-    ).count()
@@ -1483,12 +1483,11 @@ def fetch_gs_resource(instance, values, tries):
                            owner=instance.owner))
     else:
         msg = f"There isn't a geoserver resource for this layer: {instance.name}"
-        logger.exception(msg)
+        logger.debug(msg)
         if tries >= _max_tries:
             # raise GeoNodeException(msg)
             return (values, None)
         gs_resource = None
-        time.sleep(5)
     return (values, gs_resource)
 
 
@@ -1683,20 +1682,6 @@ def sync_instance_with_geoserver(
             except Exception as e:
                 logger.warning(e)
 
-        # Refreshing CSW records
-        logger.debug(f"... Updating the Catalogue entries for Dataset {instance.title}")
-        try:
-            catalogue_post_save(instance=instance, sender=instance.__class__)
-        except Exception as e:
-            logger.exception(e)
-
-        # Refreshing dataset links
-        logger.debug(f"... Creating Default Resource Links for Dataset {instance.title}")
-        try:
-            set_resource_default_links(instance, instance, prune=True)
-        except Exception as e:
-            logger.exception(e)
-
         # Save dataset styles
         logger.debug(f"... Refresh Legend links for Dataset {instance.title}")
         try:
@@ -1711,6 +1696,21 @@ def sync_instance_with_geoserver(
         except Exception:
             pass
 
+    # Refreshing dataset links
+    logger.debug(f"... Creating Default Resource Links for Dataset {instance.title}")
+    try:
+        _prune = (gs_resource is not None)
+        set_resource_default_links(instance, instance, prune=_prune)
+    except Exception as e:
+        logger.exception(e)
+
+    # Refreshing CSW records
+    logger.debug(f"... Updating the Catalogue entries for Dataset {instance.title}")
+    try:
+        catalogue_post_save(instance=instance, sender=instance.__class__)
+    except Exception as e:
+        logger.exception(e)
+
     return instance
 
 
 
@@ -115,7 +115,7 @@ def delete(self, uuid: str, /, instance: ResourceBase = None) -> int:
         if instance and getattr(ogc_server_settings, "BACKEND_WRITE_ENABLED", True):
             _real_instance = instance.get_real_instance()
             if isinstance(_real_instance, Dataset) and hasattr(_real_instance, 'alternate') and _real_instance.alternate:
-                if _real_instance.remote_service is None or _real_instance.remote_service.method == CASCADED:
+                if not hasattr(_real_instance, 'remote_service') or _real_instance.remote_service is None or _real_instance.remote_service.method == CASCADED:
                     geoserver_cascading_delete.apply_async((_real_instance.alternate,))
                     if "geonode.upload" in settings.INSTALLED_APPS:
                         from geonode.upload.models import Upload
@@ -555,7 +555,7 @@ def set_workflow_permissions(self, uuid: str, /, instance: ResourceBase = None,
     def set_thumbnail(self, uuid: str, /, instance: ResourceBase = None, overwrite: bool = True, check_bbox: bool = True) -> bool:
         if instance and not isinstance(instance.get_real_instance(), Document):
             if overwrite or instance.thumbnail_url == static(settings.MISSING_THUMBNAIL):
-                geoserver_create_thumbnail.apply_async((instance.id, overwrite, check_bbox, ))
+                geoserver_create_thumbnail.apply((instance.id, overwrite, check_bbox, ))
             return True
         return False
 
 
@@ -54,7 +54,7 @@ def geoserver_pre_delete(instance, sender, **kwargs):
     # cascading_delete should only be called if
     # ogc_server_settings.BACKEND_WRITE_ENABLED == True
     if getattr(ogc_server_settings, "BACKEND_WRITE_ENABLED", True):
-        if instance.remote_service is None or instance.remote_service.method == CASCADED:
+        if not hasattr(instance, 'remote_service') or instance.remote_service is None or instance.remote_service.method == CASCADED:
             if instance.alternate:
                 geoserver_cascading_delete.apply_async((instance.alternate,))
 
 
@@ -29,6 +29,7 @@
     AcquireLock,
     FaultTolerantTask)
 from geonode.base.models import Link
+from geonode.base import enumerations
 from geonode.layers.models import Dataset
 from geonode.base.models import ResourceBase
 
@@ -217,7 +218,7 @@ def geoserver_post_save_datasets(
     expires=30,
     acks_late=False,
     autoretry_for=(Exception, ),
-    retry_kwargs={'max_retries': 3, 'countdown': 10},
+    retry_kwargs={'max_retries': 1, 'countdown': 10},
     retry_backoff=True,
     retry_backoff_max=700,
     retry_jitter=True)
@@ -235,11 +236,15 @@ def geoserver_create_thumbnail(self, instance_id, overwrite=True, check_bbox=Tru
     lock_id = f'{self.request.id}'
     with AcquireLock(lock_id) as lock:
         if lock.acquire() is True:
+            instance.set_processing_state(enumerations.STATE_RUNNING)
             try:
+                instance.set_dirty_state()
                 create_gs_thumbnail(instance, overwrite=overwrite, check_bbox=check_bbox)
                 logger.debug(f"... Created Thumbnail for Dataset {instance.title}")
             except Exception as e:
                 geoserver_create_thumbnail.retry(exc=e)
+            finally:
+                instance.set_processing_state(enumerations.STATE_PROCESSED)
 
 
 @app.task(
 
@@ -276,7 +276,7 @@ def test_group_permissions_extend_to_user(self):
         Ensures that when a user is in a group, the group permissions
         extend to the user.
         """
-        layer = Dataset.objects.all()[0]
+        layer = Dataset.objects.first()
         # Set the default permissions
         layer.set_default_permissions()
 
 
@@ -307,13 +307,15 @@ class HarvestableResourceAdmin(admin.ModelAdmin):
         "last_harvested",
         "unique_identifier",
         "title",
+        "abstract",
         "show_link_to_harvester",
         "should_be_harvested",
         "remote_resource_type",
     )
     readonly_fields = (
         "unique_identifier",
         "title",
+        "abstract",
         "harvester",
         "last_updated",
         "last_refreshed",
@@ -331,6 +333,7 @@ class HarvestableResourceAdmin(admin.ModelAdmin):
     )
     search_fields = (
         "title",
+        "abstract",
     )
     list_editable = (
         "should_be_harvested",