[Fixes #13645] Multilang: update API output payload

Author: etj

geonode/base/api/filters.py

@@ -33,7 +33,7 @@
 from geonode.base.models import ThesaurusKeyword
 from geonode.favorite.models import Favorite
 from geonode.indexing.models import ResourceIndex
-from geonode.metadata.multilang import get_2letters_languages, get_pg_language
+from geonode.metadata.multilang.utils import get_2letters_languages, get_pg_language
 
 logger = logging.getLogger(__name__)
 
@@ -183,3 +183,29 @@ def validate_lang(search_lang):
 
         logger.debug(queryset.query)
         return queryset
+
+
+class AdvertisedFilter(BaseFilterBackend):
+    def filter_queryset(self, request, queryset, view):
+        # advertised
+        # if superuser, all resources will be visible, otherwise only the advertised one and
+        # the resource which the user is owner will be returned
+        user = request.user
+        try:
+            _filter = request.query_params.get("advertised", "None")
+            advertised = strtobool(_filter) if _filter.lower() != "all" else "all"
+        except Exception:
+            advertised = None
+
+        if advertised == "all":
+            pass
+        elif advertised is not None:
+            queryset = queryset.filter(advertised=advertised)
+        else:
+            is_admin = user.is_superuser if user and user.is_authenticated else False
+            if not is_admin and user and not user.is_anonymous:
+                queryset = (queryset.filter(advertised=True) | queryset.filter(owner=user)).distinct()
+            elif not user or user.is_anonymous:
+                queryset = queryset.filter(advertised=True)
+
+        return queryset

geonode/base/api/mixins.py

@@ -29,6 +29,7 @@
 from django.contrib.auth import get_user_model
 from django.db.models.query import QuerySet
 from geonode.assets.utils import get_default_asset, is_asset_deletable
+from geonode.metadata.multilang.serializers import MultiLangOutputMixin
 from geonode.people import Roles
 from django.http import QueryDict
 from deprecated import deprecated
@@ -597,7 +598,7 @@ def to_representation(self, instance):
         return ret
 
 
-class ResourceBaseSerializer(DynamicModelSerializer):
+class ResourceBaseSerializer(MultiLangOutputMixin, DynamicModelSerializer):
     pk = serializers.CharField(read_only=True)
     uuid = serializers.CharField(read_only=True)
     resource_type = serializers.CharField(required=False)

geonode/base/api/serializers.py

@@ -19,6 +19,7 @@
 import ast
 import functools
 import json
+import logging
 import re
 import os
 
@@ -53,19 +54,29 @@
 from geonode.maps.models import Map
 from geonode.layers.models import Dataset
 from geonode.favorite.models import Favorite
-from geonode.base.models import Configuration, ExtraMetadata, LinkedResource
+from geonode.metadata.multilang.views import MultiLangViewMixin
 from geonode.thumbs.exceptions import ThumbnailError
 from geonode.thumbs.thumbnails import create_thumbnail
 from geonode.thumbs.utils import _decode_base64, BASE64_PATTERN, remove_thumb
 from geonode.groups.conf import settings as groups_settings
-from geonode.base.models import HierarchicalKeyword, Region, ResourceBase, TopicCategory, ThesaurusKeyword
+from geonode.base.models import (
+    HierarchicalKeyword,
+    Region,
+    ResourceBase,
+    TopicCategory,
+    ThesaurusKeyword,
+    Configuration,
+    ExtraMetadata,
+    LinkedResource,
+)
 from geonode.base.api.filters import (
     DynamicSearchFilter,
     ExtentFilter,
     FacetVisibleResourceFilter,
     FavoriteFilter,
     TKeywordsFilter,
     ResourceIndexFilter,
+    AdvertisedFilter,
 )
 from geonode.groups.models import GroupProfile, Group
 from geonode.security.permissions import get_compact_perms_list, PermSpec
@@ -75,13 +86,10 @@
     get_user_visible_groups,
 )
 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.base.api.mixins import AdvertisedListMixin
 from .permissions import (
     IsOwnerOrAdmin,
     IsManagerEditOrAdmin,
@@ -112,7 +120,6 @@
 from geonode.utils import get_supported_datasets_file_types
 from geonode.base.utils import patch_perms
 
-import logging
 
 logger = logging.getLogger(__name__)
 
@@ -301,7 +308,7 @@ def replace_presets(self, request):
             request.GET._mutable = False
 
 
-class ResourceBaseViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin):
+class ResourceBaseViewSet(ApiPresetsInitializer, MultiLangViewMixin, DynamicModelViewSet):
     """
     API endpoint that allows base resources to be viewed or edited.
     """
