From 2ebe6e60a3b873b016871ea47c5fe60951c20ded Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 22 Nov 2019 13:54:07 +0300 Subject: [PATCH 1/3] Facet with tags id instead of text values --- apps/search_indexes/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index b5bda947..d6a2938a 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -31,7 +31,7 @@ class NewsDocumentViewSet(BaseDocumentViewSet): faceted_search_fields = { 'tag': { - 'field': 'tags.value', + 'field': 'tags.id', 'enabled': True, 'facet': TermsFacet, }, @@ -122,7 +122,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): 'enabled': True, }, 'tag': { - 'field': 'tags.value', + 'field': 'tags.id', 'facet': TermsFacet, 'enabled': True, }, From 0231f9770994bed8dab33972c28281e8e70b6f19 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 22 Nov 2019 14:27:40 +0300 Subject: [PATCH 2/3] Establishment facet visibble tags only (cherry picked from commit 59f44d8) --- apps/search_indexes/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index d6a2938a..e37d19b3 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -122,7 +122,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): 'enabled': True, }, 'tag': { - 'field': 'tags.id', + 'field': 'visible_tags.id', 'facet': TermsFacet, 'enabled': True, }, From 120e686be65364db77a86b48933e588de60a7a09 Mon Sep 17 00:00:00 2001 From: Semyon Yekhmenin Date: Fri, 22 Nov 2019 11:46:24 +0000 Subject: [PATCH 3/3] Changed in_favorites field to read only --- apps/news/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/news/serializers.py b/apps/news/serializers.py index 2264b9ec..c96d05da 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -65,7 +65,7 @@ class NewsBaseSerializer(ProjectModelSerializer): subtitle_translated = TranslatedField() news_type = NewsTypeSerializer(read_only=True) tags = TagBaseSerializer(read_only=True, many=True, source='visible_tags') - in_favorites = serializers.BooleanField(allow_null=True) + in_favorites = serializers.BooleanField(allow_null=True, read_only=True) view_counter = serializers.IntegerField(read_only=True) class Meta: