Run 'cargo fmt' to format code (#489)
This commit is contained in:
committed by
Baptiste Gelez
parent
732f514da7
commit
b945d1f602
+61
-25
@@ -5,43 +5,79 @@ use scheduled_thread_pool::ScheduledThreadPool;
|
||||
use serde_json;
|
||||
use serde_qs;
|
||||
|
||||
use api::authorization::*;
|
||||
use plume_api::posts::PostEndpoint;
|
||||
use plume_models::{
|
||||
Connection,
|
||||
db_conn::DbConn,
|
||||
posts::Post,
|
||||
search::Searcher as UnmanagedSearcher,
|
||||
db_conn::DbConn, posts::Post, search::Searcher as UnmanagedSearcher, Connection,
|
||||
};
|
||||
use api::authorization::*;
|
||||
use {Searcher, Worker};
|
||||
|
||||
#[get("/posts/<id>")]
|
||||
pub fn get(id: i32, conn: DbConn, worker: Worker, auth: Option<Authorization<Read, Post>>, search: Searcher) -> Json<serde_json::Value> {
|
||||
let post = <Post as Provider<(&Connection, &ScheduledThreadPool, &UnmanagedSearcher, Option<i32>)>>
|
||||
::get(&(&*conn, &worker, &search, auth.map(|a| a.0.user_id)), id).ok();
|
||||
pub fn get(
|
||||
id: i32,
|
||||
conn: DbConn,
|
||||
worker: Worker,
|
||||
auth: Option<Authorization<Read, Post>>,
|
||||
search: Searcher,
|
||||
) -> Json<serde_json::Value> {
|
||||
let post = <Post as Provider<(
|
||||
&Connection,
|
||||
&ScheduledThreadPool,
|
||||
&UnmanagedSearcher,
|
||||
Option<i32>,
|
||||
)>>::get(&(&*conn, &worker, &search, auth.map(|a| a.0.user_id)), id)
|
||||
.ok();
|
||||
Json(json!(post))
|
||||
}
|
||||
|
||||
#[get("/posts")]
|
||||
pub fn list(conn: DbConn, uri: &Origin, worker: Worker, auth: Option<Authorization<Read, Post>>, search: Searcher) -> Json<serde_json::Value> {
|
||||
let query: PostEndpoint = serde_qs::from_str(uri.query().unwrap_or("")).expect("api::list: invalid query error");
|
||||
let post = <Post as Provider<(&Connection, &ScheduledThreadPool, &UnmanagedSearcher, Option<i32>)>>
|
||||
::list(&(&*conn, &worker, &search, auth.map(|a| a.0.user_id)), query);
|
||||
pub fn list(
|
||||
conn: DbConn,
|
||||
uri: &Origin,
|
||||
worker: Worker,
|
||||
auth: Option<Authorization<Read, Post>>,
|
||||
search: Searcher,
|
||||
) -> Json<serde_json::Value> {
|
||||
let query: PostEndpoint =
|
||||
serde_qs::from_str(uri.query().unwrap_or("")).expect("api::list: invalid query error");
|
||||
let post = <Post as Provider<(
|
||||
&Connection,
|
||||
&ScheduledThreadPool,
|
||||
&UnmanagedSearcher,
|
||||
Option<i32>,
|
||||
)>>::list(
|
||||
&(&*conn, &worker, &search, auth.map(|a| a.0.user_id)),
|
||||
query,
|
||||
);
|
||||
Json(json!(post))
|
||||
}
|
||||
|
||||
#[post("/posts", data = "<payload>")]
|
||||
pub fn create(conn: DbConn, payload: Json<PostEndpoint>, worker: Worker, auth: Authorization<Write, Post>, search: Searcher) -> Json<serde_json::Value> {
|
||||
let new_post = <Post as Provider<(&Connection, &ScheduledThreadPool, &UnmanagedSearcher, Option<i32>)>>
|
||||
::create(&(&*conn, &worker, &search, Some(auth.0.user_id)), (*payload).clone());
|
||||
Json(new_post.map(|p| json!(p)).unwrap_or_else(|e| json!({
|
||||
"error": "Invalid data, couldn't create new post",
|
||||
"details": match e {
|
||||
ApiError::Fetch(msg) => msg,
|
||||
ApiError::SerDe(msg) => msg,
|
||||
ApiError::NotFound(msg) => msg,
|
||||
ApiError::Authorization(msg) => msg,
|
||||
}
|
||||
})))
|
||||
pub fn create(
|
||||
conn: DbConn,
|
||||
payload: Json<PostEndpoint>,
|
||||
worker: Worker,
|
||||
auth: Authorization<Write, Post>,
|
||||
search: Searcher,
|
||||
) -> Json<serde_json::Value> {
|
||||
let new_post = <Post as Provider<(
|
||||
&Connection,
|
||||
&ScheduledThreadPool,
|
||||
&UnmanagedSearcher,
|
||||
Option<i32>,
|
||||
)>>::create(
|
||||
&(&*conn, &worker, &search, Some(auth.0.user_id)),
|
||||
(*payload).clone(),
|
||||
);
|
||||
Json(new_post.map(|p| json!(p)).unwrap_or_else(|e| {
|
||||
json!({
|
||||
"error": "Invalid data, couldn't create new post",
|
||||
"details": match e {
|
||||
ApiError::Fetch(msg) => msg,
|
||||
ApiError::SerDe(msg) => msg,
|
||||
ApiError::NotFound(msg) => msg,
|
||||
ApiError::Authorization(msg) => msg,
|
||||
}
|
||||
})
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user