@@ -310,6 +317,7 @@ class ResourceBaseViewSet(ApiPresetsInitializer, DynamicModelViewSet, Advertised
     filter_backends = [
         TKeywordsFilter,
         ResourceIndexFilter,
+        AdvertisedFilter,
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,

geonode/base/api/views.py

@@ -27,16 +27,15 @@
 from geonode import settings
 
 from geonode.assets.utils import create_asset_and_link
-from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter
-from geonode.base.api.mixins import AdvertisedListMixin
+from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, AdvertisedFilter
 from geonode.base.api.pagination import GeoNodeApiPagination
 from geonode.base.api.permissions import UserHasPerms
+from geonode.base.api.serializers import ResourceBaseSerializer
 from geonode.base.api.views import base_linked_resources, ApiPresetsInitializer
 from geonode.base import enumerations
 from geonode.documents.api.exceptions import DocumentException
 from geonode.documents.models import Document
-
-from geonode.base.api.serializers import ResourceBaseSerializer
+from geonode.metadata.multilang.views import MultiLangViewMixin
 from geonode.resource.utils import resourcebase_post_save
 from geonode.storage.manager import StorageManager
 from geonode.resource.manager import resource_manager
@@ -50,7 +49,7 @@
 logger = logging.getLogger(__name__)
 
 
-class DocumentViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin):
+class DocumentViewSet(ApiPresetsInitializer, MultiLangViewMixin, DynamicModelViewSet):
     """
     API endpoint that allows documents to be viewed or edited.
     """
@@ -64,6 +63,7 @@ class DocumentViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedList
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,
+        AdvertisedFilter,
         ExtentFilter,
         DocumentPermissionsFilter,
     ]

geonode/documents/api/views.py

@@ -21,22 +21,24 @@
 
 from rest_framework.permissions import IsAuthenticatedOrReadOnly
 
-from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter
-from geonode.base.api.mixins import AdvertisedListMixin
+from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, AdvertisedFilter
 from geonode.base.api.pagination import GeoNodeApiPagination
 from geonode.base.api.permissions import UserHasPerms
 from geonode.base.api.views import ApiPresetsInitializer
 from geonode.geoapps.models import GeoApp
+from geonode.metadata.multilang.views import MultiLangViewMixin
+
 
 from .serializers import GeoAppSerializer
 from .permissions import GeoAppPermissionsFilter
 
 import logging
 
+
 logger = logging.getLogger(__name__)
 
 
-class GeoAppViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin):
+class GeoAppViewSet(ApiPresetsInitializer, MultiLangViewMixin, DynamicModelViewSet):
     """
     API endpoint that allows geoapps to be viewed or edited.
     """
@@ -50,6 +52,7 @@ class GeoAppViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMi
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,
+        AdvertisedFilter,
         ExtentFilter,
         GeoAppPermissionsFilter,
     ]

geonode/geoapps/api/views.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 
 from geonode.indexing.models import ResourceIndex
-import geonode.metadata.multilang as multi
+import geonode.metadata.multilang.utils as multi
 
 logger = logging.getLogger(__name__)
 

geonode/indexing/manager.py

