From 55fadd7f87ab6953f3f573d59c730d4966a39449 Mon Sep 17 00:00:00 2001
From: mpostma <postma.marin@protonmail.com>
Date: Mon, 15 Mar 2021 13:53:50 +0100
Subject: [PATCH] change facetedAttributes to attributesForFaceting

---
 meilisearch-http/src/index/mod.rs               | 2 +-
 meilisearch-http/src/index/updates.rs           | 6 +++---
 meilisearch-http/src/routes/settings/mod.rs     | 4 ++--
 meilisearch-http/tests/settings/get_settings.rs | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/meilisearch-http/src/index/mod.rs b/meilisearch-http/src/index/mod.rs
index 06f1140a3..72453091f 100644
--- a/meilisearch-http/src/index/mod.rs
+++ b/meilisearch-http/src/index/mod.rs
@@ -54,7 +54,7 @@ impl Index {
         Ok(Settings {
             displayed_attributes: Some(Some(displayed_attributes)),
             searchable_attributes: Some(Some(searchable_attributes)),
-            faceted_attributes: Some(Some(faceted_attributes)),
+            attributes_for_faceting: Some(Some(faceted_attributes)),
             ranking_rules: Some(Some(criteria)),
         })
     }
diff --git a/meilisearch-http/src/index/updates.rs b/meilisearch-http/src/index/updates.rs
index 70c2dfc2b..254f6e991 100644
--- a/meilisearch-http/src/index/updates.rs
+++ b/meilisearch-http/src/index/updates.rs
@@ -35,7 +35,7 @@ pub struct Settings {
     pub searchable_attributes: Option<Option<Vec<String>>>,
 
     #[serde(default)]
-    pub faceted_attributes: Option<Option<HashMap<String, String>>>,
+    pub attributes_for_faceting: Option<Option<HashMap<String, String>>>,
 
     #[serde(
         default,
@@ -50,7 +50,7 @@ impl Settings {
         Self {
             displayed_attributes: Some(None),
             searchable_attributes: Some(None),
-            faceted_attributes: Some(None),
+            attributes_for_faceting: Some(None),
             ranking_rules: Some(None),
         }
     }
@@ -158,7 +158,7 @@ impl Index {
         }
 
         // We transpose the settings JSON struct into a real setting update.
-        if let Some(ref facet_types) = settings.faceted_attributes {
+        if let Some(ref facet_types) = settings.attributes_for_faceting {
             let facet_types = facet_types.clone().unwrap_or_else(|| HashMap::new());
             builder.set_faceted_fields(facet_types);
         }
diff --git a/meilisearch-http/src/routes/settings/mod.rs b/meilisearch-http/src/routes/settings/mod.rs
index 4e7219b1c..345a86534 100644
--- a/meilisearch-http/src/routes/settings/mod.rs
+++ b/meilisearch-http/src/routes/settings/mod.rs
@@ -82,7 +82,7 @@ macro_rules! make_setting_route {
 make_setting_route!(
     "/indexes/{index_uid}/settings/attributes-for-faceting",
     std::collections::HashMap<String, String>,
-    faceted_attributes
+    attributes_for_faceting
 );
 
 make_setting_route!(
@@ -126,7 +126,7 @@ macro_rules! create_services {
 }
 
 create_services!(
-    faceted_attributes,
+    attributes_for_faceting,
     displayed_attributes,
     searchable_attributes
 );
diff --git a/meilisearch-http/tests/settings/get_settings.rs b/meilisearch-http/tests/settings/get_settings.rs
index e00840f9b..0a8972108 100644
--- a/meilisearch-http/tests/settings/get_settings.rs
+++ b/meilisearch-http/tests/settings/get_settings.rs
@@ -19,7 +19,8 @@ async fn get_settings() {
     assert_eq!(settings.keys().len(), 4);
     assert_eq!(settings["displayedAttributes"], json!(["*"]));
     assert_eq!(settings["searchableAttributes"], json!(["*"]));
-    assert_eq!(settings["facetedAttributes"], json!({}));
+    println!("{:?}", settings);
+    assert_eq!(settings["attributesForFaceting"], json!({}));
     assert_eq!(settings["rankingRules"], json!(["typo", "words", "proximity", "attribute", "wordsPosition", "exactness"]));
 }