feat: refactor user profile handling and integrate ApProfileField structure

This commit is contained in:
2026-05-13 22:59:38 +02:00
parent 815178e6a4
commit fdd61ae701
11 changed files with 94 additions and 51 deletions

View File

@@ -4,7 +4,7 @@ use sqlx::PgPool;
use domain::{
errors::DomainError,
models::{User, UserRole},
models::{ProfileField, User, UserRole},
ports::UserRepository,
value_objects::{Email, PasswordHash, UserId, Username},
};
@@ -42,6 +42,7 @@ impl PostgresUserRepository {
avatar_path: Option<String>,
banner_path: Option<String>,
also_known_as: Option<String>,
profile_fields: Vec<ProfileField>,
) -> Result<User, DomainError> {
let id = uuid::Uuid::parse_str(&id_str)
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?;
@@ -61,6 +62,7 @@ impl PostgresUserRepository {
avatar_path,
banner_path,
also_known_as,
profile_fields,
))
}
}
@@ -99,6 +101,7 @@ impl UserRepository for PostgresUserRepository {
r.avatar_path,
r.banner_path,
r.also_known_as,
vec![],
)
})
.transpose()
@@ -136,6 +139,7 @@ impl UserRepository for PostgresUserRepository {
r.avatar_path,
r.banner_path,
r.also_known_as,
vec![],
)
})
.transpose()
@@ -200,20 +204,33 @@ impl UserRepository for PostgresUserRepository {
.fetch_optional(&self.pool)
.await
.map_err(Self::map_err)?;
row.map(|r| {
Self::row_to_user(
r.id,
r.email,
r.username,
r.password_hash,
Self::parse_role(&r.role),
r.bio,
r.avatar_path,
r.banner_path,
r.also_known_as,
)
})
.transpose()
let Some(r) = row else { return Ok(None) };
#[derive(sqlx::FromRow)]
struct FieldRow { name: String, value: String }
let field_rows = sqlx::query_as::<_, FieldRow>(
"SELECT name, value FROM user_profile_fields WHERE user_id = $1 ORDER BY position ASC",
)
.bind(&id_str)
.fetch_all(&self.pool)
.await
.map_err(|e| DomainError::InfrastructureError(e.to_string()))?;
let profile_fields = field_rows.into_iter().map(|f| ProfileField { name: f.name, value: f.value }).collect();
Self::row_to_user(
r.id,
r.email,
r.username,
r.password_hash,
Self::parse_role(&r.role),
r.bio,
r.avatar_path,
r.banner_path,
r.also_known_as,
profile_fields,
).map(Some)
}
async fn update_profile(