Refactor errors and some other stuff/fixes
This commit is contained in:
parent
8d996888bd
commit
5a7b2de0ea
28 changed files with 507 additions and 341 deletions
emgauwa-lib/src/errors
25
emgauwa-lib/src/errors/api_error.rs
Normal file
25
emgauwa-lib/src/errors/api_error.rs
Normal file
|
@ -0,0 +1,25 @@
|
|||
use actix_web::http::StatusCode;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum ApiError {
|
||||
ProtectedSchedule,
|
||||
InternalError(String),
|
||||
}
|
||||
|
||||
impl ApiError {
|
||||
pub fn get_code(&self) -> StatusCode {
|
||||
match self {
|
||||
ApiError::ProtectedSchedule => StatusCode::FORBIDDEN,
|
||||
ApiError::InternalError(_) => StatusCode::INTERNAL_SERVER_ERROR,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&ApiError> for String {
|
||||
fn from(err: &ApiError) -> Self {
|
||||
match err {
|
||||
ApiError::ProtectedSchedule => String::from("the targeted schedule is protected"),
|
||||
ApiError::InternalError(msg) => msg.clone(),
|
||||
}
|
||||
}
|
||||
}
|
74
emgauwa-lib/src/errors/database_error.rs
Normal file
74
emgauwa-lib/src/errors/database_error.rs
Normal file
|
@ -0,0 +1,74 @@
|
|||
use actix_web::http::StatusCode;
|
||||
use actix_web::HttpResponse;
|
||||
use serde::ser::SerializeStruct;
|
||||
use serde::{Serialize, Serializer};
|
||||
use sqlx::Error;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum DatabaseError {
|
||||
DeleteError,
|
||||
InsertError,
|
||||
InsertGetError,
|
||||
NotFound,
|
||||
Protected,
|
||||
UpdateError,
|
||||
UpdateGetError,
|
||||
Unknown(String),
|
||||
}
|
||||
|
||||
impl DatabaseError {
|
||||
pub fn get_code(&self) -> StatusCode {
|
||||
match self {
|
||||
DatabaseError::NotFound => StatusCode::NOT_FOUND,
|
||||
DatabaseError::Protected => StatusCode::FORBIDDEN,
|
||||
_ => StatusCode::INTERNAL_SERVER_ERROR,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Serialize for DatabaseError {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
let mut s = serializer.serialize_struct("error", 3)?;
|
||||
s.serialize_field("type", "database-error")?;
|
||||
s.serialize_field("code", &self.get_code().as_u16())?;
|
||||
s.serialize_field("description", &String::from(self))?;
|
||||
s.end()
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&DatabaseError> for String {
|
||||
fn from(err: &DatabaseError) -> Self {
|
||||
String::from(match err {
|
||||
DatabaseError::InsertError => "error on inserting into database",
|
||||
DatabaseError::InsertGetError => {
|
||||
"error on retrieving new entry from database (your entry was saved)"
|
||||
}
|
||||
DatabaseError::NotFound => "model was not found in database",
|
||||
DatabaseError::DeleteError => "error on deleting from database",
|
||||
DatabaseError::Protected => "model is protected",
|
||||
DatabaseError::UpdateError => "error on updating the model",
|
||||
DatabaseError::UpdateGetError => {
|
||||
"error on retrieving updated model from database (your entry was saved)"
|
||||
}
|
||||
DatabaseError::Unknown(_) => "unknown error",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl From<DatabaseError> for HttpResponse {
|
||||
fn from(err: DatabaseError) -> Self {
|
||||
HttpResponse::build(err.get_code()).json(err)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Error> for DatabaseError {
|
||||
fn from(value: Error) -> Self {
|
||||
match value {
|
||||
Error::RowNotFound => DatabaseError::NotFound,
|
||||
_ => DatabaseError::Unknown(value.to_string()),
|
||||
}
|
||||
}
|
||||
}
|
107
emgauwa-lib/src/errors/emgauwa_error.rs
Normal file
107
emgauwa-lib/src/errors/emgauwa_error.rs
Normal file
|
@ -0,0 +1,107 @@
|
|||
use std::fmt::{Debug, Display, Formatter};
|
||||
|
||||
use actix_web::http::StatusCode;
|
||||
use actix_web::HttpResponse;
|
||||
use serde::ser::SerializeStruct;
|
||||
use serde::{Serialize, Serializer};
|
||||
|
||||
use crate::errors::{ApiError, DatabaseError};
|
||||
|
||||
pub enum EmgauwaError {
|
||||
Api(ApiError),
|
||||
Uid(uuid::Error),
|
||||
Serialization(serde_json::Error),
|
||||
Database(DatabaseError),
|
||||
}
|
||||
|
||||
impl EmgauwaError {
|
||||
fn get_code(&self) -> StatusCode {
|
||||
match self {
|
||||
EmgauwaError::Api(err) => err.get_code(),
|
||||
EmgauwaError::Serialization(_) => StatusCode::INTERNAL_SERVER_ERROR,
|
||||
EmgauwaError::Database(err) => err.get_code(),
|
||||
EmgauwaError::Uid(_) => StatusCode::BAD_REQUEST,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&EmgauwaError> for String {
|
||||
fn from(err: &EmgauwaError) -> Self {
|
||||
match err {
|
||||
EmgauwaError::Api(err) => String::from(err),
|
||||
EmgauwaError::Serialization(_) => String::from("error during (de-)serialization"),
|
||||
EmgauwaError::Database(err) => String::from(err),
|
||||
EmgauwaError::Uid(_) => String::from("the uid is in a bad format"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ApiError> for EmgauwaError {
|
||||
fn from(value: ApiError) -> Self {
|
||||
EmgauwaError::Api(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<DatabaseError> for EmgauwaError {
|
||||
fn from(value: DatabaseError) -> Self {
|
||||
EmgauwaError::Database(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<serde_json::Error> for EmgauwaError {
|
||||
fn from(value: serde_json::Error) -> Self {
|
||||
EmgauwaError::Serialization(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<sqlx::Error> for EmgauwaError {
|
||||
fn from(value: sqlx::Error) -> Self {
|
||||
EmgauwaError::Database(DatabaseError::from(value))
|
||||
}
|
||||
}
|
||||
|
||||
impl From<uuid::Error> for EmgauwaError {
|
||||
fn from(value: uuid::Error) -> Self {
|
||||
EmgauwaError::Uid(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&EmgauwaError> for HttpResponse {
|
||||
fn from(err: &EmgauwaError) -> Self {
|
||||
HttpResponse::build(err.get_code()).json(err)
|
||||
}
|
||||
}
|
||||
|
||||
impl Serialize for EmgauwaError {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where
|
||||
S: Serializer,
|
||||
{
|
||||
let mut s = serializer.serialize_struct("error", 2)?;
|
||||
s.serialize_field("code", &self.get_code().as_u16())?;
|
||||
s.serialize_field("description", &String::from(self))?;
|
||||
s.end()
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for EmgauwaError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "{}: {}", self.get_code(), String::from(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl Debug for EmgauwaError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
write!(f, "{}", String::from(self))
|
||||
}
|
||||
}
|
||||
|
||||
impl actix_web::error::ResponseError for EmgauwaError {
|
||||
fn status_code(&self) -> StatusCode {
|
||||
self.get_code()
|
||||
}
|
||||
|
||||
fn error_response(&self) -> HttpResponse {
|
||||
HttpResponse::from(self)
|
||||
}
|
||||
}
|
7
emgauwa-lib/src/errors/mod.rs
Normal file
7
emgauwa-lib/src/errors/mod.rs
Normal file
|
@ -0,0 +1,7 @@
|
|||
mod api_error;
|
||||
mod database_error;
|
||||
mod emgauwa_error;
|
||||
|
||||
pub use api_error::ApiError;
|
||||
pub use database_error::DatabaseError;
|
||||
pub use emgauwa_error::EmgauwaError;
|
Loading…
Add table
Add a link
Reference in a new issue