OpenConceptLab/ocl_issues#2174 | fixing test

Author: snyaggarwal

core/common/models.py

@@ -1172,14 +1172,14 @@ def _get_distribution(queryset, field):
 
     def get_concept_facets(self, filters=None):
         from core.concepts.search import ConceptFacetedSearch
-        return self._get_resource_facets(ConceptFacetedSearch, filters)
+        return self._get_resource_facets(ConceptFacetedSearch, filters, source=self)
 
     def get_mapping_facets(self, filters=None):
         from core.mappings.search import MappingFacetedSearch
         return self._get_resource_facets(MappingFacetedSearch, filters)
 
-    def _get_resource_facets(self, facet_class, filters=None):
-        search = facet_class('', filters=self._get_resource_facet_filters(filters))
+    def _get_resource_facets(self, facet_class, filters=None, **kwargs):
+        search = facet_class(query='', filters=self._get_resource_facet_filters(filters), **kwargs)
         search.params(request_timeout=ES_REQUEST_TIMEOUT)
         try:
             facets = search.execute().facets

core/concepts/search.py

@@ -1,5 +1,5 @@
 from elasticsearch_dsl import TermsFacet, Q
-from pydash import flatten, is_number
+from pydash import flatten, is_number, get
 
 from core.common.constants import FACET_SIZE
 from core.common.search import CustomESFacetedSearch, CustomESSearch
@@ -49,7 +49,7 @@ def __init__(self, source=None, **kwargs):
     def build_property_facets_from_source(source):
         return {
             f"properties__{prop['code']}": TermsFacet(field=f"properties.{prop['code']}.keyword", size=FACET_SIZE)
-            for prop in (source.properties_to_include_in_concept_summary or [])
+            for prop in (get(source, 'properties_to_include_in_concept_summary') or [])
         }