snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-06-06 20:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dynamic redactions for uid, batchUid and taskUid

Browse Source 
Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
This commit is contained in:
Martin Tzvetanov Grigorov 2025-05-27 16:27:08 +03:00
parent 3e0de6cb83
commit ce65ad213b
No known key found for this signature in database
GPG Key ID: 3194FD8C1AE300EF
1 changed files with 142 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
crates/meilisearch/tests/documents/add_documents.rs
View File

@ -34,16 +34,16 @@ async fn add_documents_test_json_content_types() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
// put // put
let req = test::TestRequest::put() let req = test::TestRequest::put()
@ -56,10 +56,10 @@ async fn add_documents_test_json_content_types() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"taskUid": 1, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -92,16 +92,16 @@ async fn add_single_document_test_json_content_types() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
// put // put
let req = test::TestRequest::put() let req = test::TestRequest::put()
@ -114,10 +114,10 @@ async fn add_single_document_test_json_content_types() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"taskUid": 1, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -152,16 +152,16 @@ async fn add_single_document_gzip_encoded() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
// put // put
let req = test::TestRequest::put() let req = test::TestRequest::put()
@ -175,10 +175,10 @@ async fn add_single_document_gzip_encoded() {
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let response: Value = serde_json::from_slice(&body).unwrap_or_default();
snapshot!(status_code, @"202 Accepted"); snapshot!(status_code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"taskUid": 1, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -255,7 +255,7 @@ async fn add_single_document_with_every_encoding() {
// post // post
let document = serde_json::to_string(&document).unwrap(); let document = serde_json::to_string(&document).unwrap();
for (task_uid, encoder) in Encoder::iterator().enumerate() { for encoder in Encoder::iterator() {
let mut req = test::TestRequest::post() let mut req = test::TestRequest::post()
.uri(format!("/indexes/{index_name}/documents").as_str()) .uri(format!("/indexes/{index_name}/documents").as_str())
.set_payload(encoder.encode(document.clone())) .set_payload(encoder.encode(document.clone()))
@ -268,9 +268,8 @@ async fn add_single_document_with_every_encoding() {
let res = test::call_service(&app, req).await; let res = test::call_service(&app, req).await;
let status_code = res.status(); let status_code = res.status();
let body = test::read_body(res).await; let body = test::read_body(res).await;
let response: Value = serde_json::from_slice(&body).unwrap_or_default(); let _response: Value = serde_json::from_slice(&body).unwrap_or_default();
assert_eq!(status_code, 202); assert_eq!(status_code, 202);
assert_eq!(response["taskUid"], task_uid);
} }
} }
@ -285,20 +284,20 @@ async fn add_csv_document() {
let (response, code) = index.raw_update_documents(document, Some("text/csv"), "").await; let (response, code) = index.raw_update_documents(document, Some("text/csv"), "").await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".enqueuedAt" => "[date]" }), @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
let response = index.wait_task(response.uid()).await.succeeded(); let response = index.wait_task(response.uid()).await.succeeded();
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###" snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -350,20 +349,20 @@ async fn add_csv_document_with_types() {
let (response, code) = index.raw_update_documents(document, Some("text/csv"), "").await; let (response, code) = index.raw_update_documents(document, Some("text/csv"), "").await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".enqueuedAt" => "[date]" }), @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
let response = index.wait_task(response.uid()).await.succeeded(); let response = index.wait_task(response.uid()).await.succeeded();
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###" snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -426,20 +425,20 @@ async fn add_csv_document_with_custom_delimiter() {
let (response, code) = let (response, code) =
index.raw_update_documents(document, Some("text/csv"), "?csvDelimiter=|").await; index.raw_update_documents(document, Some("text/csv"), "?csvDelimiter=|").await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###" snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".enqueuedAt" => "[date]" }), @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
let response = index.wait_task(response.uid()).await.succeeded(); let response = index.wait_task(response.uid()).await.succeeded();
snapshot!(json_string!(response, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###" snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]" }), @r###"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -991,17 +990,16 @@ async fn add_documents_no_index_creation() {
let (response, code) = index.add_documents(documents, None).await; let (response, code) = index.add_documents(documents, None).await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
assert_eq!(response["taskUid"], 0);
index.wait_task(response.uid()).await.succeeded(); index.wait_task(response.uid()).await.succeeded();
let (response, code) = index.get_task(0).await; let (response, code) = index.get_task(0).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1061,26 +1059,26 @@ async fn document_addition_with_primary_key() {
]); ]);
let (response, code) = index.add_documents(documents, Some("primary")).await; let (response, code) = index.add_documents(documents, Some("primary")).await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
index.wait_task(response.uid()).await.succeeded(); index.wait_task(response.uid()).await.succeeded();
let (response, code) = index.get_task(response.uid()).await; let (response, code) = index.get_task(response.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1171,16 +1169,16 @@ async fn replace_document() {
let (response, code) = index.add_documents(documents, None).await; let (response, code) = index.add_documents(documents, None).await;
snapshot!(code,@"202 Accepted"); snapshot!(code,@"202 Accepted");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".taskUid" => "[task_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"taskUid": 0, "taskUid": "[task_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "enqueued", "status": "enqueued",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
"enqueuedAt": "[date]" "enqueuedAt": "[date]"
} }
"###); "#);
index.wait_task(response.uid()).await.succeeded(); index.wait_task(response.uid()).await.succeeded();
@ -1198,11 +1196,11 @@ async fn replace_document() {
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1369,11 +1367,11 @@ async fn error_add_documents_bad_document_id() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1393,7 +1391,7 @@ async fn error_add_documents_bad_document_id() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
// More than 512 bytes // More than 512 bytes
let documents = json!([ let documents = json!([
@ -1406,11 +1404,11 @@ async fn error_add_documents_bad_document_id() {
index.wait_task(value.uid()).await.failed(); index.wait_task(value.uid()).await.failed();
let (response, code) = index.get_task(value.uid()).await; let (response, code) = index.get_task(value.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 2, "uid": "[uid]",
"batchUid": 2, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1443,11 +1441,11 @@ async fn error_add_documents_bad_document_id() {
index.wait_task(value.uid()).await.failed(); index.wait_task(value.uid()).await.failed();
let (response, code) = index.get_task(value.uid()).await; let (response, code) = index.get_task(value.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 3, "uid": "[uid]",
"batchUid": 3, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1485,11 +1483,11 @@ async fn error_add_documents_missing_document_id() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1509,7 +1507,7 @@ async fn error_add_documents_missing_document_id() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
} }
#[actix_rt::test] #[actix_rt::test]
@ -1795,11 +1793,11 @@ async fn add_documents_with_geo_field() {
let (task, _status_code) = index.add_documents(documents, None).await; let (task, _status_code) = index.add_documents(documents, None).await;
let response = index.wait_task(task.uid()).await.succeeded(); let response = index.wait_task(task.uid()).await.succeeded();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1814,7 +1812,7 @@ async fn add_documents_with_geo_field() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
let (response, code) = index.get_all_documents(GetAllDocumentsOptions::default()).await; let (response, code) = index.get_all_documents(GetAllDocumentsOptions::default()).await;
@ -1919,11 +1917,11 @@ async fn update_documents_with_geo_field() {
let (task, _status_code) = index.add_documents(documents, None).await; let (task, _status_code) = index.add_documents(documents, None).await;
let response = index.wait_task(task.uid()).await.succeeded(); let response = index.wait_task(task.uid()).await.succeeded();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -1938,7 +1936,7 @@ async fn update_documents_with_geo_field() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
let (response, code) = index.search_post(json!({"sort": ["_geoPoint(10,0):asc"]})).await; let (response, code) = index.search_post(json!({"sort": ["_geoPoint(10,0):asc"]})).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
@ -1988,11 +1986,11 @@ async fn update_documents_with_geo_field() {
]); ]);
let (task, _status_code) = index.update_documents(updated_documents, None).await; let (task, _status_code) = index.update_documents(updated_documents, None).await;
let response = index.wait_task(task.uid()).await.succeeded(); let response = index.wait_task(task.uid()).await.succeeded();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 2, "uid": "[uid]",
"batchUid": 2, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2104,11 +2102,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".indexUid" => "[uuid]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".indexUid" => "[uuid]" }),
@r###" @r#"
{ {
"uid": 2, "uid": "[uid]",
"batchUid": 2, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2128,7 +2126,7 @@ async fn add_documents_invalid_geo_field() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
// _geo is an object but is missing both the lat and lng // _geo is an object but is missing both the lat and lng
let documents = json!([ let documents = json!([
@ -2142,11 +2140,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 3, "uid": "[uid]",
"batchUid": 3, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2180,11 +2178,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 4, "uid": "[uid]",
"batchUid": 4, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2218,11 +2216,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 5, "uid": "[uid]",
"batchUid": 5, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2256,11 +2254,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 6, "uid": "[uid]",
"batchUid": 6, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2294,11 +2292,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 7, "uid": "[uid]",
"batchUid": 7, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2332,11 +2330,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 8, "uid": "[uid]",
"batchUid": 8, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2370,11 +2368,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 9, "uid": "[uid]",
"batchUid": 9, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2408,11 +2406,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 10, "uid": "[uid]",
"batchUid": 10, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2446,11 +2444,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 11, "uid": "[uid]",
"batchUid": 11, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2484,11 +2482,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 12, "uid": "[uid]",
"batchUid": 12, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2522,11 +2520,11 @@ async fn add_documents_invalid_geo_field() {
index.wait_task(task.uid()).await.failed(); index.wait_task(task.uid()).await.failed();
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
snapshot!(code, @"200 OK"); snapshot!(code, @"200 OK");
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 13, "uid": "[uid]",
"batchUid": 13, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2561,11 +2559,11 @@ async fn add_documents_invalid_geo_field() {
let (response, code) = index.add_documents(documents, None).await; let (response, code) = index.add_documents(documents, None).await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
let response = index.wait_task(response.uid()).await.failed(); let response = index.wait_task(response.uid()).await.failed();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 14, "uid": "[uid]",
"batchUid": 14, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2598,11 +2596,11 @@ async fn add_documents_invalid_geo_field() {
let (response, code) = index.add_documents(documents, None).await; let (response, code) = index.add_documents(documents, None).await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
let response = index.wait_task(response.uid()).await.failed(); let response = index.wait_task(response.uid()).await.failed();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 15, "uid": "[uid]",
"batchUid": 15, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2635,11 +2633,11 @@ async fn add_documents_invalid_geo_field() {
let (response, code) = index.add_documents(documents, None).await; let (response, code) = index.add_documents(documents, None).await;
snapshot!(code, @"202 Accepted"); snapshot!(code, @"202 Accepted");
let response = index.wait_task(response.uid()).await.failed(); let response = index.wait_task(response.uid()).await.failed();
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 16, "uid": "[uid]",
"batchUid": 16, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2773,11 +2771,11 @@ async fn error_primary_key_inference() {
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
assert_eq!(code, 200); assert_eq!(code, 200);
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r#"
{ {
"uid": 0, "uid": "[uid]",
"batchUid": 0, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2797,7 +2795,7 @@ async fn error_primary_key_inference() {
"startedAt": "[date]", "startedAt": "[date]",
"finishedAt": "[date]" "finishedAt": "[date]"
} }
"###); "#);
let documents = json!([ let documents = json!([
{ {
@ -2814,11 +2812,11 @@ async fn error_primary_key_inference() {
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
assert_eq!(code, 200); assert_eq!(code, 200);
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 1, "uid": "[uid]",
"batchUid": 1, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "failed", "status": "failed",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",
@ -2853,11 +2851,11 @@ async fn error_primary_key_inference() {
let (response, code) = index.get_task(task.uid()).await; let (response, code) = index.get_task(task.uid()).await;
assert_eq!(code, 200); assert_eq!(code, 200);
snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), snapshot!(json_string!(response, { ".uid" => "[uid]", ".batchUid" => "[batch_uid]", ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }),
@r###" @r###"
{ {
"uid": 2, "uid": "[uid]",
"batchUid": 2, "batchUid": "[batch_uid]",
"indexUid": "[uuid]", "indexUid": "[uuid]",
"status": "succeeded", "status": "succeeded",
"type": "documentAdditionOrUpdate", "type": "documentAdditionOrUpdate",