@@ -25,15 +25,15 @@
 from rest_framework.permissions import IsAuthenticatedOrReadOnly, IsAuthenticated
 from rest_framework.response import Response
 
-from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter
-from geonode.base.api.mixins import AdvertisedListMixin
+from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, AdvertisedFilter
 from geonode.base.api.pagination import GeoNodeApiPagination
 from geonode.base.api.permissions import UserHasPerms
 from geonode.base.api.views import ApiPresetsInitializer
 from geonode.layers.api.exceptions import GeneralDatasetException, InvalidDatasetException, InvalidMetadataException
 from geonode.layers.metadata import parse_metadata
 from geonode.layers.models import Dataset
 from geonode.maps.api.serializers import SimpleMapLayerSerializer, SimpleMapSerializer
+from geonode.metadata.multilang.views import MultiLangViewMixin
 from geonode.resource.utils import update_resource
 from geonode.resource.manager import resource_manager
 from rest_framework.exceptions import NotFound
@@ -61,7 +61,7 @@
 logger = logging.getLogger(__name__)
 
 
-class DatasetViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin):
+class DatasetViewSet(ApiPresetsInitializer, MultiLangViewMixin, DynamicModelViewSet):
     """
     API endpoint that allows layers to be viewed or edited.
     """
@@ -75,6 +75,7 @@ class DatasetViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListM
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,
+        AdvertisedFilter,
         ExtentFilter,
         DatasetPermissionsFilter,
     ]

geonode/layers/api/views.py

@@ -28,8 +28,7 @@
 from rest_framework.response import Response
 
 from geonode.base import register_event
-from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter
-from geonode.base.api.mixins import AdvertisedListMixin
+from geonode.base.api.filters import DynamicSearchFilter, ExtentFilter, AdvertisedFilter
 from geonode.base.api.pagination import GeoNodeApiPagination
 from geonode.base.api.permissions import UserHasPerms
 from geonode.base.api.views import ApiPresetsInitializer
@@ -41,13 +40,14 @@
 from geonode.maps.contants import _PERMISSION_MSG_SAVE
 from geonode.maps.models import Map
 from geonode.maps.signals import map_changed_signal
+from geonode.metadata.multilang.views import MultiLangViewMixin
 from geonode.resource.manager import resource_manager
 from geonode.utils import resolve_object
 
 logger = logging.getLogger(__name__)
 
 
-class MapViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin):
+class MapViewSet(ApiPresetsInitializer, MultiLangViewMixin, DynamicModelViewSet):
     """
     API endpoint that allows maps to be viewed or edited.
     """
@@ -61,6 +61,7 @@ class MapViewSet(ApiPresetsInitializer, DynamicModelViewSet, AdvertisedListMixin
         DynamicFilterBackend,
         DynamicSortingFilter,
         DynamicSearchFilter,
+        AdvertisedFilter,
         ExtentFilter,
         MapPermissionsFilter,
     ]

geonode/maps/api/views.py

@@ -39,6 +39,7 @@
 from geonode.metadata.handlers.abstract import MetadataHandler
 from geonode.metadata.i18n import get_localized_label
 from geonode.metadata.manager import metadata_manager
+from geonode.metadata.multilang import utils as multi
 from geonode.people.utils import get_available_users
 
 logger = logging.getLogger(__name__)
@@ -66,12 +67,7 @@ def list(self, request, *args, **kwargs):
     # A pk argument is set for futured multiple schemas
     @action(detail=False, methods=["get"], url_path=r"schema(?:/(?P<pk>\d+))?", url_name="schema")
     def schema(self, request, pk=None):
-        """
-        The user is able to export her/his keys with
-        resource scope.
-        """
-
-        lang = request.query_params.get("lang", get_language_from_request(request)[:2])
+        lang = multi.get_language(request)
         schema = metadata_manager.get_schema(lang)
 
         if schema: