searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-06-24 13:22:56 +02:00
Code Issues Releases Wiki Activity

use ParseGeoError in sort parser

Browse Source
This commit is contained in:
Filip Bachul 2023-02-07 19:15:06 +01:00
parent 825923f6fc
commit 4c91037602
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
milli/src/asc_desc.rs
View File

@ -7,14 +7,15 @@ use serde::{Deserialize, Serialize};
use thiserror::Error; use thiserror::Error;
use crate::error::is_reserved_keyword; use crate::error::is_reserved_keyword;
use crate::search::facet::ParseGeoError;
use crate::{CriterionError, Error, UserError}; use crate::{CriterionError, Error, UserError};
/// This error type is never supposed to be shown to the end user. /// This error type is never supposed to be shown to the end user.
/// You must always cast it to a sort error or a criterion error. /// You must always cast it to a sort error or a criterion error.
#[derive(Debug)] #[derive(Debug)]
pub enum AscDescError { pub enum AscDescError {
InvalidLatitude, InvalidLatitude(ParseGeoError),
InvalidLongitude, InvalidLongitude(ParseGeoError),
InvalidSyntax { name: String }, InvalidSyntax { name: String },
ReservedKeyword { name: String }, ReservedKeyword { name: String },
} }
@ -22,11 +23,11 @@ pub enum AscDescError {
impl fmt::Display for AscDescError { impl fmt::Display for AscDescError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
Self::InvalidLatitude => { Self::InvalidLatitude(error) => {
write!(f, "Latitude must be contained between -90 and 90 degrees.",) write!(f, "{error}",)
} }
Self::InvalidLongitude => { Self::InvalidLongitude(error) => {
write!(f, "Longitude must be contained between -180 and 180 degrees.",) write!(f, "{error}",)
} }
Self::InvalidSyntax { name } => { Self::InvalidSyntax { name } => {
write!(f, "Invalid syntax for the asc/desc parameter: expected expression ending by `:asc` or `:desc`, found `{}`.", name) write!(f, "Invalid syntax for the asc/desc parameter: expected expression ending by `:asc` or `:desc`, found `{}`.", name)
@ -45,7 +46,7 @@ impl fmt::Display for AscDescError {
impl From<AscDescError> for CriterionError { impl From<AscDescError> for CriterionError {
fn from(error: AscDescError) -> Self { fn from(error: AscDescError) -> Self {
match error { match error {
AscDescError::InvalidLatitude | AscDescError::InvalidLongitude => { AscDescError::InvalidLatitude(_) | AscDescError::InvalidLongitude(_) => {
CriterionError::ReservedNameForSort { name: "_geoPoint".to_string() } CriterionError::ReservedNameForSort { name: "_geoPoint".to_string() }
} }
AscDescError::InvalidSyntax { name } => CriterionError::InvalidName { name }, AscDescError::InvalidSyntax { name } => CriterionError::InvalidName { name },
@ -85,9 +86,9 @@ impl FromStr for Member {
.map_err(|_| AscDescError::ReservedKeyword { name: text.to_string() }) .map_err(|_| AscDescError::ReservedKeyword { name: text.to_string() })
})?; })?;
if !(-90.0..=90.0).contains(&lat) { if !(-90.0..=90.0).contains(&lat) {
return Err(AscDescError::InvalidLatitude)?; return Err(AscDescError::InvalidLatitude(ParseGeoError::BadGeoLat(lat)))?;
} else if !(-180.0..=180.0).contains(&lng) { } else if !(-180.0..=180.0).contains(&lng) {
return Err(AscDescError::InvalidLongitude)?; return Err(AscDescError::InvalidLongitude(ParseGeoError::BadGeoLng(lng)))?;
} }
Ok(Member::Geo([lat, lng])) Ok(Member::Geo([lat, lng]))
} }
@ -162,10 +163,10 @@ impl FromStr for AscDesc {
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum SortError { pub enum SortError {
#[error("{}", AscDescError::InvalidLatitude)] #[error("{}", error)]
InvalidLatitude, InvalidLatitude { error: ParseGeoError },
#[error("{}", AscDescError::InvalidLongitude)] #[error("{}", error)]
InvalidLongitude, InvalidLongitude { error: ParseGeoError },
#[error("Invalid syntax for the geo parameter: expected expression formated like \ #[error("Invalid syntax for the geo parameter: expected expression formated like \
`_geoPoint(latitude, longitude)` and ending by `:asc` or `:desc`, found `{name}`.")] `_geoPoint(latitude, longitude)` and ending by `:asc` or `:desc`, found `{name}`.")]
BadGeoPointUsage { name: String }, BadGeoPointUsage { name: String },
@ -184,8 +185,8 @@ pub enum SortError {
impl From<AscDescError> for SortError { impl From<AscDescError> for SortError {
fn from(error: AscDescError) -> Self { fn from(error: AscDescError) -> Self {
match error { match error {
AscDescError::InvalidLatitude => SortError::InvalidLatitude, AscDescError::InvalidLatitude(error) => SortError::InvalidLatitude { error },
AscDescError::InvalidLongitude => SortError::InvalidLongitude, AscDescError::InvalidLongitude(error) => SortError::InvalidLongitude { error },
AscDescError::InvalidSyntax { name } => SortError::InvalidName { name }, AscDescError::InvalidSyntax { name } => SortError::InvalidName { name },
AscDescError::ReservedKeyword { name } if name.starts_with("_geoPoint") => { AscDescError::ReservedKeyword { name } if name.starts_with("_geoPoint") => {
SortError::BadGeoPointUsage { name } SortError::BadGeoPointUsage { name }
@ -277,11 +278,11 @@ mod tests {
), ),
("_geoPoint(35, 85, 75):asc", ReservedKeyword { name: S("_geoPoint(35, 85, 75)") }), ("_geoPoint(35, 85, 75):asc", ReservedKeyword { name: S("_geoPoint(35, 85, 75)") }),
("_geoPoint(18):asc", ReservedKeyword { name: S("_geoPoint(18)") }), ("_geoPoint(18):asc", ReservedKeyword { name: S("_geoPoint(18)") }),
("_geoPoint(200, 200):asc", InvalidLatitude), ("_geoPoint(200, 200):asc", InvalidLatitude(ParseGeoError::BadGeoLat(200.))),
("_geoPoint(90.000001, 0):asc", InvalidLatitude), ("_geoPoint(90.000001, 0):asc", InvalidLatitude(ParseGeoError::BadGeoLat(90.000001))),
("_geoPoint(0, -180.000001):desc", InvalidLongitude), ("_geoPoint(0, -180.000001):desc", InvalidLongitude(ParseGeoError::BadGeoLng(-180.000001))),
("_geoPoint(159.256, 130):asc", InvalidLatitude), ("_geoPoint(159.256, 130):asc", InvalidLatitude(ParseGeoError::BadGeoLat(159.256))),
("_geoPoint(12, -2021):desc", InvalidLongitude), ("_geoPoint(12, -2021):desc", InvalidLongitude(ParseGeoError::BadGeoLng(-2021.))),
]; ];
for (req, expected_error) in invalid_req { for (req, expected_error) in invalid_req {