phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/roles

Browse Source
This commit is contained in:
Виктор Гладких 2019-10-10 16:01:33 +03:00
commit caf11ed372
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/establishment/models.py
View File

@ -11,7 +11,6 @@ from django.db import models
from django.db.models import When, Case, F, ExpressionWrapper, Subquery, Q from django.db.models import When, Case, F, ExpressionWrapper, Subquery, Q
from django.utils import timezone from django.utils import timezone
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from elasticsearch_dsl import Q
from phonenumber_field.modelfields import PhoneNumberField from phonenumber_field.modelfields import PhoneNumberField
from collection.models import Collection from collection.models import Collection
@ -99,15 +98,15 @@ class EstablishmentQuerySet(models.QuerySet):
else: else:
return self.none() return self.none()
def es_search(self, value, locale=None): # def es_search(self, value, locale=None):
"""Search text via ElasticSearch.""" # """Search text via ElasticSearch."""
from search_indexes.documents import EstablishmentDocument # from search_indexes.documents import EstablishmentDocument
search = EstablishmentDocument.search().filter( # search = EstablishmentDocument.search().filter(
Q('match', name=value) | # Elastic_Q('match', name=value) |
Q('match', **{f'description.{locale}': value}) # Elastic_Q('match', **{f'description.{locale}': value})
).execute() # ).execute()
ids = [result.meta.id for result in search] # ids = [result.meta.id for result in search]
return self.filter(id__in=ids) # return self.filter(id__in=ids)
def by_country_code(self, code): def by_country_code(self, code):
"""Return establishments by country code""" """Return establishments by country code"""