feat: add user roles and storage quota management
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
use async_trait::async_trait;
|
||||
use libertas_core::{
|
||||
error::{CoreError, CoreResult},
|
||||
models::User,
|
||||
models::{Role, User},
|
||||
repositories::UserRepository,
|
||||
};
|
||||
use sqlx::{PgPool, SqlitePool, types::Uuid};
|
||||
@@ -33,15 +33,18 @@ impl UserRepository for PostgresUserRepository {
|
||||
async fn create(&self, user: User) -> CoreResult<()> {
|
||||
sqlx::query!(
|
||||
r#"
|
||||
INSERT INTO users (id, username, email, hashed_password, created_at, updated_at)
|
||||
VALUES ($1, $2, $3, $4, $5, $6)
|
||||
INSERT INTO users (id, username, email, hashed_password, created_at, updated_at, role, storage_quota, storage_used)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
|
||||
"#,
|
||||
user.id,
|
||||
user.username,
|
||||
user.email,
|
||||
user.hashed_password,
|
||||
user.created_at,
|
||||
user.updated_at
|
||||
user.updated_at,
|
||||
user.role.as_str(),
|
||||
user.storage_quota,
|
||||
user.storage_used
|
||||
)
|
||||
.execute(&self.pool)
|
||||
.await
|
||||
@@ -51,24 +54,74 @@ impl UserRepository for PostgresUserRepository {
|
||||
}
|
||||
|
||||
async fn find_by_email(&self, email: &str) -> CoreResult<Option<User>> {
|
||||
sqlx::query_as!(User, "SELECT * FROM users WHERE email = $1", email)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
sqlx::query_as!(
|
||||
User,
|
||||
r#"
|
||||
SELECT
|
||||
id, username, email, hashed_password, created_at, updated_at,
|
||||
role as "role: Role",
|
||||
storage_quota, storage_used
|
||||
FROM users
|
||||
WHERE email = $1
|
||||
"#,
|
||||
email
|
||||
)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
}
|
||||
|
||||
async fn find_by_username(&self, username: &str) -> CoreResult<Option<User>> {
|
||||
sqlx::query_as!(User, "SELECT * FROM users WHERE username = $1", username)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
sqlx::query_as!(
|
||||
User,
|
||||
r#"
|
||||
SELECT
|
||||
id, username, email, hashed_password, created_at, updated_at,
|
||||
role as "role: Role",
|
||||
storage_quota, storage_used
|
||||
FROM users
|
||||
WHERE username = $1
|
||||
"#,
|
||||
username
|
||||
)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
}
|
||||
|
||||
async fn find_by_id(&self, id: Uuid) -> CoreResult<Option<User>> {
|
||||
sqlx::query_as!(User, "SELECT * FROM users WHERE id = $1", id)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
sqlx::query_as!(
|
||||
User,
|
||||
r#"
|
||||
SELECT
|
||||
id, username, email, hashed_password, created_at, updated_at,
|
||||
role as "role: Role",
|
||||
storage_quota, storage_used
|
||||
FROM users
|
||||
WHERE id = $1
|
||||
"#,
|
||||
id
|
||||
)
|
||||
.fetch_optional(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))
|
||||
}
|
||||
|
||||
async fn update_storage_used(&self, user_id: Uuid, bytes: i64) -> CoreResult<()> {
|
||||
sqlx::query!(
|
||||
r#"
|
||||
UPDATE users
|
||||
SET storage_used = storage_used + $1, updated_at = NOW()
|
||||
WHERE id = $2
|
||||
"#,
|
||||
bytes,
|
||||
user_id
|
||||
)
|
||||
.execute(&self.pool)
|
||||
.await
|
||||
.map_err(|e| CoreError::Database(e.to_string()))?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,4 +146,9 @@ impl UserRepository for SqliteUserRepository {
|
||||
println!("SQLITE REPO: Finding user by id");
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
async fn update_storage_used(&self, _user_id: Uuid, _bytes: i64) -> CoreResult<()> {
|
||||
println!("SQLITE REPO: Updating user storage used");
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user