From 41760a9306332da33406ae555142b59977f44086 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 7 Jun 2023 11:04:53 +0200 Subject: [PATCH] Introduce a new invalid_facet_search_facet_name error code --- meilisearch-types/src/error.rs | 5 ++++- milli/src/error.rs | 2 +- milli/src/search/mod.rs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meilisearch-types/src/error.rs b/meilisearch-types/src/error.rs index 1a87b2707..c7ab6fa0f 100644 --- a/meilisearch-types/src/error.rs +++ b/meilisearch-types/src/error.rs @@ -233,6 +233,7 @@ InvalidSearchAttributesToRetrieve , InvalidRequest , BAD_REQUEST ; InvalidSearchCropLength , InvalidRequest , BAD_REQUEST ; InvalidSearchCropMarker , InvalidRequest , BAD_REQUEST ; InvalidSearchFacets , InvalidRequest , BAD_REQUEST ; +InvalidFacetSearchFacetName , InvalidRequest , BAD_REQUEST ; InvalidSearchFilter , InvalidRequest , BAD_REQUEST ; InvalidSearchHighlightPostTag , InvalidRequest , BAD_REQUEST ; InvalidSearchHighlightPreTag , InvalidRequest , BAD_REQUEST ; @@ -343,7 +344,9 @@ impl ErrorCode for milli::Error { UserError::InvalidSearchableAttribute { .. } => { Code::InvalidAttributesToSearchOn } - UserError::InvalidSearchFacet { .. } => Code::InvalidSearchFacet, + UserError::InvalidFacetSearchFacetName { .. } => { + Code::InvalidFacetSearchFacetName + } UserError::CriterionError(_) => Code::InvalidSettingsRankingRules, UserError::InvalidGeoField { .. } => Code::InvalidDocumentGeoField, UserError::InvalidVectorDimensions { .. } => Code::InvalidVectorDimensions, diff --git a/milli/src/error.rs b/milli/src/error.rs index 81be9a215..4f9a9028f 100644 --- a/milli/src/error.rs +++ b/milli/src/error.rs @@ -137,7 +137,7 @@ only composed of alphanumeric characters (a-z A-Z 0-9), hyphens (-) and undersco ), } )] - InvalidSearchFacet { field: String, valid_fields: BTreeSet }, + InvalidFacetSearchFacetName { field: String, valid_fields: BTreeSet }, #[error("Attribute `{}` is not searchable. Available searchable attributes are: `{}{}`.", .field, .valid_fields.iter().map(AsRef::as_ref).collect::>().join(", "), diff --git a/milli/src/search/mod.rs b/milli/src/search/mod.rs index 2f0edc226..01d854951 100644 --- a/milli/src/search/mod.rs +++ b/milli/src/search/mod.rs @@ -264,7 +264,7 @@ impl<'a> SearchForFacetValues<'a> { let filterable_fields = index.filterable_fields(rtxn)?; if !filterable_fields.contains(&self.facet) { - return Err(UserError::InvalidSearchFacet { + return Err(UserError::InvalidFacetSearchFacetName { field: self.facet.clone(), valid_fields: filterable_fields.into_iter().collect(), }