From 94bd14ede3c85c176e1cb72e05e7913eaaa89ac2 Mon Sep 17 00:00:00 2001 From: mpostma Date: Mon, 15 Mar 2021 18:35:16 +0100 Subject: [PATCH 1/2] add name to index_metadata --- meilisearch-http/src/index_controller/mod.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meilisearch-http/src/index_controller/mod.rs b/meilisearch-http/src/index_controller/mod.rs index 0db60a41b..90c67e2b6 100644 --- a/meilisearch-http/src/index_controller/mod.rs +++ b/meilisearch-http/src/index_controller/mod.rs @@ -27,6 +27,7 @@ pub type UpdateStatus = updates::UpdateStatus; #[serde(rename_all = "camelCase")] pub struct IndexMetadata { uid: String, + name: String, #[serde(flatten)] meta: index_actor::IndexMeta, } @@ -176,7 +177,7 @@ impl IndexController { let uuid = self.uuid_resolver.create(uid.clone()).await?; let meta = self.index_handle.create_index(uuid, primary_key).await?; let _ = self.update_handle.create(uuid).await?; - let meta = IndexMetadata { uid, meta }; + let meta = IndexMetadata { name: uid.clone(), uid, meta }; Ok(meta) } @@ -207,7 +208,7 @@ impl IndexController { for (uid, uuid) in uuids { let meta = self.index_handle.get_index_meta(uuid).await?; - let meta = IndexMetadata { uid, meta }; + let meta = IndexMetadata { name: uid.clone(), uid, meta }; ret.push(meta); } @@ -260,7 +261,7 @@ impl IndexController { let uuid = self.uuid_resolver.resolve(uid.clone()).await?; let meta = self.index_handle.update_index(uuid, index_settings).await?; - let meta = IndexMetadata { uid, meta }; + let meta = IndexMetadata { name: uid.clone(), uid, meta }; Ok(meta) } @@ -273,7 +274,7 @@ impl IndexController { pub async fn get_index(&self, uid: String) -> anyhow::Result { let uuid = self.uuid_resolver.resolve(uid.clone()).await?; let meta = self.index_handle.get_index_meta(uuid).await?; - let meta = IndexMetadata { uid, meta }; + let meta = IndexMetadata { name: uid.clone(), uid, meta }; Ok(meta) } } From 07bb1e2c4e81ddd4f4089c584e933da1680f9ad5 Mon Sep 17 00:00:00 2001 From: mpostma Date: Mon, 15 Mar 2021 18:38:13 +0100 Subject: [PATCH 2/2] fix tests --- meilisearch-http/tests/index/create_index.rs | 6 ++++-- meilisearch-http/tests/index/get_index.rs | 3 ++- meilisearch-http/tests/index/update_index.rs | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meilisearch-http/tests/index/create_index.rs b/meilisearch-http/tests/index/create_index.rs index 003bbfc58..a61524d04 100644 --- a/meilisearch-http/tests/index/create_index.rs +++ b/meilisearch-http/tests/index/create_index.rs @@ -9,11 +9,12 @@ async fn create_index_no_primary_key() { assert_eq!(code, 200); assert_eq!(response["uid"], "test"); + assert_eq!(response["name"], "test"); assert!(response.get("createdAt").is_some()); assert!(response.get("updatedAt").is_some()); assert_eq!(response["createdAt"], response["updatedAt"]); assert_eq!(response["primaryKey"], Value::Null); - assert_eq!(response.as_object().unwrap().len(), 4); + assert_eq!(response.as_object().unwrap().len(), 5); } #[actix_rt::test] @@ -24,11 +25,12 @@ async fn create_index_with_primary_key() { assert_eq!(code, 200); assert_eq!(response["uid"], "test"); + assert_eq!(response["name"], "test"); assert!(response.get("createdAt").is_some()); assert!(response.get("updatedAt").is_some()); //assert_eq!(response["createdAt"], response["updatedAt"]); assert_eq!(response["primaryKey"], "primary"); - assert_eq!(response.as_object().unwrap().len(), 4); + assert_eq!(response.as_object().unwrap().len(), 5); } // TODO: partial test since we are testing error, amd error is not yet fully implemented in diff --git a/meilisearch-http/tests/index/get_index.rs b/meilisearch-http/tests/index/get_index.rs index 2ba7b86e4..8671d85cd 100644 --- a/meilisearch-http/tests/index/get_index.rs +++ b/meilisearch-http/tests/index/get_index.rs @@ -13,11 +13,12 @@ async fn create_and_get_index() { assert_eq!(code, 200); assert_eq!(response["uid"], "test"); + assert_eq!(response["name"], "test"); assert!(response.get("createdAt").is_some()); assert!(response.get("updatedAt").is_some()); assert_eq!(response["createdAt"], response["updatedAt"]); assert_eq!(response["primaryKey"], Value::Null); - assert_eq!(response.as_object().unwrap().len(), 4); + assert_eq!(response.as_object().unwrap().len(), 5); } // TODO: partial test since we are testing error, amd error is not yet fully implemented in diff --git a/meilisearch-http/tests/index/update_index.rs b/meilisearch-http/tests/index/update_index.rs index 36670682a..9c78ccb16 100644 --- a/meilisearch-http/tests/index/update_index.rs +++ b/meilisearch-http/tests/index/update_index.rs @@ -13,6 +13,7 @@ async fn update_primary_key() { assert_eq!(code, 200); assert_eq!(response["uid"], "test"); + assert_eq!(response["name"], "test"); assert!(response.get("createdAt").is_some()); assert!(response.get("updatedAt").is_some()); @@ -21,7 +22,7 @@ async fn update_primary_key() { assert!(created_at < updated_at); assert_eq!(response["primaryKey"], "primary"); - assert_eq!(response.as_object().unwrap().len(), 4); + assert_eq!(response.as_object().unwrap().len(), 5); } #[actix_rt::test]