Added a single lifetime parameter
This commit is contained in:
parent
159da81b8d
commit
456c947ecd
2 changed files with 30 additions and 14 deletions
|
|
@ -1,5 +1,5 @@
|
|||
use diesel::{prelude::*, AsChangeset, Insertable, Queryable};
|
||||
use serde::{Serialize, Deserialize};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
|
|
@ -33,12 +33,17 @@ pub fn all(conn: &PgConnection) -> crate::Result<Vec<User>>
|
|||
users.load::<User>(conn).map_err(|_| RBError::DBError)
|
||||
}
|
||||
|
||||
pub fn find(conn: &PgConnection, user_id: Uuid) -> Option<User> {
|
||||
pub fn find(conn: &PgConnection, user_id: Uuid) -> Option<User>
|
||||
{
|
||||
users.find(user_id).first::<User>(conn).ok()
|
||||
}
|
||||
|
||||
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)?;
|
||||
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)?;
|
||||
|
||||
if count == 0 {
|
||||
return Err(RBError::DuplicateUser);
|
||||
|
|
@ -47,8 +52,11 @@ pub fn create(conn: &PgConnection, new_user: &NewUser) -> crate::Result<()> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
pub fn delete(conn: &PgConnection, user_id: Uuid) -> crate::Result<()> {
|
||||
diesel::delete(users.filter(id.eq(user_id))).execute(conn).map_err(|_| RBError::DBError)?;
|
||||
pub fn delete(conn: &PgConnection, user_id: Uuid) -> crate::Result<()>
|
||||
{
|
||||
diesel::delete(users.filter(id.eq(user_id)))
|
||||
.execute(conn)
|
||||
.map_err(|_| RBError::DBError)?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue