From 54db050f03e210b2db0901197d58e60ab6001ce3 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 13 Dec 2019 13:23:49 +0300 Subject: [PATCH] return tags_id__in --- apps/search_indexes/views.py | 21 +++------------------ apps/tag/serializers.py | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index e567f212..cb5b448c 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -12,24 +12,9 @@ from search_indexes import serializers, filters, utils from search_indexes.documents import EstablishmentDocument, NewsDocument from search_indexes.documents.product import ProductDocument from utils.pagination import ESDocumentPagination -from tag.models import TagCategory -class CustomBaseDocumentViewSet(BaseDocumentViewSet): - def __init__(self, *args, **kwargs): - if self.filter_fields: - for name in TagCategory.objects.all().values('index_name'): - self.filter_fields.update({ - f'{name["index_name"]}_id': { - 'field': 'tags.id', - 'lookups': [constants.LOOKUP_QUERY_IN] - } - }) - - super().__init__(*args, **kwargs) - - -class NewsDocumentViewSet(CustomBaseDocumentViewSet): +class NewsDocumentViewSet(BaseDocumentViewSet): """News document ViewSet.""" document = NewsDocument @@ -108,7 +93,7 @@ class MobileNewsDocumentViewSet(NewsDocumentViewSet): ] -class EstablishmentDocumentViewSet(CustomBaseDocumentViewSet): +class EstablishmentDocumentViewSet(BaseDocumentViewSet): """Establishment document ViewSet.""" document = EstablishmentDocument @@ -333,7 +318,7 @@ class MobileEstablishmentDocumentViewSet(EstablishmentDocumentViewSet): ] -class ProductDocumentViewSet(CustomBaseDocumentViewSet): +class ProductDocumentViewSet(BaseDocumentViewSet): """Product document ViewSet.""" document = ProductDocument diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index c842774b..f6266060 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -123,7 +123,7 @@ class FiltersTagCategoryBaseSerializer(serializers.ModelSerializer): return obj in ['open_now', ] def get_param_name(self, obj): - return f'{obj.index_name}_id__in' + return 'tags_id__in' def get_fields(self, *args, **kwargs): fields = super(FiltersTagCategoryBaseSerializer, self).get_fields()