add boatdamages functionality
This commit is contained in:
@ -23,6 +23,7 @@ pub struct User {
|
||||
pub is_cox: bool,
|
||||
pub is_admin: bool,
|
||||
pub is_guest: bool,
|
||||
pub is_tech: bool,
|
||||
pub deleted: bool,
|
||||
pub last_access: Option<chrono::NaiveDateTime>,
|
||||
}
|
||||
@ -41,6 +42,7 @@ pub enum LoginError {
|
||||
NotLoggedIn,
|
||||
NotAnAdmin,
|
||||
NotACox,
|
||||
NotATech,
|
||||
NoPasswordSet(User),
|
||||
DeserializationError,
|
||||
}
|
||||
@ -73,7 +75,7 @@ impl User {
|
||||
sqlx::query_as!(
|
||||
Self,
|
||||
"
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech
|
||||
FROM user
|
||||
WHERE id like ?
|
||||
",
|
||||
@ -88,7 +90,7 @@ WHERE id like ?
|
||||
sqlx::query_as!(
|
||||
Self,
|
||||
"
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech
|
||||
FROM user
|
||||
WHERE name like ?
|
||||
",
|
||||
@ -130,7 +132,7 @@ WHERE name like ?
|
||||
sqlx::query_as!(
|
||||
Self,
|
||||
"
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech
|
||||
FROM user
|
||||
WHERE deleted = 0
|
||||
ORDER BY last_access DESC
|
||||
@ -145,7 +147,7 @@ ORDER BY last_access DESC
|
||||
sqlx::query_as!(
|
||||
Self,
|
||||
"
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access
|
||||
SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech
|
||||
FROM user
|
||||
WHERE deleted = 0 AND is_cox=true
|
||||
ORDER BY last_access DESC
|
||||
@ -167,12 +169,20 @@ ORDER BY last_access DESC
|
||||
.is_ok()
|
||||
}
|
||||
|
||||
pub async fn update(&self, db: &SqlitePool, is_cox: bool, is_admin: bool, is_guest: bool) {
|
||||
pub async fn update(
|
||||
&self,
|
||||
db: &SqlitePool,
|
||||
is_cox: bool,
|
||||
is_admin: bool,
|
||||
is_guest: bool,
|
||||
is_tech: bool,
|
||||
) {
|
||||
sqlx::query!(
|
||||
"UPDATE user SET is_cox = ?, is_admin = ?, is_guest = ? where id = ?",
|
||||
"UPDATE user SET is_cox = ?, is_admin = ?, is_guest = ?, is_tech = ? where id = ?",
|
||||
is_cox,
|
||||
is_admin,
|
||||
is_guest,
|
||||
is_tech,
|
||||
self.id
|
||||
)
|
||||
.execute(db)
|
||||
@ -325,6 +335,46 @@ impl<'r> FromRequest<'r> for User {
|
||||
}
|
||||
}
|
||||
|
||||
pub struct TechUser {
|
||||
pub(crate) user: User,
|
||||
}
|
||||
|
||||
impl Deref for TechUser {
|
||||
type Target = User;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.user
|
||||
}
|
||||
}
|
||||
|
||||
impl TryFrom<User> for TechUser {
|
||||
type Error = LoginError;
|
||||
|
||||
fn try_from(user: User) -> Result<Self, Self::Error> {
|
||||
if user.is_tech {
|
||||
Ok(TechUser { user })
|
||||
} else {
|
||||
Err(LoginError::NotATech)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<'r> FromRequest<'r> for TechUser {
|
||||
type Error = LoginError;
|
||||
|
||||
async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
|
||||
match User::from_request(req).await {
|
||||
Outcome::Success(user) => match user.try_into() {
|
||||
Ok(user) => Outcome::Success(user),
|
||||
Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotACox)),
|
||||
},
|
||||
Outcome::Failure(f) => Outcome::Failure(f),
|
||||
Outcome::Forward(f) => Outcome::Forward(f),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct CoxUser {
|
||||
user: User,
|
||||
}
|
||||
@ -469,7 +519,7 @@ mod test {
|
||||
let pool = testdb!();
|
||||
|
||||
let user = User::find_by_id(&pool, 1).await.unwrap();
|
||||
user.update(&pool, false, false, false).await;
|
||||
user.update(&pool, false, false, false, false).await;
|
||||
|
||||
let user = User::find_by_id(&pool, 1).await.unwrap();
|
||||
assert_eq!(user.is_admin, false);
|
||||
|
Reference in New Issue
Block a user