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

Add wine_region and wine_sub_region to ES

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

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

@ -64,7 +64,10 @@ class ProductDocument(Document):
# 'coordinates': fields.GeoPointField(), # 'coordinates': fields.GeoPointField(),
'description': fields.ObjectField(attr='description_indexing', properties=OBJECT_FIELD_PROPERTIES), 'description': fields.ObjectField(attr='description_indexing', properties=OBJECT_FIELD_PROPERTIES),
}) })
wine_sub_region = fields.ObjectField(properties={'name': fields.KeywordField()}) wine_sub_region = fields.ObjectField(properties={
'id': fields.IntegerField(),
'name': fields.KeywordField(),
})
classifications = fields.ObjectField( # TODO classifications = fields.ObjectField( # TODO
properties={ properties={
'classification_type': fields.ObjectField(properties={}), 'classification_type': fields.ObjectField(properties={}),

34
apps/search_indexes/views.py
View File

@ -197,21 +197,13 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
"""Product document ViewSet.""" """Product document ViewSet."""
document = ProductDocument document = ProductDocument
# lookup_field = 'slug'
pagination_class = ProjectMobilePagination pagination_class = ProjectMobilePagination
permission_classes = (permissions.AllowAny,) permission_classes = (permissions.AllowAny,)
serializer_class = serializers.ProductDocumentSerializer serializer_class = serializers.ProductDocumentSerializer
# def get_queryset(self):
# qs = super(ProductDocumentViewSet, self).get_queryset()
# qs = qs.filter('match', is_publish=True)
# return qs
filter_backends = [ filter_backends = [
FilteringFilterBackend, FilteringFilterBackend,
filters.CustomSearchFilterBackend, filters.CustomSearchFilterBackend,
# GeoSpatialFilteringFilterBackend,
# DefaultOrderingFilterBackend,
] ]
search_fields = { search_fields = {
@ -234,14 +226,28 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
'slug': 'slug', 'slug': 'slug',
'tags_id': { 'tags_id': {
'field': 'tags.id', 'field': 'tags.id',
'lookups': [constants.LOOKUP_QUERY_IN] 'lookups': [constants.LOOKUP_QUERY_IN],
}, },
'wine_colors_id': { 'wine_colors_id': {
'field': 'wine_colors.id', 'field': 'wine_colors.id',
'lookups': [ 'lookups': [
constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_IN,
constants.LOOKUP_QUERY_EXCLUDE, constants.LOOKUP_QUERY_EXCLUDE,
] ],
},
'wine_region_id': {
'field': 'wine_region.id',
'lookups': [
constants.LOOKUP_QUERY_IN,
constants.LOOKUP_QUERY_EXCLUDE,
],
},
'wine_sub_region_id': {
'field': 'wine_sub_region_id',
'lookups': [
constants.LOOKUP_QUERY_IN,
constants.LOOKUP_QUERY_EXCLUDE,
],
}, },
'grape_variety_id': { 'grape_variety_id': {
'field': 'grape_variety.id', 'field': 'grape_variety.id',
@ -264,8 +270,6 @@ class ProductDocumentViewSet(BaseDocumentViewSet):
'lookups': [ 'lookups': [
constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_IN,
constants.LOOKUP_QUERY_EXCLUDE, constants.LOOKUP_QUERY_EXCLUDE,
] ],
} },
} }
# geo_spatial_filter_fields = {
# }