mirror of
				https://github.com/meilisearch/meilisearch.git
				synced 2025-10-30 07:26:26 +00:00 
			
		
		
		
	Rename the uid to taskUid in asynchronous response
This commit is contained in:
		| @@ -523,7 +523,7 @@ async fn error_creating_index_without_action() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202, "{:?}", response); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     let response = index.wait_task(task_id).await; | ||||
|     assert_eq!(response["status"], "failed"); | ||||
| @@ -534,7 +534,7 @@ async fn error_creating_index_without_action() { | ||||
|  | ||||
|     let (response, code) = index.update_settings(settings).await; | ||||
|     assert_eq!(code, 202); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     let response = index.wait_task(task_id).await; | ||||
|  | ||||
| @@ -544,7 +544,7 @@ async fn error_creating_index_without_action() { | ||||
|     // try to create a index via add specialized settings route | ||||
|     let (response, code) = index.update_distinct_attribute(json!("test")).await; | ||||
|     assert_eq!(code, 202); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     let response = index.wait_task(task_id).await; | ||||
|  | ||||
| @@ -583,7 +583,7 @@ async fn lazy_create_index() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202, "{:?}", response); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     index.wait_task(task_id).await; | ||||
|  | ||||
| @@ -597,7 +597,7 @@ async fn lazy_create_index() { | ||||
|  | ||||
|     let (response, code) = index.update_settings(settings).await; | ||||
|     assert_eq!(code, 202); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     index.wait_task(task_id).await; | ||||
|  | ||||
| @@ -609,7 +609,7 @@ async fn lazy_create_index() { | ||||
|     let index = server.index("test2"); | ||||
|     let (response, code) = index.update_distinct_attribute(json!("test")).await; | ||||
|     assert_eq!(code, 202); | ||||
|     let task_id = response["uid"].as_u64().unwrap(); | ||||
|     let task_id = response["taskUid"].as_u64().unwrap(); | ||||
|  | ||||
|     index.wait_task(task_id).await; | ||||
|  | ||||
|   | ||||
| @@ -46,7 +46,7 @@ impl Index<'_> { | ||||
|             .post_str(url, include_str!("../assets/test_set.json")) | ||||
|             .await; | ||||
|         assert_eq!(code, 202); | ||||
|         let update_id = response["uid"].as_i64().unwrap(); | ||||
|         let update_id = response["taskUid"].as_i64().unwrap(); | ||||
|         self.wait_task(update_id as u64).await; | ||||
|         update_id as u64 | ||||
|     } | ||||
|   | ||||
| @@ -35,7 +35,7 @@ async fn add_documents_test_json_content_types() { | ||||
|     let body = test::read_body(res).await; | ||||
|     let response: Value = serde_json::from_slice(&body).unwrap_or_default(); | ||||
|     assert_eq!(status_code, 202); | ||||
|     assert_eq!(response["uid"], 0); | ||||
|     assert_eq!(response["taskUid"], 0); | ||||
|  | ||||
|     // put | ||||
|     let req = test::TestRequest::put() | ||||
| @@ -48,7 +48,7 @@ async fn add_documents_test_json_content_types() { | ||||
|     let body = test::read_body(res).await; | ||||
|     let response: Value = serde_json::from_slice(&body).unwrap_or_default(); | ||||
|     assert_eq!(status_code, 202); | ||||
|     assert_eq!(response["uid"], 1); | ||||
|     assert_eq!(response["taskUid"], 1); | ||||
| } | ||||
|  | ||||
| /// any other content-type is must be refused | ||||
| @@ -599,7 +599,7 @@ async fn add_documents_no_index_creation() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202); | ||||
|     assert_eq!(response["uid"], 0); | ||||
|     assert_eq!(response["taskUid"], 0); | ||||
|     /* | ||||
|      * currently we don’t check these field to stay ISO with meilisearch | ||||
|      * assert_eq!(response["status"], "pending"); | ||||
|   | ||||
| @@ -52,10 +52,10 @@ async fn loop_delete_add_documents() { | ||||
|     let mut tasks = Vec::new(); | ||||
|     for _ in 0..50 { | ||||
|         let (response, code) = index.add_documents(documents.clone(), None).await; | ||||
|         tasks.push(response["uid"].as_u64().unwrap()); | ||||
|         tasks.push(response["taskUid"].as_u64().unwrap()); | ||||
|         assert_eq!(code, 202, "{}", response); | ||||
|         let (response, code) = index.delete().await; | ||||
|         tasks.push(response["uid"].as_u64().unwrap()); | ||||
|         tasks.push(response["taskUid"].as_u64().unwrap()); | ||||
|         assert_eq!(code, 202, "{}", response); | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -35,7 +35,7 @@ async fn stats() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202); | ||||
|     assert_eq!(response["uid"], 1); | ||||
|     assert_eq!(response["taskUid"], 1); | ||||
|  | ||||
|     index.wait_task(1).await; | ||||
|  | ||||
|   | ||||
| @@ -122,7 +122,7 @@ async fn reset_all_settings() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202); | ||||
|     assert_eq!(response["uid"], 0); | ||||
|     assert_eq!(response["taskUid"], 0); | ||||
|     index.wait_task(0).await; | ||||
|  | ||||
|     index | ||||
|   | ||||
| @@ -54,7 +54,7 @@ async fn stats() { | ||||
|  | ||||
|     let (response, code) = index.add_documents(documents, None).await; | ||||
|     assert_eq!(code, 202, "{}", response); | ||||
|     assert_eq!(response["uid"], 1); | ||||
|     assert_eq!(response["taskUid"], 1); | ||||
|  | ||||
|     index.wait_task(1).await; | ||||
|  | ||||
|   | ||||
| @@ -94,7 +94,7 @@ async fn list_tasks() { | ||||
| macro_rules! assert_valid_summarized_task { | ||||
|     ($response:expr, $task_type:literal, $index:literal) => {{ | ||||
|         assert_eq!($response.as_object().unwrap().len(), 5); | ||||
|         assert!($response["uid"].as_u64().is_some()); | ||||
|         assert!($response["taskUid"].as_u64().is_some()); | ||||
|         assert_eq!($response["indexUid"], $index); | ||||
|         assert_eq!($response["status"], "enqueued"); | ||||
|         assert_eq!($response["type"], $task_type); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user