searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 11:57:07 +02:00
Code Issues Releases Wiki Activity

Bump serde-cs to simplify our usage of the star_or function

Browse source
This commit is contained in:
Kerollmops 2022-06-06 10:17:33 +02:00
parent 64b5b2e1f8
commit 277a0a7967
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
5 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meilisearch-http/src/routes/indexes/documents.rs
View file

@ -99,7 +99,7 @@ pub async fn get_document(
let index = path.index_uid.clone();
let id = path.document_id.clone();
let GetDocument { fields } = params.into_inner();
let attributes_to_retrieve = fields.map(CS::into_inner).and_then(fold_star_or);
let attributes_to_retrieve = fields.and_then(fold_star_or);
let document = meilisearch
.document(index, id, attributes_to_retrieve)
@ -143,7 +143,7 @@ pub async fn get_all_documents(
offset,
fields,
} = params.into_inner();
let attributes_to_retrieve = fields.map(CS::into_inner).and_then(fold_star_or);
let attributes_to_retrieve = fields.and_then(fold_star_or);
let (total, documents) = meilisearch
.documents(path.into_inner(), offset, limit, attributes_to_retrieve)

29
meilisearch-http/src/routes/indexes/search.rs
View file

@ -50,23 +50,6 @@ pub struct SearchQueryGet {
impl From<SearchQueryGet> for SearchQuery {
fn from(other: SearchQueryGet) -> Self {
let attributes_to_retrieve = other
.attributes_to_retrieve
.map(CS::into_inner)
.and_then(fold_star_or);
let attributes_to_crop = other
.attributes_to_crop
.map(CS::into_inner)
.and_then(fold_star_or);
let attributes_to_highlight = other
.attributes_to_highlight
.map(CS::into_inner)
.and_then(fold_star_or);
let facets = other.facets.map(CS::into_inner).and_then(fold_star_or);
let filter = match other.filter {
Some(f) => match serde_json::from_str(&f) {
Ok(v) => Some(v),
@ -75,20 +58,18 @@ impl From<SearchQueryGet> for SearchQuery {
None => None,
};
let sort = other.sort.map(|attr| fix_sort_query_parameters(&attr));
Self {
q: other.q,
offset: other.offset,
limit: other.limit.unwrap_or_else(DEFAULT_SEARCH_LIMIT),
attributes_to_retrieve,
attributes_to_crop,
attributes_to_retrieve: other.attributes_to_retrieve.and_then(fold_star_or),
attributes_to_crop: other.attributes_to_crop.and_then(fold_star_or),
crop_length: other.crop_length,
attributes_to_highlight,
attributes_to_highlight: other.attributes_to_highlight.and_then(fold_star_or),
filter,
sort,
sort: other.sort.map(|attr| fix_sort_query_parameters(&attr)),
show_matches_position: other.show_matches_position,
facets,
facets: other.facets.and_then(fold_star_or),
highlight_pre_tag: other.highlight_pre_tag,
highlight_post_tag: other.highlight_post_tag,
crop_marker: other.crop_marker,

6
meilisearch-http/src/routes/tasks.rs
View file

@ -81,9 +81,9 @@ async fn get_tasks(
// We first transform a potential indexUid=* into a "not specified indexUid filter"
// for every one of the filters: type, status, and indexUid.
let type_: Option<Vec<_>> = type_.map(CS::into_inner).and_then(fold_star_or);
let status: Option<Vec<_>> = status.map(CS::into_inner).and_then(fold_star_or);
let index_uid: Option<Vec<_>> = index_uid.map(CS::into_inner).and_then(fold_star_or);
let type_: Option<Vec<_>> = type_.and_then(fold_star_or);
let status: Option<Vec<_>> = status.and_then(fold_star_or);
let index_uid: Option<Vec<_>> = index_uid.and_then(fold_star_or);
// Then we filter on potential indexes and make sure that the search filter
// restrictions are also applied.