Renamed errors; changed Responser implementation
This commit is contained in:
parent
b61b329996
commit
dd51d107e3
6 changed files with 104 additions and 73 deletions
|
|
@ -1,5 +1,5 @@
|
|||
pub mod tokens;
|
||||
pub mod users;
|
||||
|
||||
pub use users::{User, NewUser};
|
||||
pub use tokens::{RefreshToken, NewRefreshToken};
|
||||
pub use tokens::{NewRefreshToken, RefreshToken};
|
||||
pub use users::{NewUser, User};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
|
|||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
errors::RBError,
|
||||
errors::RbError,
|
||||
schema::{users, users::dsl::*},
|
||||
};
|
||||
|
||||
|
|
@ -30,7 +30,9 @@ pub struct NewUser
|
|||
|
||||
pub fn all(conn: &PgConnection) -> crate::Result<Vec<User>>
|
||||
{
|
||||
users.load::<User>(conn).map_err(|_| RBError::DBError)
|
||||
users
|
||||
.load::<User>(conn)
|
||||
.map_err(|_| RbError::DbError("Couldn't get all users."))
|
||||
}
|
||||
|
||||
pub fn find(conn: &PgConnection, user_id: Uuid) -> Option<User>
|
||||
|
|
@ -43,10 +45,10 @@ pub fn create(conn: &PgConnection, new_user: &NewUser) -> crate::Result<()>
|
|||
let count = diesel::insert_into(users)
|
||||
.values(new_user)
|
||||
.execute(conn)
|
||||
.map_err(|_| RBError::DBError)?;
|
||||
.map_err(|_| RbError::DbError("Couldn't create user."))?;
|
||||
|
||||
if count == 0 {
|
||||
return Err(RBError::DuplicateUser);
|
||||
return Err(RbError::UMDuplicateUser);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
|
@ -56,7 +58,7 @@ pub fn delete(conn: &PgConnection, user_id: Uuid) -> crate::Result<()>
|
|||
{
|
||||
diesel::delete(users.filter(id.eq(user_id)))
|
||||
.execute(conn)
|
||||
.map_err(|_| RBError::DBError)?;
|
||||
.map_err(|_| RbError::DbError("Couldn't delete user."))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue