From d1572cbb56582ebe58eee651cf73bf1737f2bdd0 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 13 Jan 2020 11:25:22 +0300 Subject: [PATCH 1/3] rm publish filter from BO establishment api --- apps/establishment/views/back.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py index a195e31a..19a75fd5 100644 --- a/apps/establishment/views/back.py +++ b/apps/establishment/views/back.py @@ -19,7 +19,7 @@ class EstablishmentMixinViews: def get_queryset(self): """Overrided method 'get_queryset'.""" - return models.Establishment.objects.published().with_base_related() + return models.Establishment.objects.with_base_related() class EstablishmentListCreateView(EstablishmentMixinViews, generics.ListCreateAPIView): From b2f3e1f96be2ca261cb53b245c001180e948a5a9 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 13 Jan 2020 11:50:54 +0300 Subject: [PATCH 2/3] 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', ] From d6345f27e2bf05596dac84c7f171b673729590d7 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 13 Jan 2020 11:56:04 +0300 Subject: [PATCH 3/3] establishment menu currency id --- apps/establishment/serializers/common.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 8d0c8103..ada87016 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -54,7 +54,6 @@ class SocialNetworkRelatedSerializers(serializers.ModelSerializer): class PlateSerializer(ProjectModelSerializer): name_translated = TranslatedField() - currency = CurrencySerializer(read_only=True) class Meta: model = models.Plate