phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/profile

Browse Source
This commit is contained in:
Виктор Гладких 2019-12-27 16:35:57 +03:00
commit ab5bb5c190
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/establishment/filters.py
View File

@ -13,6 +13,8 @@ class EstablishmentFilter(filters.FilterSet):
search = filters.CharFilter(method='search_text') search = filters.CharFilter(method='search_text')
type = filters.CharFilter(method='by_type') type = filters.CharFilter(method='by_type')
subtype = filters.CharFilter(method='by_subtype') 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: class Meta:
"""Meta class.""" """Meta class."""
@ -24,6 +26,8 @@ class EstablishmentFilter(filters.FilterSet):
'search', 'search',
'type', 'type',
'subtype', 'subtype',
'city_id',
'city_name',
) )
def search_text(self, queryset, name, value): def search_text(self, queryset, name, value):

4
apps/search_indexes/documents/establishment.py
View File

@ -24,7 +24,7 @@ class EstablishmentDocument(Document):
properties=OBJECT_FIELD_PROPERTIES), properties=OBJECT_FIELD_PROPERTIES),
'index_name': fields.KeywordField(attr='index_name'), 'index_name': fields.KeywordField(attr='index_name'),
'default_image': fields.KeywordField(attr='default_image_url'), '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( establishment_subtypes = fields.ObjectField(
properties={ properties={
@ -32,7 +32,7 @@ class EstablishmentDocument(Document):
'name': fields.ObjectField(attr='name_indexing'), 'name': fields.ObjectField(attr='name_indexing'),
'index_name': fields.KeywordField(attr='index_name'), 'index_name': fields.KeywordField(attr='index_name'),
'default_image': fields.KeywordField(attr='default_image_url'), 'default_image': fields.KeywordField(attr='default_image_url'),
'preview_image': fields.KeywordField(attr='preview_image_url'), 'preview_image_url': fields.KeywordField(),
}, },
multi=True) multi=True)
works_evening = fields.ListField(fields.IntegerField( works_evening = fields.ListField(fields.IntegerField(

6
apps/search_indexes/serializers.py
View File

@ -28,7 +28,7 @@ class EstablishmentTypeSerializer(serializers.Serializer):
name_translated = serializers.SerializerMethodField() name_translated = serializers.SerializerMethodField()
index_name = serializers.CharField() index_name = serializers.CharField()
default_image = serializers.CharField() default_image = serializers.CharField()
preview_image = serializers.CharField() preview_image_url = serializers.CharField()
def get_name_translated(self, obj): def get_name_translated(self, obj):
if isinstance(obj, dict): if isinstance(obj, dict):
@ -42,7 +42,7 @@ class ProductSubtypeDocumentSerializer(serializers.Serializer):
id = serializers.IntegerField() id = serializers.IntegerField()
name_translated = serializers.SerializerMethodField() name_translated = serializers.SerializerMethodField()
default_image = serializers.CharField() default_image = serializers.CharField()
preview_image = serializers.CharField() preview_image_url = serializers.CharField()
def get_name_translated(self, obj): def get_name_translated(self, obj):
if isinstance(obj, dict): if isinstance(obj, dict):
@ -107,7 +107,7 @@ class ProductTypeSerializer(serializers.Serializer):
index_name = serializers.CharField() index_name = serializers.CharField()
name_translated = serializers.SerializerMethodField() name_translated = serializers.SerializerMethodField()
default_image = serializers.CharField() default_image = serializers.CharField()
preview_image = serializers.CharField() preview_image_url = serializers.CharField()
@staticmethod @staticmethod
def get_name_translated(obj): def get_name_translated(obj):

2
apps/utils/models.py
View File

@ -474,4 +474,4 @@ class TypeDefaultImageMixin:
@property @property
def preview_image_url(self): def preview_image_url(self):
if hasattr(self, 'default_image') and self.default_image: 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')