Switch from "impl Responder" to Result<> response
This commit is contained in:
parent
a17a9868fa
commit
09c50411d1
3 changed files with 99 additions and 133 deletions
src/handlers/v1
|
|
@ -1,7 +1,7 @@
|
|||
use std::borrow::Borrow;
|
||||
use std::convert::TryFrom;
|
||||
|
||||
use actix_web::{delete, get, post, put, web, HttpResponse, Responder};
|
||||
use actix_web::{delete, get, post, put, web, HttpResponse};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::pool::PoolConnection;
|
||||
use sqlx::{Pool, Sqlite};
|
||||
|
|
@ -10,7 +10,7 @@ use crate::db::errors::DatabaseError;
|
|||
use crate::db::models::{Periods, Schedule};
|
||||
use crate::db::schedules::*;
|
||||
use crate::db::tag::get_tag;
|
||||
use crate::handlers::errors::HandlerError;
|
||||
use crate::handlers::errors::ApiError;
|
||||
use crate::return_models::ReturnSchedule;
|
||||
use crate::types::EmgauwaUid;
|
||||
use crate::utils::vec_has_error;
|
||||
|
|
@ -23,19 +23,10 @@ pub struct RequestSchedule {
|
|||
}
|
||||
|
||||
#[get("/api/v1/schedules")]
|
||||
pub async fn index(pool: web::Data<Pool<Sqlite>>) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
pub async fn index(pool: web::Data<Pool<Sqlite>>) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let schedules = get_schedules(&mut pool_conn).await;
|
||||
|
||||
if let Err(err) = schedules {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let schedules = schedules.unwrap();
|
||||
let schedules = get_schedules(&mut pool_conn).await?;
|
||||
|
||||
let mut return_schedules: Vec<ReturnSchedule> =
|
||||
schedules.iter().map(ReturnSchedule::from).collect();
|
||||
|
|
@ -43,91 +34,60 @@ pub async fn index(pool: web::Data<Pool<Sqlite>>) -> impl Responder {
|
|||
schedule.load_tags(&mut pool_conn);
|
||||
}
|
||||
|
||||
HttpResponse::Ok().json(return_schedules)
|
||||
Ok(HttpResponse::Ok().json(return_schedules))
|
||||
}
|
||||
|
||||
#[get("/api/v1/schedules/tag/{tag}")]
|
||||
pub async fn tagged(pool: web::Data<Pool<Sqlite>>, path: web::Path<(String,)>) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
pub async fn tagged(
|
||||
pool: web::Data<Pool<Sqlite>>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let (tag,) = path.into_inner();
|
||||
let tag_db = get_tag(&mut pool_conn, &tag).await;
|
||||
if let Err(err) = tag_db {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let tag_db = tag_db.unwrap();
|
||||
let tag_db = get_tag(&mut pool_conn, &tag).await?;
|
||||
|
||||
let schedules = get_schedules_by_tag(&mut pool_conn, &tag_db).await;
|
||||
if let Err(err) = schedules {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let schedules = schedules.unwrap();
|
||||
let schedules = get_schedules_by_tag(&mut pool_conn, &tag_db).await?;
|
||||
|
||||
let mut return_schedules: Vec<ReturnSchedule> =
|
||||
schedules.iter().map(ReturnSchedule::from).collect();
|
||||
for schedule in return_schedules.iter_mut() {
|
||||
schedule.load_tags(&mut pool_conn);
|
||||
}
|
||||
HttpResponse::Ok().json(return_schedules)
|
||||
Ok(HttpResponse::Ok().json(return_schedules))
|
||||
}
|
||||
|
||||
#[get("/api/v1/schedules/{schedule_id}")]
|
||||
pub async fn show(pool: web::Data<Pool<Sqlite>>, path: web::Path<(String,)>) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
pub async fn show(
|
||||
pool: web::Data<Pool<Sqlite>>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let (schedule_uid,) = path.into_inner();
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(HandlerError::BadUid));
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
|
||||
|
||||
match emgauwa_uid {
|
||||
Ok(uid) => {
|
||||
let schedule = get_schedule_by_uid(&mut pool_conn, &uid).await;
|
||||
match schedule {
|
||||
Ok(ok) => {
|
||||
let mut return_schedule = ReturnSchedule::from(ok);
|
||||
return_schedule.load_tags(&mut pool_conn);
|
||||
HttpResponse::Ok().json(return_schedule)
|
||||
}
|
||||
Err(err) => HttpResponse::from(err),
|
||||
}
|
||||
}
|
||||
Err(err) => HttpResponse::from(err),
|
||||
}
|
||||
let schedule = get_schedule_by_uid(&mut pool_conn, &emgauwa_uid).await?;
|
||||
|
||||
let mut return_schedule = ReturnSchedule::from(schedule);
|
||||
return_schedule.load_tags(&mut pool_conn);
|
||||
Ok(HttpResponse::Ok().json(return_schedule))
|
||||
}
|
||||
|
||||
#[post("/api/v1/schedules")]
|
||||
pub async fn add(
|
||||
pool: web::Data<Pool<Sqlite>>,
|
||||
data: web::Json<RequestSchedule>,
|
||||
) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let new_schedule = create_schedule(&mut pool_conn, &data.name, &data.periods).await;
|
||||
let new_schedule = create_schedule(&mut pool_conn, &data.name, &data.periods).await?;
|
||||
|
||||
if let Err(err) = new_schedule {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let new_schedule = new_schedule.unwrap();
|
||||
|
||||
let result = set_schedule_tags(&mut pool_conn, &new_schedule, data.tags.as_slice()).await;
|
||||
if let Err(err) = result {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
set_schedule_tags(&mut pool_conn, &new_schedule, data.tags.as_slice()).await?;
|
||||
|
||||
let mut return_schedule = ReturnSchedule::from(new_schedule);
|
||||
return_schedule.load_tags(&mut pool_conn);
|
||||
HttpResponse::Created().json(return_schedule)
|
||||
Ok(HttpResponse::Created().json(return_schedule))
|
||||
}
|
||||
|
||||
async fn add_list_single(
|
||||
|
|
@ -146,12 +106,8 @@ async fn add_list_single(
|
|||
pub async fn add_list(
|
||||
pool: web::Data<Pool<Sqlite>>,
|
||||
data: web::Json<Vec<RequestSchedule>>,
|
||||
) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let result: Vec<Result<Schedule, DatabaseError>> = data
|
||||
.as_slice()
|
||||
|
|
@ -162,13 +118,13 @@ pub async fn add_list(
|
|||
.collect();
|
||||
|
||||
match vec_has_error(&result) {
|
||||
true => HttpResponse::from(
|
||||
true => Ok(HttpResponse::from(
|
||||
result
|
||||
.into_iter()
|
||||
.find(|r| r.is_err())
|
||||
.unwrap()
|
||||
.unwrap_err(),
|
||||
),
|
||||
)),
|
||||
false => {
|
||||
let mut return_schedules: Vec<ReturnSchedule> = result
|
||||
.iter()
|
||||
|
|
@ -178,7 +134,7 @@ pub async fn add_list(
|
|||
for schedule in return_schedules.iter_mut() {
|
||||
schedule.load_tags(&mut pool_conn);
|
||||
}
|
||||
HttpResponse::Created().json(return_schedules)
|
||||
Ok(HttpResponse::Created().json(return_schedules))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -188,25 +144,13 @@ pub async fn update(
|
|||
pool: web::Data<Pool<Sqlite>>,
|
||||
path: web::Path<(String,)>,
|
||||
data: web::Json<RequestSchedule>,
|
||||
) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let (schedule_uid,) = path.into_inner();
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(HandlerError::BadUid));
|
||||
if let Err(err) = emgauwa_uid {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let emgauwa_uid = emgauwa_uid.unwrap();
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
|
||||
|
||||
let schedule = get_schedule_by_uid(&mut pool_conn, &emgauwa_uid).await;
|
||||
if let Err(err) = schedule {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let schedule = schedule.unwrap();
|
||||
let schedule = get_schedule_by_uid(&mut pool_conn, &emgauwa_uid).await?;
|
||||
|
||||
let schedule = update_schedule(
|
||||
&mut pool_conn,
|
||||
|
|
@ -214,42 +158,31 @@ pub async fn update(
|
|||
data.name.as_str(),
|
||||
data.periods.borrow(),
|
||||
)
|
||||
.await;
|
||||
if let Err(err) = schedule {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
let schedule = schedule.unwrap();
|
||||
.await?;
|
||||
|
||||
let result = set_schedule_tags(&mut pool_conn, &schedule, data.tags.as_slice()).await;
|
||||
if let Err(err) = result {
|
||||
return HttpResponse::from(err);
|
||||
}
|
||||
set_schedule_tags(&mut pool_conn, &schedule, data.tags.as_slice()).await?;
|
||||
|
||||
let mut return_schedule = ReturnSchedule::from(schedule);
|
||||
return_schedule.load_tags(&mut pool_conn);
|
||||
HttpResponse::Ok().json(return_schedule)
|
||||
Ok(HttpResponse::Ok().json(return_schedule))
|
||||
}
|
||||
|
||||
#[delete("/api/v1/schedules/{schedule_id}")]
|
||||
pub async fn delete(pool: web::Data<Pool<Sqlite>>, path: web::Path<(String,)>) -> impl Responder {
|
||||
let pool_conn = pool.acquire().await;
|
||||
if let Err(err) = pool_conn {
|
||||
return HttpResponse::from(DatabaseError::from(err));
|
||||
}
|
||||
let mut pool_conn = pool_conn.unwrap();
|
||||
pub async fn delete(
|
||||
pool: web::Data<Pool<Sqlite>>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<HttpResponse, ApiError> {
|
||||
let mut pool_conn = pool.acquire().await?;
|
||||
|
||||
let (schedule_uid,) = path.into_inner();
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(HandlerError::BadUid));
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(ApiError::BadUid))?;
|
||||
|
||||
match emgauwa_uid {
|
||||
Ok(uid) => match uid {
|
||||
EmgauwaUid::Off => HttpResponse::from(HandlerError::ProtectedSchedule),
|
||||
EmgauwaUid::On => HttpResponse::from(HandlerError::ProtectedSchedule),
|
||||
EmgauwaUid::Any(_) => match delete_schedule_by_uid(&mut pool_conn, uid).await {
|
||||
Ok(_) => HttpResponse::Ok().json("schedule got deleted"),
|
||||
Err(err) => HttpResponse::from(err),
|
||||
},
|
||||
},
|
||||
Err(err) => HttpResponse::from(err),
|
||||
EmgauwaUid::Off => Err(ApiError::ProtectedSchedule),
|
||||
EmgauwaUid::On => Err(ApiError::ProtectedSchedule),
|
||||
EmgauwaUid::Any(_) => {
|
||||
delete_schedule_by_uid(&mut pool_conn, emgauwa_uid).await?;
|
||||
Ok(HttpResponse::Ok().json("schedule got deleted"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue