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

chore(search): rename in the search endpoint

Browse source 
Fix ##2376
This commit is contained in:
Irevoire 2022-05-18 13:17:56 +02:00 • committed by Tamo
parent ae4e419db4
commit 4e9accdeb7
No known key found for this signature in database
GPG key ID: 20CD8020AFA88D69
6 changed files with 50 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
meilisearch-http/src/analytics/segment_analytics.rs
View file

@ -363,7 +363,7 @@ pub struct SearchAggregator {
highlight_pre_tag: bool,
highlight_post_tag: bool,
crop_marker: bool,
matches: bool,
show_matches_position: bool,
crop_length: bool,
}
@ -419,7 +419,7 @@ impl SearchAggregator {
ret.highlight_post_tag = query.highlight_post_tag != DEFAULT_HIGHLIGHT_POST_TAG;
ret.crop_marker = query.crop_marker != DEFAULT_CROP_MARKER;
ret.crop_length = query.crop_length != DEFAULT_CROP_LENGTH;
ret.matches = query.matches;
ret.show_matches_position = query.show_matches_position;
ret
}
@ -472,7 +472,7 @@ impl SearchAggregator {
self.highlight_pre_tag |= other.highlight_pre_tag;
self.highlight_post_tag |= other.highlight_post_tag;
self.crop_marker |= other.crop_marker;
self.matches |= other.matches;
self.show_matches_position |= other.show_matches_position;
self.crop_length |= other.crop_length;
}
@ -515,7 +515,7 @@ impl SearchAggregator {
"highlight_pre_tag": self.highlight_pre_tag,
"highlight_post_tag": self.highlight_post_tag,
"crop_marker": self.crop_marker,
"matches": self.matches,
"show_matches_position": self.show_matches_position,
"crop_length": self.crop_length,
},
});

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

@ -36,8 +36,8 @@ pub struct SearchQueryGet {
filter: Option<String>,
sort: Option<String>,
#[serde(default = "Default::default")]
matches: bool,
facets_distribution: Option<String>,
show_matches_position: bool,
facets: Option<String>,
#[serde(default = "default_highlight_pre_tag")]
highlight_pre_tag: String,
#[serde(default = "default_highlight_post_tag")]
@ -60,8 +60,8 @@ impl From<SearchQueryGet> for SearchQuery {
.attributes_to_highlight
.map(|attrs| attrs.split(',').map(String::from).collect());
let facets_distribution = other
.facets_distribution
let facets = other
.facets
.map(|attrs| attrs.split(',').map(String::from).collect());
let filter = match other.filter {
@ -84,8 +84,8 @@ impl From<SearchQueryGet> for SearchQuery {
attributes_to_highlight,
filter,
sort,
matches: other.matches,
facets_distribution,
show_matches_position: other.show_matches_position,
facets,
highlight_pre_tag: other.highlight_pre_tag,
highlight_post_tag: other.highlight_post_tag,
crop_marker: other.crop_marker,
@ -169,10 +169,6 @@ pub async fn search_with_url_query(
let search_result = search_result?;
// Tests that the nb_hits is always set to false
#[cfg(test)]
assert!(!search_result.exhaustive_nb_hits);
debug!("returns: {:?}", search_result);
Ok(HttpResponse::Ok().json(search_result))
}
@ -207,10 +203,6 @@ pub async fn search_with_post(
let search_result = search_result?;
// Tests that the nb_hits is always set to false
#[cfg(test)]
assert!(!search_result.exhaustive_nb_hits);
debug!("returns: {:?}", search_result);
Ok(HttpResponse::Ok().json(search_result))
}

12
meilisearch-http/tests/search/formatted.rs
View file

@ -16,7 +16,7 @@ async fn formatted_contain_wildcard() {
index.wait_task(1).await;
let (response, code) = index
.search_post(json!({ "q": "pesti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "matches": true }))
.search_post(json!({ "q": "pesti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }))
.await;
assert_eq!(code, 200, "{}", response);
assert_eq!(
@ -26,7 +26,7 @@ async fn formatted_contain_wildcard() {
"id": "852",
"cattos": "<em>pesti</em>",
},
"_matchesInfo": {"cattos": [{"start": 0, "length": 5}]},
"_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
})
);
@ -44,7 +44,7 @@ async fn formatted_contain_wildcard() {
let (response, code) = index
.search_post(
json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "matches": true }),
json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "showMatchesPosition": true }),
)
.await;
assert_eq!(code, 200, "{}", response);
@ -57,7 +57,7 @@ async fn formatted_contain_wildcard() {
"id": "852",
"cattos": "pesti",
},
"_matchesInfo": {"cattos": [{"start": 0, "length": 5}]},
"_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
})
);
@ -145,7 +145,7 @@ async fn format_nested() {
let (response, code) = index
.search_post(
json!({ "q": "bobby", "attributesToRetrieve": ["doggos.name"], "matches": true }),
json!({ "q": "bobby", "attributesToRetrieve": ["doggos.name"], "showMatchesPosition": true }),
)
.await;
assert_eq!(code, 200, "{}", response);
@ -160,7 +160,7 @@ async fn format_nested() {
"name": "buddy",
},
],
"_matchesInfo": {"doggos.name": [{"start": 0, "length": 5}]},
"_matchesPosition": {"doggos.name": [{"start": 0, "length": 5}]},
})
);

18
meilisearch-http/tests/search/mod.rs
View file

@ -420,11 +420,11 @@ async fn search_facet_distribution() {
index
.search(
json!({
"facetsDistribution": ["title"]
"facets": ["title"]
}),
|response, code| {
assert_eq!(code, 200, "{}", response);
let dist = response["facetsDistribution"].as_object().unwrap();
let dist = response["facetDistribution"].as_object().unwrap();
assert_eq!(dist.len(), 1);
assert!(dist.get("title").is_some());
},
@ -445,12 +445,12 @@ async fn search_facet_distribution() {
index
.search(
json!({
// "facetsDistribution": ["father", "doggos.name"]
"facetsDistribution": ["father"]
// "facets": ["father", "doggos.name"]
"facets": ["father"]
}),
|response, code| {
assert_eq!(code, 200, "{}", response);
let dist = response["facetsDistribution"].as_object().unwrap();
let dist = response["facetDistribution"].as_object().unwrap();
assert_eq!(dist.len(), 1);
assert_eq!(
dist["father"],
@ -474,11 +474,11 @@ async fn search_facet_distribution() {
index
.search(
json!({
"facetsDistribution": ["doggos.name"]
"facets": ["doggos.name"]
}),
|response, code| {
assert_eq!(code, 200, "{}", response);
let dist = response["facetsDistribution"].as_object().unwrap();
let dist = response["facetDistribution"].as_object().unwrap();
assert_eq!(dist.len(), 1);
assert_eq!(
dist["doggos.name"],
@ -491,11 +491,11 @@ async fn search_facet_distribution() {
index
.search(
json!({
"facetsDistribution": ["doggos"]
"facets": ["doggos"]
}),
|response, code| {
assert_eq!(code, 200, "{}", response);
let dist = response["facetsDistribution"].as_object().unwrap();
let dist = response["facetDistribution"].as_object().unwrap();
dbg!(&dist);
assert_eq!(dist.len(), 3);
assert_eq!(