Merge branch 'develop' into feature/profile

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):

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(

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):

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')