Merge branch 'tags_filter' into develop

apps/tag/serializers.py

@@ -1,7 +1,8 @@
 """Tag serializers."""
 from rest_framework import serializers
-from establishment.models import (Establishment, EstablishmentType,
-                                  EstablishmentSubType)
+from rest_framework.fields import SerializerMethodField
+
+from establishment.models import (Establishment, EstablishmentType)
 from news.models import News, NewsType
 from tag import models
 from utils.exceptions import (ObjectAlreadyAdded, BindingObjectNotFound,
@@ -12,6 +13,9 @@ from utils.serializers import TranslatedField
 class TagBaseSerializer(serializers.ModelSerializer):
     """Serializer for model Tag."""
 
+    def get_extra_kwargs(self):
+        return super().get_extra_kwargs()
+
     label_translated = TranslatedField()
     index_name = serializers.CharField(source='value', read_only=True, allow_null=True)
 
@@ -37,6 +41,7 @@ class TagBackOfficeSerializer(TagBaseSerializer):
             'category'
         )
 
+
 class TagCategoryProductSerializer(serializers.ModelSerializer):
     """SHORT Serializer for TagCategory"""
 
@@ -57,7 +62,7 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer):
     """Serializer for model TagCategory."""
 
     label_translated = TranslatedField()
-    tags = TagBaseSerializer(many=True, read_only=True)
+    tags = SerializerMethodField()
 
     class Meta:
         """Meta class."""
@@ -70,6 +75,25 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer):
             'tags',
         )
 
+    def get_tags(self, obj):
+        query_params = dict(self.context['request'].query_params)
+
+        if len(query_params) > 1:
+            return []
+
+        params = {}
+        if 'establishment_type' in query_params:
+            params = {
+                'establishments__isnull': False,
+            }
+        elif 'product_type' in query_params:
+            params = {
+                'products__isnull': False,
+            }
+
+        tags = obj.tags.filter(**params).distinct()
+        return TagBaseSerializer(instance=tags, many=True, read_only=True).data
+
 
 class TagCategoryShortSerializer(serializers.ModelSerializer):
     """Serializer for model TagCategory."""

fabfile.py

@@ -54,7 +54,7 @@ def collectstatic():
 
 def deploy(branch=None):
     role = env.roles[0]
-    if env.roledefs[role]['branch'] != 'develop':
+    if env.roledefs[role]['branch'] == 'develop':
         fetch()
         install_requirements()
         migrate()

make_data_migration.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ./manage.py transfer -a
-#./manage.py transfer -d
+./manage.py transfer -d
 ./manage.py transfer -e
 ./manage.py transfer --fill_city_gallery
 ./manage.py transfer -l