Refactor errors and some other stuff/fixes

emgauwa-lib/src/db/controllers.rs

@@ -4,8 +4,8 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbTag};
+use crate::errors::DatabaseError;
 use crate::types::ControllerUid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

emgauwa-lib/src/db/errors.rs

@@ -1,74 +0,0 @@
-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()),
-		}
-	}
-}

emgauwa-lib/src/db/junction_relay_schedule.rs

@@ -3,8 +3,8 @@ use std::ops::DerefMut;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbSchedule};
+use crate::errors::DatabaseError;
 use crate::types::Weekday;
 
 pub struct DbJunctionRelaySchedule {

emgauwa-lib/src/db/junction_tag.rs

@@ -3,8 +3,8 @@ use std::ops::DerefMut;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbRelay, DbSchedule, DbTag};
+use crate::errors::DatabaseError;
 
 pub struct DbJunctionTag {
 	pub id: i64,

emgauwa-lib/src/db/mod.rs

@@ -5,7 +5,6 @@ use sqlx::sqlite::{SqliteConnectOptions, SqlitePoolOptions};
 use sqlx::{Pool, Sqlite};
 
 mod controllers;
-pub mod errors;
 mod junction_relay_schedule;
 mod junction_tag;
 mod model_utils;

emgauwa-lib/src/db/relays.rs

@@ -4,8 +4,8 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::{DbController, DbJunctionTag, DbTag};
+use crate::errors::DatabaseError;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct DbRelay {

emgauwa-lib/src/db/schedules.rs

@@ -5,9 +5,9 @@ use serde_derive::{Deserialize, Serialize};
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
 use crate::db::model_utils::Period;
 use crate::db::{DbJunctionTag, DbTag};
+use crate::errors::DatabaseError;
 use crate::types::ScheduleUid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

emgauwa-lib/src/db/tag.rs

@@ -4,7 +4,7 @@ use serde_derive::Serialize;
 use sqlx::pool::PoolConnection;
 use sqlx::Sqlite;
 
-use crate::db::errors::DatabaseError;
+use crate::errors::DatabaseError;
 
 #[derive(Debug, Serialize, Clone)]
 pub struct DbTag {