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

Optimize indexing request

Browse Source
This commit is contained in:
Kuroshini 2019-10-16 14:11:07 +03:00
parent a91ba7e6f3
commit 9dae8832cd
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/product/models.py
View File

@ -78,6 +78,12 @@ class ProductQuerySet(models.QuerySet):
return self.select_related('product_type', 'establishment') \ return self.select_related('product_type', 'establishment') \
.prefetch_related('product_type__subtypes') .prefetch_related('product_type__subtypes')
def with_es_related(self):
"""Returns qs with related for ES indexing."""
return self.with_base_related().prefetch_related('tags', 'classifications', 'classifications__tags',
'classifications__type', 'classifications_standard',
'standards').select_related('wine_region', 'wine_sub_region')
def common(self): def common(self):
return self.filter(category=self.model.COMMON) return self.filter(category=self.model.COMMON)

26
apps/search_indexes/documents/product.py
View File

@ -51,18 +51,6 @@ class ProductDocument(Document):
properties={ properties={
'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES), 'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES),
'value': fields.KeywordField(), 'value': fields.KeywordField(),
'category': fields.ObjectField(properties={
'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES),
'public': fields.BooleanField(),
'index_name': fields.KeywordField(),
'value_type': fields.KeywordField(),
'country': fields.ObjectField(properties={
'id': fields.IntegerField(),
'name': fields.ObjectField(attr='name_indexing',
properties=OBJECT_FIELD_PROPERTIES),
'code': fields.KeywordField(),
}),
}),
}, },
multi=True multi=True
), ),
@ -85,18 +73,6 @@ class ProductDocument(Document):
properties={ properties={
'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES), 'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES),
'value': fields.KeywordField(), 'value': fields.KeywordField(),
'category': fields.ObjectField(properties={
'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES),
'public': fields.BooleanField(),
'index_name': fields.KeywordField(),
'value_type': fields.KeywordField(),
'country': fields.ObjectField(properties={
'id': fields.IntegerField(),
'name': fields.ObjectField(attr='name_indexing',
properties=OBJECT_FIELD_PROPERTIES),
'code': fields.KeywordField(),
}),
}),
}, },
multi=True multi=True
) )
@ -118,4 +94,4 @@ class ProductDocument(Document):
related_models = [models.ProductType] related_models = [models.ProductType]
def get_queryset(self): def get_queryset(self):
return super().get_queryset().published().with_base_related() return super().get_queryset().published().with_es_related()