From 97854274b4bca129283cc9766bbdc92b2e27683b Mon Sep 17 00:00:00 2001 From: Tamo Date: Thu, 5 Jan 2023 21:08:19 +0100 Subject: [PATCH] rename the invalid_geo_field error code to invalid_document_geo_field --- dump/src/reader/compat/v5_to_v6.rs | 2 +- meilisearch-types/src/error.rs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dump/src/reader/compat/v5_to_v6.rs b/dump/src/reader/compat/v5_to_v6.rs index 1b1555217..34132c030 100644 --- a/dump/src/reader/compat/v5_to_v6.rs +++ b/dump/src/reader/compat/v5_to_v6.rs @@ -272,7 +272,7 @@ impl From for v6::ResponseError { "database_size_limit_reached" => v6::Code::DatabaseSizeLimitReached, "document_not_found" => v6::Code::DocumentNotFound, "internal" => v6::Code::Internal, - "invalid_geo_field" => v6::Code::InvalidGeoField, + "invalid_geo_field" => v6::Code::InvalidDocumentGeoField, "invalid_ranking_rule" => v6::Code::InvalidRankingRule, "invalid_store_file" => v6::Code::InvalidStore, "invalid_api_key" => v6::Code::InvalidToken, diff --git a/meilisearch-types/src/error.rs b/meilisearch-types/src/error.rs index d5dc0c1a5..def4f388e 100644 --- a/meilisearch-types/src/error.rs +++ b/meilisearch-types/src/error.rs @@ -198,7 +198,7 @@ pub enum Code { DatabaseSizeLimitReached, DocumentNotFound, Internal, - InvalidGeoField, + InvalidDocumentGeoField, InvalidRankingRule, InvalidStore, InvalidToken, @@ -307,7 +307,9 @@ impl Code { } DocumentNotFound => ErrCode::invalid("document_not_found", StatusCode::NOT_FOUND), Internal => ErrCode::internal("internal", StatusCode::INTERNAL_SERVER_ERROR), - InvalidGeoField => ErrCode::invalid("invalid_geo_field", StatusCode::BAD_REQUEST), + InvalidDocumentGeoField => { + ErrCode::invalid("invalid_document_geo_field", StatusCode::BAD_REQUEST) + } InvalidToken => ErrCode::authentication("invalid_api_key", StatusCode::FORBIDDEN), MissingAuthorizationHeader => { ErrCode::authentication("missing_authorization_header", StatusCode::UNAUTHORIZED) @@ -578,7 +580,7 @@ impl ErrorCode for milli::Error { UserError::InvalidFacetsDistribution { .. } => Code::BadRequest, UserError::InvalidSortableAttribute { .. } => Code::Sort, UserError::CriterionError(_) => Code::InvalidRankingRule, - UserError::InvalidGeoField { .. } => Code::InvalidGeoField, + UserError::InvalidGeoField { .. } => Code::InvalidDocumentGeoField, UserError::SortError(_) => Code::Sort, UserError::InvalidMinTypoWordLenSetting(_, _) => { Code::InvalidMinWordLengthForTypo