From b958e0b5977572b003861632e85743730a413878 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 27 Dec 2019 11:16:38 +0300 Subject: [PATCH 1/6] preview_image fix --- apps/utils/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/utils/models.py b/apps/utils/models.py index ad74f819..e3faed4e 100644 --- a/apps/utils/models.py +++ b/apps/utils/models.py @@ -474,4 +474,4 @@ class TypeDefaultImageMixin: @property def preview_image_url(self): if hasattr(self, 'default_image') and self.default_image: - return self.default_image.image.get_image_url(thumbnail_key='type_preview') + return self.default_image.get_image_url(thumbnail_key='type_preview') From 32ae1856b6bcd3586229c9a7e43b391d43499888 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 27 Dec 2019 12:42:45 +0300 Subject: [PATCH 2/6] preview_image to establishment and product type and subtype --- apps/search_indexes/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 9e01e085..be0d517d 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -28,7 +28,7 @@ class EstablishmentTypeSerializer(serializers.Serializer): name_translated = serializers.SerializerMethodField() index_name = serializers.CharField() default_image = serializers.CharField() - preview_image = serializers.CharField() + preview_image_url = serializers.CharField() def get_name_translated(self, obj): if isinstance(obj, dict): @@ -42,7 +42,7 @@ class ProductSubtypeDocumentSerializer(serializers.Serializer): id = serializers.IntegerField() name_translated = serializers.SerializerMethodField() default_image = serializers.CharField() - preview_image = serializers.CharField() + preview_image_url = serializers.CharField() def get_name_translated(self, obj): if isinstance(obj, dict): @@ -107,7 +107,7 @@ class ProductTypeSerializer(serializers.Serializer): index_name = serializers.CharField() name_translated = serializers.SerializerMethodField() default_image = serializers.CharField() - preview_image = serializers.CharField() + preview_image_url = serializers.CharField() @staticmethod def get_name_translated(obj): From ae486d81fa2d06841f970014a49425778304c2c9 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 27 Dec 2019 14:32:09 +0300 Subject: [PATCH 3/6] city filter for establishment --- apps/establishment/filters.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/establishment/filters.py b/apps/establishment/filters.py index db419989..6dd70222 100644 --- a/apps/establishment/filters.py +++ b/apps/establishment/filters.py @@ -13,6 +13,8 @@ class EstablishmentFilter(filters.FilterSet): search = filters.CharFilter(method='search_text') type = filters.CharFilter(method='by_type') subtype = filters.CharFilter(method='by_subtype') + city_id = filters.CharFilter(field_name='address__city__id') + city_name = filters.CharFilter(field_name='address__city__name') class Meta: """Meta class.""" @@ -24,6 +26,8 @@ class EstablishmentFilter(filters.FilterSet): 'search', 'type', 'subtype', + 'city_id', + 'city_name', ) def search_text(self, queryset, name, value): From 57be30fa0eff2af37ece171713a3f66b356b6319 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 27 Dec 2019 14:49:35 +0300 Subject: [PATCH 4/6] fix es establishments serializer --- apps/search_indexes/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index be0d517d..4769fb40 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -28,7 +28,7 @@ class EstablishmentTypeSerializer(serializers.Serializer): name_translated = serializers.SerializerMethodField() index_name = serializers.CharField() default_image = serializers.CharField() - preview_image_url = serializers.CharField() + preview_image = serializers.CharField() def get_name_translated(self, obj): if isinstance(obj, dict): From bc6107bcfc9c0d6a14448032c4eab285453406ee Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 27 Dec 2019 15:43:28 +0300 Subject: [PATCH 5/6] preview_image to establishment and product type and subtype --- apps/search_indexes/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 4769fb40..be0d517d 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -28,7 +28,7 @@ class EstablishmentTypeSerializer(serializers.Serializer): name_translated = serializers.SerializerMethodField() index_name = serializers.CharField() default_image = serializers.CharField() - preview_image = serializers.CharField() + preview_image_url = serializers.CharField() def get_name_translated(self, obj): if isinstance(obj, dict): From 57c7f0dcdf153221de6d8da144f224b83671ec90 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 27 Dec 2019 15:56:37 +0300 Subject: [PATCH 6/6] fix ES --- apps/search_indexes/documents/establishment.py | 4 ++-- apps/search_indexes/serializers.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index 1de349a3..3c9dfc23 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -24,7 +24,7 @@ class EstablishmentDocument(Document): properties=OBJECT_FIELD_PROPERTIES), 'index_name': fields.KeywordField(attr='index_name'), 'default_image': fields.KeywordField(attr='default_image_url'), - 'preview_image': fields.KeywordField(attr='preview_image_url'), + 'preview_image_url': fields.KeywordField(), }) establishment_subtypes = fields.ObjectField( properties={ @@ -32,7 +32,7 @@ class EstablishmentDocument(Document): 'name': fields.ObjectField(attr='name_indexing'), 'index_name': fields.KeywordField(attr='index_name'), 'default_image': fields.KeywordField(attr='default_image_url'), - 'preview_image': fields.KeywordField(attr='preview_image_url'), + 'preview_image_url': fields.KeywordField(), }, multi=True) works_evening = fields.ListField(fields.IntegerField( diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 4769fb40..be0d517d 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -28,7 +28,7 @@ class EstablishmentTypeSerializer(serializers.Serializer): name_translated = serializers.SerializerMethodField() index_name = serializers.CharField() default_image = serializers.CharField() - preview_image = serializers.CharField() + preview_image_url = serializers.CharField() def get_name_translated(self, obj): if isinstance(obj, dict):