Added lib to service

service/src/db/messages/model.rs

@@ -1,7 +1,8 @@
 use diesel::prelude::*;
 use serde::{Deserialize, Serialize};
+use siren::ServiceError;
 
-use crate::{db::schema::messages::{self}, error_handler::ServiceError};
+use crate::db::schema::messages::{self};
 
 #[derive(Queryable, Selectable, Serialize, Deserialize)]
 #[diesel(table_name = messages)]

service/src/db/messages/routes.rs

@@ -1,8 +1,9 @@
 use actix_web::{get, post, web, HttpResponse, HttpRequest, ResponseError};
 use log::error;
 use serde::{Serialize, Deserialize};
+use siren::{GetResponse, Metadata, ServiceError};
 
-use crate::{db::{messages::{QueryMessage, QueryFilters, InsertMessage}, GetResponse, Metadata}, error_handler::ServiceError};
+use crate::db::messages::{QueryMessage, QueryFilters, InsertMessage};
 
 #[derive(Serialize, Deserialize)]
 struct GetAllParams {

service/src/db/mod.rs

@@ -1,6 +1,5 @@
-use crate::error_handler::ServiceError;
 use diesel::{r2d2::ConnectionManager, PgConnection};
-use serde::{Deserialize, Serialize};
+use siren::ServiceError;
 use crate::diesel_migrations::MigrationHarness;
 use lazy_static::lazy_static;
 use log::{error, info};
@@ -55,18 +54,3 @@ pub fn connection() -> Result<DbConnection, ServiceError> {
 pub fn load_data() {
   spells::load_data();
 }
-
-#[derive(Serialize, Deserialize)]
-pub struct GetResponse<T> {
-  pub data: T,
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub metadata: Option<Metadata>
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct Metadata {
-  pub total: i32,
-  pub limit: i32,
-  pub page: i32,
-  pub pages: i32
-}

service/src/db/spells/model.rs

@@ -1,7 +1,8 @@
 use diesel::prelude::*;
 use serde::{Deserialize, Serialize};
+use siren::ServiceError;
 
-use crate::{db::{schema::spells::{self}, classes::AbilityType, conditions::ConditionType}, error_handler::ServiceError};
+use crate::db::{schema::spells::{self}, classes::AbilityType, conditions::ConditionType};
 
 use super::{SchoolType, CastingTime, CastingType, SpellAttackType, SpellDamageType, Range, Area, Components, Duration, Source, Description, DurationType};
 

service/src/db/spells/routes.rs

@@ -1,8 +1,9 @@
 use actix_web::{get, post, put, delete, web, HttpResponse, HttpRequest, ResponseError};
 use log::error;
 use serde::{Serialize, Deserialize};
+use siren::{GetResponse, Metadata, ServiceError};
 
-use crate::{db::{spells::{QuerySpell, QueryFilters}, GetResponse, Metadata}, error_handler::ServiceError};
+use crate::db::spells::{QuerySpell, QueryFilters};
 
 use super::{Spell, InsertSpell};