Merge remote-tracking branch 'origin/develop' into develop

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."""

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
@@ -329,6 +328,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 +354,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer):
             'new_image',
             'tz',
             'wine_regions',
+            'distillery_types',
         ]
 
 

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