add the batch_id to the tasks

crates/meilisearch/src/routes/batches.rs

@@ -0,0 +1,48 @@
+use actix_web::{
+    web::{self, Data},
+    HttpResponse,
+};
+use index_scheduler::{IndexScheduler, Query};
+use meilisearch_types::{
+    batches::BatchId, error::ResponseError, keys::actions, task_view::TaskView,
+};
+
+use crate::extractors::{authentication::GuardedData, sequential_extractor::SeqHandler};
+
+use super::ActionPolicy;
+
+pub fn configure(cfg: &mut web::ServiceConfig) {
+    cfg
+        // .service(
+        //     web::resource("")
+        //         .route(web::get().to(SeqHandler(get_tasks)))
+        // )
+        .service(web::resource("/{batch_id}").route(web::get().to(SeqHandler(get_batch))));
+}
+
+async fn get_task(
+    index_scheduler: GuardedData<ActionPolicy<{ actions::TASKS_GET }>, Data<IndexScheduler>>,
+    batch_uid: web::Path<String>,
+) -> Result<HttpResponse, ResponseError> {
+    let batch_uid_string = batch_uid.into_inner();
+
+    let batch_uid: BatchId = match batch_uid_string.parse() {
+        Ok(id) => id,
+        Err(_e) => {
+            return Err(
+                index_scheduler::Error::InvalidBatchUid { batch_uid: batch_uid_string }.into()
+            )
+        }
+    };
+
+    let query = index_scheduler::Query { uids: Some(vec![batch_uid]), ..Query::default() };
+    let filters = index_scheduler.filters();
+    let (tasks, _) = index_scheduler.get_tasks_from_authorized_indexes(query, filters)?;
+
+    if let Some(task) = tasks.first() {
+        let task_view = TaskView::from_task(task);
+        Ok(HttpResponse::Ok().json(task_view))
+    } else {
+        Err(index_scheduler::Error::TaskNotFound(batch_uid).into())
+    }
+}

crates/meilisearch/src/routes/mod.rs

@@ -19,6 +19,7 @@ use crate::Opt;
 const PAGINATION_DEFAULT_LIMIT: usize = 20;
 
 mod api_key;
+pub mod batches;
 mod dump;
 pub mod features;
 pub mod indexes;

crates/meilisearch/src/routes/tasks.rs

@@ -17,15 +17,13 @@ use time::macros::format_description;
 use time::{Date, Duration, OffsetDateTime, Time};
 use tokio::task;
 
-use super::{get_task_id, is_dry_run, SummarizedTaskView};
+use super::{get_task_id, is_dry_run, SummarizedTaskView, PAGINATION_DEFAULT_LIMIT};
 use crate::analytics::{Aggregate, AggregateMethod, Analytics};
 use crate::extractors::authentication::policies::*;
 use crate::extractors::authentication::GuardedData;
 use crate::extractors::sequential_extractor::SeqHandler;
 use crate::{aggregate_methods, Opt};
 
-const DEFAULT_LIMIT: u32 = 20;
-
 pub fn configure(cfg: &mut web::ServiceConfig) {
     cfg.service(
         web::resource("")
@@ -35,10 +33,11 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
     .service(web::resource("/cancel").route(web::post().to(SeqHandler(cancel_tasks))))
     .service(web::resource("/{task_id}").route(web::get().to(SeqHandler(get_task))));
 }
+
 #[derive(Debug, Deserr)]
 #[deserr(error = DeserrQueryParamError, rename_all = camelCase, deny_unknown_fields)]
 pub struct TasksFilterQuery {
-    #[deserr(default = Param(DEFAULT_LIMIT), error = DeserrQueryParamError<InvalidTaskLimit>)]
+    #[deserr(default = Param(PAGINATION_DEFAULT_LIMIT as u32), error = DeserrQueryParamError<InvalidTaskLimit>)]
     pub limit: Param<u32>,
     #[deserr(default, error = DeserrQueryParamError<InvalidTaskFrom>)]
     pub from: Option<Param<TaskId>>,
@@ -363,7 +362,7 @@ async fn get_task(
     let task_uid: TaskId = match task_uid_string.parse() {
         Ok(id) => id,
         Err(_e) => {
-            return Err(index_scheduler::Error::InvalidTaskUids { task_uid: task_uid_string }.into())
+            return Err(index_scheduler::Error::InvalidTaskUid { task_uid: task_uid_string }.into())
         }
     };