From ed51df41e5c9455a975f331c01906fa2fb97c463 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 16 Nov 2022 14:28:30 +0100 Subject: [PATCH 1/2] Add the question mark to the task deletion query filter --- meilisearch-http/src/routes/tasks.rs | 2 +- meilisearch-http/tests/tasks/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch-http/src/routes/tasks.rs b/meilisearch-http/src/routes/tasks.rs index 71c774672..5b1d99499 100644 --- a/meilisearch-http/src/routes/tasks.rs +++ b/meilisearch-http/src/routes/tasks.rs @@ -537,7 +537,7 @@ async fn delete_tasks( &index_scheduler.filters().search_rules.authorized_indexes(), )?; let task_deletion = - KindWithContent::TaskDeletion { query: req.query_string().to_string(), tasks }; + KindWithContent::TaskDeletion { query: format!("?{}", req.query_string()), tasks }; let task = task::spawn_blocking(move || index_scheduler.register(task_deletion)).await??; let task: SummarizedTaskView = task.into(); diff --git a/meilisearch-http/tests/tasks/mod.rs b/meilisearch-http/tests/tasks/mod.rs index 145bb1b01..2e9310955 100644 --- a/meilisearch-http/tests/tasks/mod.rs +++ b/meilisearch-http/tests/tasks/mod.rs @@ -837,7 +837,7 @@ async fn test_summarized_task_deletion() { "details": { "matchedTasks": 1, "deletedTasks": 1, - "originalFilters": "uids=0" + "originalFilters": "?uids=0" }, "error": null, "duration": "[duration]", From 3525c964a7888357d23eb3163d7f49f73f22d658 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 16 Nov 2022 14:30:35 +0100 Subject: [PATCH 2/2] Add the question mark to the task cancelation query filter --- meilisearch-http/src/routes/tasks.rs | 2 +- meilisearch-http/tests/tasks/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meilisearch-http/src/routes/tasks.rs b/meilisearch-http/src/routes/tasks.rs index 5b1d99499..eb5a237c4 100644 --- a/meilisearch-http/src/routes/tasks.rs +++ b/meilisearch-http/src/routes/tasks.rs @@ -485,7 +485,7 @@ async fn cancel_tasks( &index_scheduler.filters().search_rules.authorized_indexes(), )?; let task_cancelation = - KindWithContent::TaskCancelation { query: req.query_string().to_string(), tasks }; + KindWithContent::TaskCancelation { query: format!("?{}", req.query_string()), tasks }; let task = task::spawn_blocking(move || index_scheduler.register(task_cancelation)).await??; let task: SummarizedTaskView = task.into(); diff --git a/meilisearch-http/tests/tasks/mod.rs b/meilisearch-http/tests/tasks/mod.rs index 2e9310955..562ab896c 100644 --- a/meilisearch-http/tests/tasks/mod.rs +++ b/meilisearch-http/tests/tasks/mod.rs @@ -804,7 +804,7 @@ async fn test_summarized_task_cancelation() { "details": { "matchedTasks": 1, "canceledTasks": 0, - "originalFilters": "uids=0" + "originalFilters": "?uids=0" }, "error": null, "duration": "[duration]",