From 7590a73c5de31145658c6c114a8bce8ab91ad2b7 Mon Sep 17 00:00:00 2001
From: alex <birukov.system@gmail.com>
Date: Wed, 4 Dec 2019 09:23:21 +0300
Subject: [PATCH] tags fix mtm

---
 apps/tag/models.py      |  2 +-
 apps/tag/serializers.py | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/tag/models.py b/apps/tag/models.py
index 12517815..b718d83c 100644
--- a/apps/tag/models.py
+++ b/apps/tag/models.py
@@ -47,7 +47,7 @@ class Tag(TranslatedFieldsMixin, models.Model):
     old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None)
 
     old_id_meta_product = models.PositiveIntegerField(_('old id metadata product'),
-                                                    blank=True, null=True, default=None)
+                                                      blank=True, null=True, default=None)
 
     objects = TagQuerySet.as_manager()
 
diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py
index 5b6f390c..eb73291f 100644
--- a/apps/tag/serializers.py
+++ b/apps/tag/serializers.py
@@ -2,11 +2,9 @@
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
 
-from establishment.models import (Establishment, EstablishmentType,
-                                  EstablishmentSubType)
+from establishment.models import (Establishment, EstablishmentType)
 from news.models import News, NewsType
 from tag import models
-from tag.models import Tag
 from utils.exceptions import (ObjectAlreadyAdded, BindingObjectNotFound,
                               RemovedBindingObjectNotFound)
 from utils.serializers import TranslatedField
@@ -79,18 +77,21 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer):
 
     def get_tags(self, obj):
         query_params = dict(self.context['request'].query_params)
+
         if len(query_params) > 1:
-            return None
-
-        tags = Tag.objects.all()
+            return []
 
+        params = {}
         if 'establishment_type' in query_params:
-            types = query_params['establishment_type']
-            tags = tags.filter(establishments__establishment_type__index_name__in=types).distinct()
+            params = {
+                'establishments__isnull': False,
+            }
         elif 'product_type' in query_params:
-            types = query_params['product_type']
-            tags = tags.filter(products__product_type__index_name__in=types).distinct()
+            params = {
+                'products__isnull': False,
+            }
 
+        tags = obj.tags.filter(**params).distinct()
         return TagBaseSerializer(instance=tags, many=True, read_only=True).data