Separate create persona check from create persona operation

Aardwolf-Social · Nov 4, 2018 · 8efbdc3 · 8efbdc3
1 parent 9b1388f
commit 8efbdc3
Show file tree

Hide file tree

Showing 22 changed files with 235 additions and 457 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aardwolf-actix/Cargo.toml b/aardwolf-actix/Cargo.toml
@@ -16,6 +16,7 @@ log = "0.4"
 r2d2 = "0.8"
 r2d2-diesel = "1.0"
 serde = "1.0"
+serde_derive = "1.0"
 serde_json = "1.0"
 
 [dependencies.aardwolf-models]

diff --git a/aardwolf-actix/src/action.rs b/aardwolf-actix/src/action.rs
@@ -1,7 +1,9 @@
 use std::marker::PhantomData;
 
-use aardwolf_types::forms::traits::{DbAction, Validate};
-use failure::Fail;
+use aardwolf_types::{
+    error::AardwolfFail,
+    forms::traits::{DbAction, Validate},
+};
 use futures::future::Future;
 
 use crate::{
@@ -11,20 +13,20 @@ use crate::{
 
 pub trait Action<T, E>
 where
-    E: Fail,
+    E: AardwolfFail,
 {
     fn action(self, state: AppConfig) -> Box<dyn Future<Item = T, Error = E> + Send>;
 }
 
 pub struct ValidateWrapper<V, T, E>(V, PhantomData<T>, PhantomData<E>)
 where
     V: Validate<T, E>,
-    E: Fail;
+    E: AardwolfFail;
 
 impl<V, T, E> ValidateWrapper<V, T, E>
 where
     V: Validate<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     pub fn new(validate: V) -> Self {
         ValidateWrapper(validate, PhantomData, PhantomData)
@@ -34,7 +36,7 @@ where
 impl<V, T, E> From<V> for ValidateWrapper<V, T, E>
 where
     V: Validate<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     fn from(v: V) -> Self {
         ValidateWrapper::new(v)
@@ -45,7 +47,7 @@ impl<V, T, E> Action<T, E> for ValidateWrapper<V, T, E>
 where
     V: Validate<T, E>,
     T: Send + 'static,
-    E: Fail,
+    E: AardwolfFail,
 {
     fn action(self, _: AppConfig) -> Box<dyn Future<Item = T, Error = E> + Send> {
         use futures::future::IntoFuture;
@@ -57,12 +59,12 @@ where
 pub struct DbActionWrapper<D, T, E>(D, PhantomData<T>, PhantomData<E>)
 where
     D: DbAction<T, E>,
-    E: Fail;
+    E: AardwolfFail;
 
 impl<D, T, E> DbActionWrapper<D, T, E>
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     pub fn new(db_action: D) -> Self {
         DbActionWrapper(db_action, PhantomData, PhantomData)
@@ -72,7 +74,7 @@ where
 impl<D, T, E> From<D> for DbActionWrapper<D, T, E>
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     fn from(d: D) -> Self {
         DbActionWrapper::new(d)
@@ -83,7 +85,7 @@ impl<D, T, E> Action<T, DbActionError<E>> for DbActionWrapper<D, T, E>
 where
     D: DbAction<T, E> + Send + 'static,
     T: Send + 'static,
-    E: Fail,
+    E: AardwolfFail,
 {
     fn action(
         self,

diff --git a/aardwolf-actix/src/db/perform_db_action.rs b/aardwolf-actix/src/db/perform_db_action.rs
@@ -1,18 +1,15 @@
 use std::marker::PhantomData;
 
-use aardwolf_types::{
-    error::{AardwolfError, AardwolfErrorKind},
-    forms::traits::DbAction,
-};
+use aardwolf_types::{error::AardwolfFail, forms::traits::DbAction};
 use crate::actix::{Handler, MailboxError, Message};
 use failure::Fail;
 
 use crate::db::Db;
 
-#[derive(Clone, Debug, Fail)]
+#[derive(Clone, Debug, Fail, Serialize)]
 pub enum DbActionError<E>
 where
-    E: Fail,
+    E: AardwolfFail,
 {
     #[fail(display = "Error in action {}", _0)]
     Action(#[cause] E),
@@ -24,11 +21,11 @@ where
 
 impl<E> DbActionError<E>
 where
-    E: Fail,
+    E: AardwolfFail,
 {
     pub fn map_err<F>(self) -> DbActionError<F>
     where
-        F: Fail + From<E>,
+        F: AardwolfFail + From<E>,
     {
         match self {
             DbActionError::Action(e) => DbActionError::Action(e.into()),
@@ -40,38 +37,18 @@ where
 
 impl<E> From<MailboxError> for DbActionError<E>
 where
-    E: Fail,
+    E: AardwolfFail,
 {
     fn from(_: MailboxError) -> Self {
         DbActionError::Mailbox
     }
 }
 
-impl<E> AardwolfError for DbActionError<E>
-where
-    E: AardwolfError,
-{
-    fn name(&self) -> &str {
-        "Database Action Error"
-    }
-
-    fn kind(&self) -> AardwolfErrorKind {
-        match *self {
-            DbActionError::Connection | DbActionError::Mailbox => {
-                AardwolfErrorKind::InternalServerError
-            }
-            DbActionError::Action(ref e) => e.kind(),
-        }
-    }
-
-    fn description(&self) -> String {
-        format!("{}", self)
-    }
-}
+impl<E> AardwolfFail for DbActionError<E> where E: AardwolfFail {}
 
 impl<E> From<r2d2::Error> for DbActionError<E>
 where
-    E: Fail,
+    E: AardwolfFail,
 {
     fn from(_: r2d2::Error) -> Self {
         DbActionError::Connection
@@ -81,7 +58,7 @@ where
 pub struct PerformDbAction<D, T, E>
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     db_action: D,
     item: PhantomData<T>,
@@ -91,7 +68,7 @@ where
 impl<D, T, E> PerformDbAction<D, T, E>
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
 {
     pub fn new(db_action: D) -> Self {
         PerformDbAction {
@@ -105,7 +82,7 @@ where
 impl<D, T, E> Message for PerformDbAction<D, T, E>
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
     T: 'static,
 {
     type Result = Result<T, DbActionError<E>>;
@@ -114,7 +91,7 @@ where
 impl<D, T, E> Handler<PerformDbAction<D, T, E>> for Db
 where
     D: DbAction<T, E>,
-    E: Fail,
+    E: AardwolfFail,
     T: 'static,
 {
     type Result = <PerformDbAction<D, T, E> as Message>::Result;