diff --git a/project/dalia/query/items/basic_search_filters/basic_search_filters.py b/project/dalia/query/items/basic_search_filters/basic_search_filters.py index 15d15a89cb56b494404730fbe16e38ec5d93e96a..b852155ffc8c6194573abe7fce801155c9146243 100644 --- a/project/dalia/query/items/basic_search_filters/basic_search_filters.py +++ b/project/dalia/query/items/basic_search_filters/basic_search_filters.py @@ -16,7 +16,7 @@ from project.dalia.query.utils import query_dalia_dataset from project.dalia.query_builder.query_builder import QueryBuilder from project.dalia.rdf.namespace import educor -_BASIC_SEARCH_FILTER_FACETS = [ +BASIC_SEARCH_FILTER_FACETS = [ TARGET_AUDIENCE_FACET, PROFICIENCY_LEVEL_FACET, MEDIA_TYPE_FACET, @@ -28,7 +28,7 @@ _BASIC_SEARCH_FILTER_FACETS = [ # data for endpoint /basic-search-filters def get_basic_search_filters() -> List[BasicSearchFilter]: # TODO: These calls could be parallelized, because they end up in blocking SPARQL queries - return [get_basic_search_filters_for_facet(facet) for facet in _BASIC_SEARCH_FILTER_FACETS] + return [get_basic_search_filters_for_facet(facet) for facet in BASIC_SEARCH_FILTER_FACETS] def get_basic_search_filters_for_facet(facet: FacetObject) -> BasicSearchFilter: diff --git a/project/dalia/query/items/search/text_search.py b/project/dalia/query/items/search/text_search.py index d8a5bc9150dc279a65125d30cdb06f441ad880b2..67af82f73c7935fc19d23a6e346b60b402eebf3c 100644 --- a/project/dalia/query/items/search/text_search.py +++ b/project/dalia/query/items/search/text_search.py @@ -4,15 +4,9 @@ from rdflib import URIRef, Variable from rdflib.term import Node from project.dalia.api_models.api_models import ItemSearchRequest, ItemSearchResult +from project.dalia.query.items.basic_search_filters.basic_search_filters import BASIC_SEARCH_FILTER_FACETS from project.dalia.query.items.facets.active_facets_extraction import extract_active_facets_from_selected_facets -from project.dalia.query.items.facets.facet_objects import ( - FacetObject, - LANGUAGE_FACET, - LEARNING_RESOURCE_TYPE_FACET, - MEDIA_TYPE_FACET, - PROFICIENCY_LEVEL_FACET, - TARGET_AUDIENCE_FACET, -) +from project.dalia.query.items.facets.facet_objects import FacetObject from project.dalia.query.items.metadata.items import get_metadata_for_learning_resources from project.dalia.query.items.search.count import count_results from project.dalia.query.items.search.facets_compilation import compile_facets_for_text_search @@ -21,13 +15,7 @@ from project.dalia.query.utils import query_dalia_dataset from project.dalia.query_builder.query_builder import FunctionExpressions, QueryBuilder from project.dalia.rdf.namespace.xpath_functions import day_from_date, month_from_date, year_from_date -_ITEM_SEARCH_FACETS = [ - TARGET_AUDIENCE_FACET, - PROFICIENCY_LEVEL_FACET, - MEDIA_TYPE_FACET, - LEARNING_RESOURCE_TYPE_FACET, - LANGUAGE_FACET, -] +_ITEM_SEARCH_FACETS = BASIC_SEARCH_FILTER_FACETS _ITEM_SEARCH_FACETS_MAPPED_BY_KEY = {facet.key: facet for facet in _ITEM_SEARCH_FACETS}