Skip to content
Snippets Groups Projects
Commit c00a1e92 authored by Frank Lange's avatar Frank Lange
Browse files

refer to one and the same list of facets for basic search filters and item search facets

parent b66dca11
Branches dev
No related tags found
No related merge requests found
Pipeline #1656305 passed
...@@ -16,7 +16,7 @@ from project.dalia.query.utils import query_dalia_dataset ...@@ -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.query_builder.query_builder import QueryBuilder
from project.dalia.rdf.namespace import educor from project.dalia.rdf.namespace import educor
_BASIC_SEARCH_FILTER_FACETS = [ BASIC_SEARCH_FILTER_FACETS = [
TARGET_AUDIENCE_FACET, TARGET_AUDIENCE_FACET,
PROFICIENCY_LEVEL_FACET, PROFICIENCY_LEVEL_FACET,
MEDIA_TYPE_FACET, MEDIA_TYPE_FACET,
...@@ -28,7 +28,7 @@ _BASIC_SEARCH_FILTER_FACETS = [ ...@@ -28,7 +28,7 @@ _BASIC_SEARCH_FILTER_FACETS = [
# data for endpoint /basic-search-filters # data for endpoint /basic-search-filters
def get_basic_search_filters() -> List[BasicSearchFilter]: def get_basic_search_filters() -> List[BasicSearchFilter]:
# TODO: These calls could be parallelized, because they end up in blocking SPARQL queries # 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: def get_basic_search_filters_for_facet(facet: FacetObject) -> BasicSearchFilter:
......
...@@ -4,15 +4,9 @@ from rdflib import URIRef, Variable ...@@ -4,15 +4,9 @@ from rdflib import URIRef, Variable
from rdflib.term import Node from rdflib.term import Node
from project.dalia.api_models.api_models import ItemSearchRequest, ItemSearchResult 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.active_facets_extraction import extract_active_facets_from_selected_facets
from project.dalia.query.items.facets.facet_objects import ( from project.dalia.query.items.facets.facet_objects import FacetObject
FacetObject,
LANGUAGE_FACET,
LEARNING_RESOURCE_TYPE_FACET,
MEDIA_TYPE_FACET,
PROFICIENCY_LEVEL_FACET,
TARGET_AUDIENCE_FACET,
)
from project.dalia.query.items.metadata.items import get_metadata_for_learning_resources 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.count import count_results
from project.dalia.query.items.search.facets_compilation import compile_facets_for_text_search 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 ...@@ -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.query_builder.query_builder import FunctionExpressions, QueryBuilder
from project.dalia.rdf.namespace.xpath_functions import day_from_date, month_from_date, year_from_date from project.dalia.rdf.namespace.xpath_functions import day_from_date, month_from_date, year_from_date
_ITEM_SEARCH_FACETS = [ _ITEM_SEARCH_FACETS = BASIC_SEARCH_FILTER_FACETS
TARGET_AUDIENCE_FACET,
PROFICIENCY_LEVEL_FACET,
MEDIA_TYPE_FACET,
LEARNING_RESOURCE_TYPE_FACET,
LANGUAGE_FACET,
]
_ITEM_SEARCH_FACETS_MAPPED_BY_KEY = {facet.key: facet for facet in _ITEM_SEARCH_FACETS} _ITEM_SEARCH_FACETS_MAPPED_BY_KEY = {facet.key: facet for facet in _ITEM_SEARCH_FACETS}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment