From b2f3e1f96be2ca261cb53b245c001180e948a5a9 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 13 Jan 2020 11:50:54 +0300 Subject: [PATCH] added field - "distillery_types" in establishment list, detail and similar list view --- apps/establishment/models.py | 5 +++++ apps/establishment/serializers/common.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index e4087b4b..c10be29d 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -854,6 +854,11 @@ class Establishment(GalleryMixin, ProjectBaseMixin, URLImageMixin, metadata.append(category_tags) return metadata + @property + def distillery_types(self): + """Tags from tag category - distillery_type.""" + return self.tags.filter(category__index_name='distillery_type') + class EstablishmentNoteQuerySet(models.QuerySet): """QuerySet for model EstablishmentNote.""" diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index deabd100..8d0c8103 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -329,6 +329,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): read_only=True) tz = serializers.CharField(read_only=True, source='timezone_as_str') new_image = ImageBaseSerializer(source='crop_main_image', allow_null=True, read_only=True) + distillery_types = TagBaseSerializer(read_only=True, many=True, allow_null=True) class Meta: """Meta class.""" @@ -354,6 +355,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): 'new_image', 'tz', 'wine_regions', + 'distillery_types', ]