mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-29 08:35:15 +08:00
Remove the /indexes/:indexUid/tasks/... routes
This commit is contained in:
parent
d2f457a076
commit
80f7d87356
@ -15,7 +15,6 @@ use crate::task::SummarizedTaskView;
|
|||||||
pub mod documents;
|
pub mod documents;
|
||||||
pub mod search;
|
pub mod search;
|
||||||
pub mod settings;
|
pub mod settings;
|
||||||
pub mod tasks;
|
|
||||||
|
|
||||||
pub fn configure(cfg: &mut web::ServiceConfig) {
|
pub fn configure(cfg: &mut web::ServiceConfig) {
|
||||||
cfg.service(
|
cfg.service(
|
||||||
@ -34,7 +33,6 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
|
|||||||
.service(web::resource("/stats").route(web::get().to(SeqHandler(get_index_stats))))
|
.service(web::resource("/stats").route(web::get().to(SeqHandler(get_index_stats))))
|
||||||
.service(web::scope("/documents").configure(documents::configure))
|
.service(web::scope("/documents").configure(documents::configure))
|
||||||
.service(web::scope("/search").configure(search::configure))
|
.service(web::scope("/search").configure(search::configure))
|
||||||
.service(web::scope("/tasks").configure(tasks::configure))
|
|
||||||
.service(web::scope("/settings").configure(settings::configure)),
|
.service(web::scope("/settings").configure(settings::configure)),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -1,80 +0,0 @@
|
|||||||
use actix_web::{web, HttpRequest, HttpResponse};
|
|
||||||
use log::debug;
|
|
||||||
use meilisearch_error::ResponseError;
|
|
||||||
use meilisearch_lib::MeiliSearch;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
use serde_json::json;
|
|
||||||
use time::OffsetDateTime;
|
|
||||||
|
|
||||||
use crate::analytics::Analytics;
|
|
||||||
use crate::extractors::authentication::{policies::*, GuardedData};
|
|
||||||
use crate::extractors::sequential_extractor::SeqHandler;
|
|
||||||
use crate::task::{TaskListView, TaskView};
|
|
||||||
|
|
||||||
pub fn configure(cfg: &mut web::ServiceConfig) {
|
|
||||||
cfg.service(web::resource("").route(web::get().to(SeqHandler(get_all_tasks_status))))
|
|
||||||
.service(web::resource("{task_id}").route(web::get().to(SeqHandler(get_task_status))));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct UpdateIndexResponse {
|
|
||||||
name: String,
|
|
||||||
uid: String,
|
|
||||||
#[serde(serialize_with = "time::serde::rfc3339::serialize")]
|
|
||||||
created_at: OffsetDateTime,
|
|
||||||
#[serde(serialize_with = "time::serde::rfc3339::serialize")]
|
|
||||||
updated_at: OffsetDateTime,
|
|
||||||
#[serde(serialize_with = "time::serde::rfc3339::serialize")]
|
|
||||||
primary_key: OffsetDateTime,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct UpdateParam {
|
|
||||||
index_uid: String,
|
|
||||||
task_id: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_task_status(
|
|
||||||
meilisearch: GuardedData<ActionPolicy<{ actions::TASKS_GET }>, MeiliSearch>,
|
|
||||||
index_uid: web::Path<UpdateParam>,
|
|
||||||
req: HttpRequest,
|
|
||||||
analytics: web::Data<dyn Analytics>,
|
|
||||||
) -> Result<HttpResponse, ResponseError> {
|
|
||||||
analytics.publish(
|
|
||||||
"Index Tasks Seen".to_string(),
|
|
||||||
json!({ "per_task_uid": true }),
|
|
||||||
Some(&req),
|
|
||||||
);
|
|
||||||
|
|
||||||
let UpdateParam { index_uid, task_id } = index_uid.into_inner();
|
|
||||||
|
|
||||||
let task: TaskView = meilisearch.get_index_task(index_uid, task_id).await?.into();
|
|
||||||
|
|
||||||
debug!("returns: {:?}", task);
|
|
||||||
Ok(HttpResponse::Ok().json(task))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_all_tasks_status(
|
|
||||||
meilisearch: GuardedData<ActionPolicy<{ actions::TASKS_GET }>, MeiliSearch>,
|
|
||||||
index_uid: web::Path<String>,
|
|
||||||
req: HttpRequest,
|
|
||||||
analytics: web::Data<dyn Analytics>,
|
|
||||||
) -> Result<HttpResponse, ResponseError> {
|
|
||||||
analytics.publish(
|
|
||||||
"Index Tasks Seen".to_string(),
|
|
||||||
json!({ "per_task_uid": false }),
|
|
||||||
Some(&req),
|
|
||||||
);
|
|
||||||
|
|
||||||
let tasks: TaskListView = meilisearch
|
|
||||||
.list_index_task(index_uid.into_inner(), None, None)
|
|
||||||
.await?
|
|
||||||
.into_iter()
|
|
||||||
.map(TaskView::from)
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.into();
|
|
||||||
|
|
||||||
debug!("returns: {:?}", tasks);
|
|
||||||
Ok(HttpResponse::Ok().json(tasks))
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user