Skip to content

fix: filters affected by mapping inheritance issue #2121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 27, 2023
Merged

fix: filters affected by mapping inheritance issue #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9893b84
fix inheritance issue
allisonsuarez Mar 21, 2023
f3b45ce
bump search package version
allisonsuarez Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions search/search_service/proxy/es_proxy_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,39 +92,39 @@ class ElasticsearchProxyV2():
Resource.USER: USER_MAPPING,
}

MUST_FIELDS_TABLE = ["name^3",
"name.raw^3",
"schema^2",
"description",
"column_names",
"badges"]

MUST_FIELDS_DASHBOARD = ["name.raw^75",
"name^7",
"group_name.raw^15",
"group_name^7",
"description^3",
"query_names^3",
"chart_names^2"]

MUST_FIELDS_FEATURE = ["feature_name.raw^25",
"feature_name^7",
"feature_group.raw^15",
"feature_group^7",
"version^7",
"description^3",
"status",
"entity",
"tags",
"badges"]

MUST_FIELDS_USER = ["full_name.raw^30",
"full_name^5",
"first_name.raw^5",
"last_name.raw^5",
"first_name^3",
"last_name^3",
"email^3"]
MUST_FIELDS_TABLE = ['name^3',
'name.raw^3',
'schema^2',
'description',
'column_names',
'badges']

MUST_FIELDS_DASHBOARD = ['name.raw^75',
'name^7',
'group_name.raw^15',
'group_name^7',
'description^3',
'query_names^3',
'chart_names^2']

MUST_FIELDS_FEATURE = ['feature_name.raw^25',
'feature_name^7',
'feature_group.raw^15',
'feature_group^7',
'version^7',
'description^3',
'status',
'entity',
'tags',
'badges']

MUST_FIELDS_USER = ['full_name.raw^30',
'full_name^5',
'first_name.raw^5',
'last_name.raw^5',
'first_name^3',
'last_name^3',
'email^3']

def __init__(self, *,
host: str = None,
Expand Down Expand Up @@ -169,7 +169,7 @@ def _get_must_fields(self, resource: Resource) -> List[str]:

def get_index_alias_for_resource(self, resource_type: Resource) -> str:
resource_str = resource_type.name.lower()
return f"{resource_str}_search_index"
return f'{resource_str}_search_index'

def _build_must_query(self, resource: Resource, query_term: str) -> List[Q]:
"""
Expand All @@ -184,7 +184,7 @@ def _build_must_query(self, resource: Resource, query_term: str) -> List[Q]:
fields: List[str] = self._get_must_fields(resource)
except KeyError:
# TODO if you don't specify a resource match for all generic fields in the future
raise ValueError(f"no fields defined for resource {resource}")
raise ValueError(f'no fields defined for resource {resource}')

return [MultiMatch(query=query_term, fields=fields, type='cross_fields')]

Expand All @@ -196,7 +196,7 @@ def _build_filters(self, resource: Resource, filters: List[Filter]) -> List:
"""
Builds the query object for all of the filters given in the search request
"""
mapping = self.RESOURCE_TO_MAPPING.get(resource)
mapping = type(self).RESOURCE_TO_MAPPING.get(resource)

filter_queries: List = []

Expand All @@ -215,10 +215,10 @@ def _build_filters(self, resource: Resource, filters: List[Filter]) -> List:
filter_queries.append(q)

else:
msg = f"Invalid operation {filter.operation} for filter {filter_name} with values {filter.values}"
msg = f'Invalid operation {filter.operation} for filter {filter_name} with values {filter.values}'
raise ValueError(msg)
else:
LOGGER.info(f"Filter {filter.name} does not apply to {resource}")
LOGGER.info(f'Filter {filter.name} does not apply to {resource}')

return filter_queries

Expand Down Expand Up @@ -321,7 +321,7 @@ def get_document_json_by_key(self,

else:
# no doc exists with given key in ES
msg = f"Requested key {resource_key} query returned no results in ES"
msg = f'Requested key {resource_key} query returned no results in ES'
LOGGER.error(msg)
raise ValueError(msg)
else:
Expand All @@ -336,7 +336,7 @@ def update_document_by_id(self, *,
document_id: str) -> None:

partial_document = {
"doc": {
'doc': {
field: new_value
}
}
Expand Down Expand Up @@ -426,7 +426,7 @@ def delete_document_by_key(self, *,
else:
# no value given when deleting implies
# delete is happening on a single value field
new_value = ""
new_value = ''
try:
self.update_document_by_id(resource_type=resource_type,
field=mapped_field,
Expand Down
2 changes: 1 addition & 1 deletion search/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from setuptools import find_packages, setup

__version__ = '4.1.0'
__version__ = '4.1.1'

oidc = ['flaskoidc>=1.0.0']

Expand Down