GKaszewski/k-tv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add is_admin to User, count_users, ProviderConfigRepository trait, admin migration

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-03-16 03:22:00 +01:00
parent b35054f23e
commit d80d4e9741
6 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
k-tv-backend/infra/src/user_repository/mapping.rs
View File

@@ -10,6 +10,7 @@ pub(super) struct UserRow {
pub subject: String,
pub email: String,
pub password_hash: Option<String>,
pub is_admin: i64,
pub created_at: String,
}
@@ -36,6 +37,7 @@ impl TryFrom<UserRow> for User {
row.subject,
email,
row.password_hash,
row.is_admin != 0,
created_at,
))
}

22
k-tv-backend/infra/src/user_repository/postgres.rs
View File

@@ -22,7 +22,7 @@ impl UserRepository for PostgresUserRepository {
async fn find_by_id(&self, id: Uuid) -> DomainResult<Option<User>> {
let id_str = id.to_string();
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE id = $1",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE id = $1",
)
.bind(&id_str)
.fetch_optional(&self.pool)
@@ -34,7 +34,7 @@ impl UserRepository for PostgresUserRepository {
async fn find_by_subject(&self, subject: &str) -> DomainResult<Option<User>> {
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE subject = $1",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE subject = $1",
)
.bind(subject)
.fetch_optional(&self.pool)
@@ -46,7 +46,7 @@ impl UserRepository for PostgresUserRepository {
async fn find_by_email(&self, email: &str) -> DomainResult<Option<User>> {
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE email = $1",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE email = $1",
)
.bind(email)
.fetch_optional(&self.pool)
@@ -62,18 +62,20 @@ impl UserRepository for PostgresUserRepository {
sqlx::query(
r#"
INSERT INTO users (id, subject, email, password_hash, created_at)
VALUES ($1, $2, $3, $4, $5)
INSERT INTO users (id, subject, email, password_hash, is_admin, created_at)
VALUES ($1, $2, $3, $4, $5, $6)
ON CONFLICT(id) DO UPDATE SET
subject = excluded.subject,
email = excluded.email,
password_hash = excluded.password_hash
password_hash = excluded.password_hash,
is_admin = excluded.is_admin
"#,
)
.bind(&id)
.bind(&user.subject)
.bind(user.email.as_ref())
.bind(&user.password_hash)
.bind(user.is_admin)
.bind(&created_at)
.execute(&self.pool)
.await
@@ -99,4 +101,12 @@ impl UserRepository for PostgresUserRepository {
Ok(())
}
async fn count_users(&self) -> DomainResult<u64> {
let (count,): (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
.fetch_one(&self.pool)
.await
.map_err(|e| DomainError::RepositoryError(e.to_string()))?;
Ok(count as u64)
}
}

22
k-tv-backend/infra/src/user_repository/sqlite.rs
View File

@@ -22,7 +22,7 @@ impl UserRepository for SqliteUserRepository {
async fn find_by_id(&self, id: Uuid) -> DomainResult<Option<User>> {
let id_str = id.to_string();
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE id = ?",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE id = ?",
)
.bind(&id_str)
.fetch_optional(&self.pool)
@@ -34,7 +34,7 @@ impl UserRepository for SqliteUserRepository {
async fn find_by_subject(&self, subject: &str) -> DomainResult<Option<User>> {
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE subject = ?",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE subject = ?",
)
.bind(subject)
.fetch_optional(&self.pool)
@@ -46,7 +46,7 @@ impl UserRepository for SqliteUserRepository {
async fn find_by_email(&self, email: &str) -> DomainResult<Option<User>> {
let row: Option<UserRow> = sqlx::query_as(
"SELECT id, subject, email, password_hash, created_at FROM users WHERE email = ?",
"SELECT id, subject, email, password_hash, is_admin, created_at FROM users WHERE email = ?",
)
.bind(email)
.fetch_optional(&self.pool)
@@ -62,18 +62,20 @@ impl UserRepository for SqliteUserRepository {
sqlx::query(
r#"
INSERT INTO users (id, subject, email, password_hash, created_at)
VALUES (?, ?, ?, ?, ?)
INSERT INTO users (id, subject, email, password_hash, is_admin, created_at)
VALUES (?, ?, ?, ?, ?, ?)
ON CONFLICT(id) DO UPDATE SET
subject = excluded.subject,
email = excluded.email,
password_hash = excluded.password_hash
password_hash = excluded.password_hash,
is_admin = excluded.is_admin
"#,
)
.bind(&id)
.bind(&user.subject)
.bind(user.email.as_ref())
.bind(&user.password_hash)
.bind(user.is_admin as i64)
.bind(&created_at)
.execute(&self.pool)
.await
@@ -100,6 +102,14 @@ impl UserRepository for SqliteUserRepository {
Ok(())
}
async fn count_users(&self) -> DomainResult<u64> {
let (count,): (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
.fetch_one(&self.pool)
.await
.map_err(|e| DomainError::RepositoryError(e.to_string()))?;
Ok(count as u64)
}
}
#[cfg(test)]