Add function and prefer .iter()
This commit is contained in:
parent
53c6fcd917
commit
e3adc35221
12 changed files with 117 additions and 67 deletions
src/handlers
|
@ -6,7 +6,7 @@ use serde::{Serialize, Serializer};
|
|||
#[derive(Debug)]
|
||||
pub enum HandlerError {
|
||||
BadUid,
|
||||
ProtectedSchedule
|
||||
ProtectedSchedule,
|
||||
}
|
||||
|
||||
impl HandlerError {
|
||||
|
@ -16,13 +16,12 @@ impl HandlerError {
|
|||
HandlerError::ProtectedSchedule => StatusCode::FORBIDDEN,
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Serialize for HandlerError {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
let mut s = serializer.serialize_struct("error", 2)?;
|
||||
s.serialize_field("code", &self.get_code().as_u16())?;
|
||||
|
|
|
@ -21,7 +21,7 @@ impl Serialize for EmgauwaJsonPayLoadError {
|
|||
"description",
|
||||
&match self {
|
||||
EmgauwaJsonPayLoadError::Error(err) => format!("{}", err),
|
||||
}
|
||||
},
|
||||
)?;
|
||||
s.end()
|
||||
}
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
use crate::db::errors::DatabaseError;
|
||||
use actix_web::{delete, get, post, put, web, HttpResponse, Responder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::borrow::Borrow;
|
||||
use std::convert::TryFrom;
|
||||
use actix_web::{HttpResponse, Responder, web, get, post, put, delete};
|
||||
use serde::{Serialize, Deserialize};
|
||||
|
||||
use crate::db::models::Periods;
|
||||
use crate::db::models::{Periods, Schedule};
|
||||
use crate::db::schedules::*;
|
||||
use crate::db::tag::get_tag;
|
||||
use crate::handlers::errors::HandlerError;
|
||||
use crate::return_models::ReturnSchedule;
|
||||
use crate::types::EmgauwaUid;
|
||||
use crate::utils::vec_has_error;
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct RequestSchedule {
|
||||
|
@ -20,27 +22,27 @@ pub struct RequestSchedule {
|
|||
#[get("/api/v1/schedules")]
|
||||
pub async fn index() -> impl Responder {
|
||||
let schedules = get_schedules();
|
||||
let return_schedules: Vec<ReturnSchedule> = schedules.into_iter().map(ReturnSchedule::from).collect();
|
||||
let return_schedules: Vec<ReturnSchedule> =
|
||||
schedules.iter().map(ReturnSchedule::from).collect();
|
||||
HttpResponse::Ok().json(return_schedules)
|
||||
}
|
||||
|
||||
#[get("/api/v1/schedules/tag/{tag}")]
|
||||
pub async fn tagged(web::Path((tag,)): web::Path<(String,)>) -> impl Responder {
|
||||
|
||||
let tag_db = get_tag(&tag);
|
||||
if tag_db.is_err() {
|
||||
return HttpResponse::from(tag_db.unwrap_err())
|
||||
return HttpResponse::from(tag_db.unwrap_err());
|
||||
}
|
||||
let tag_db = tag_db.unwrap();
|
||||
|
||||
let schedules = get_schedules_by_tag(&tag_db);
|
||||
let return_schedules: Vec<ReturnSchedule> = schedules.into_iter().map(ReturnSchedule::from).collect();
|
||||
let return_schedules: Vec<ReturnSchedule> =
|
||||
schedules.iter().map(ReturnSchedule::from).collect();
|
||||
HttpResponse::Ok().json(return_schedules)
|
||||
}
|
||||
|
||||
#[get("/api/v1/schedules/{schedule_id}")]
|
||||
pub async fn show(web::Path((schedule_uid,)): web::Path<(String,)>) -> impl Responder {
|
||||
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(HandlerError::BadUid));
|
||||
|
||||
match emgauwa_uid {
|
||||
|
@ -50,8 +52,8 @@ pub async fn show(web::Path((schedule_uid,)): web::Path<(String,)>) -> impl Resp
|
|||
Ok(ok) => HttpResponse::Ok().json(ReturnSchedule::from(ok)),
|
||||
Err(err) => HttpResponse::from(err),
|
||||
}
|
||||
},
|
||||
Err(err) => HttpResponse::from(err)
|
||||
}
|
||||
Err(err) => HttpResponse::from(err),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -60,7 +62,7 @@ pub async fn add(data: web::Json<RequestSchedule>) -> impl Responder {
|
|||
let new_schedule = create_schedule(&data.name, &data.periods);
|
||||
|
||||
if new_schedule.is_err() {
|
||||
return HttpResponse::from(new_schedule.unwrap_err())
|
||||
return HttpResponse::from(new_schedule.unwrap_err());
|
||||
}
|
||||
let new_schedule = new_schedule.unwrap();
|
||||
|
||||
|
@ -72,9 +74,43 @@ pub async fn add(data: web::Json<RequestSchedule>) -> impl Responder {
|
|||
HttpResponse::Created().json(ReturnSchedule::from(new_schedule))
|
||||
}
|
||||
|
||||
#[put("/api/v1/schedules/{schedule_id}")]
|
||||
pub async fn update(web::Path((schedule_uid,)): web::Path<(String,)>, data: web::Json<RequestSchedule>) -> impl Responder {
|
||||
#[post("/api/v1/schedules/list")]
|
||||
pub async fn add_list(data: web::Json<Vec<RequestSchedule>>) -> impl Responder {
|
||||
let result: Vec<Result<Schedule, DatabaseError>> = data
|
||||
.as_slice()
|
||||
.iter()
|
||||
.map(|request_schedule| {
|
||||
let new_schedule = create_schedule(&request_schedule.name, &request_schedule.periods)?;
|
||||
|
||||
set_schedule_tags(&new_schedule, request_schedule.tags.as_slice())?;
|
||||
|
||||
Ok(new_schedule)
|
||||
})
|
||||
.collect();
|
||||
|
||||
match vec_has_error(&result) {
|
||||
true => HttpResponse::from(
|
||||
result
|
||||
.into_iter()
|
||||
.find(|r| r.is_err())
|
||||
.unwrap()
|
||||
.unwrap_err(),
|
||||
),
|
||||
false => {
|
||||
let return_schedules: Vec<ReturnSchedule> = result
|
||||
.iter()
|
||||
.map(|s| ReturnSchedule::from(s.as_ref().unwrap()))
|
||||
.collect();
|
||||
HttpResponse::Created().json(return_schedules)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[put("/api/v1/schedules/{schedule_id}")]
|
||||
pub async fn update(
|
||||
web::Path((schedule_uid,)): web::Path<(String,)>,
|
||||
data: web::Json<RequestSchedule>,
|
||||
) -> impl Responder {
|
||||
let emgauwa_uid = EmgauwaUid::try_from(schedule_uid.as_str()).or(Err(HandlerError::BadUid));
|
||||
if emgauwa_uid.is_err() {
|
||||
return HttpResponse::from(emgauwa_uid.unwrap_err());
|
||||
|
@ -109,13 +145,11 @@ pub async fn delete(web::Path((schedule_uid,)): web::Path<(String,)>) -> impl Re
|
|||
Ok(uid) => match uid {
|
||||
EmgauwaUid::Off => HttpResponse::from(HandlerError::ProtectedSchedule),
|
||||
EmgauwaUid::On => HttpResponse::from(HandlerError::ProtectedSchedule),
|
||||
EmgauwaUid::Any(_) => {
|
||||
match delete_schedule_by_uid(uid) {
|
||||
Ok(_) => HttpResponse::Ok().json("schedule got deleted"),
|
||||
Err(err) => HttpResponse::from(err)
|
||||
}
|
||||
}
|
||||
EmgauwaUid::Any(_) => match delete_schedule_by_uid(uid) {
|
||||
Ok(_) => HttpResponse::Ok().json("schedule got deleted"),
|
||||
Err(err) => HttpResponse::from(err),
|
||||
},
|
||||
},
|
||||
Err(err) => HttpResponse::from(err)
|
||||
Err(err) => HttpResponse::from(err),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue