Prepping account members for enriching user data.
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use axum::{extract::State, http::StatusCode};
|
||||
use serde::Deserialize;
|
||||
use sqlx::PgPool;
|
||||
@@ -8,6 +10,7 @@ use super::{
|
||||
extractors::{Auth, Json, Path, Query},
|
||||
};
|
||||
use crate::{
|
||||
domain,
|
||||
error::AppError,
|
||||
repository::{self, RepositoryError},
|
||||
};
|
||||
@@ -49,13 +52,15 @@ async fn list_account_members(
|
||||
offset: query.offset,
|
||||
};
|
||||
|
||||
let members = repository::account_members::list(&pool, user_id, account_id, query)
|
||||
.await?
|
||||
.into_iter()
|
||||
.map(AccountMemberResponse::from)
|
||||
.collect();
|
||||
let members = repository::account_members::list(&pool, user_id, account_id, query).await?;
|
||||
let users = get_users_for_account_members(&pool, &members).await?;
|
||||
|
||||
Ok(Json(members))
|
||||
let responses = members
|
||||
.into_iter()
|
||||
.map(|member| create_response(member, &users))
|
||||
.collect::<Result<Vec<_>, _>>()?;
|
||||
|
||||
Ok(Json(responses))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
@@ -69,8 +74,9 @@ async fn get_account_member(
|
||||
repository::account_members::get_by_id(&pool, auth.user_id(), account_id, member_id)
|
||||
.await?
|
||||
.ok_or(AppError::NotFound)?;
|
||||
let users = get_users_for_account_members(&pool, std::slice::from_ref(&member)).await?;
|
||||
|
||||
Ok(Json(member.into()))
|
||||
Ok(Json(create_response(member, &users)?))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
@@ -81,8 +87,13 @@ async fn upsert_account_member(
|
||||
Path((account_id, member_id)): Path<(Uuid, Uuid)>,
|
||||
Json(member): Json<AccountMemberRequest>,
|
||||
) -> Result<(StatusCode, Json<AccountMemberResponse>), AppError> {
|
||||
let user_id = auth.user_id();
|
||||
|
||||
let member = member.into_domain(member_id, account_id)?;
|
||||
let upserted = repository::account_members::upsert(&pool, auth.user_id(), member)
|
||||
let user = repository::users::get_by_id(&pool, member.user_id)
|
||||
.await?
|
||||
.ok_or(AppError::UserIdNotFound)?;
|
||||
let upserted = repository::account_members::upsert(&pool, user_id, member)
|
||||
.await?
|
||||
.ok_or(AppError::NotFound)?;
|
||||
|
||||
@@ -92,7 +103,9 @@ async fn upsert_account_member(
|
||||
StatusCode::CREATED
|
||||
};
|
||||
|
||||
Ok((status, Json(upserted.current.into())))
|
||||
let users = HashMap::from([(user.id, user)]);
|
||||
|
||||
Ok((status, Json(create_response(upserted.current, &users)?)))
|
||||
}
|
||||
|
||||
#[axum::debug_handler]
|
||||
@@ -114,6 +127,7 @@ async fn delete_account_member(
|
||||
limit: Some(2),
|
||||
offset: None,
|
||||
};
|
||||
|
||||
let members =
|
||||
repository::account_members::list(&mut *tx, user_id, account_id, members_query).await?;
|
||||
if let [only] = members.as_slice()
|
||||
@@ -131,3 +145,32 @@ async fn delete_account_member(
|
||||
|
||||
Ok(StatusCode::NO_CONTENT)
|
||||
}
|
||||
|
||||
async fn get_users_for_account_members<'e, E>(
|
||||
executor: E,
|
||||
account_members: &[domain::AccountMember],
|
||||
) -> Result<HashMap<Uuid, domain::User>, AppError>
|
||||
where
|
||||
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
|
||||
{
|
||||
let user_ids = account_members
|
||||
.iter()
|
||||
.map(|account_member| account_member.user_id)
|
||||
.collect::<HashSet<_>>()
|
||||
.into_iter()
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
Ok(repository::users::get_by_ids(executor, &user_ids).await?)
|
||||
}
|
||||
|
||||
fn create_response(
|
||||
account_member: domain::AccountMember,
|
||||
users: &HashMap<Uuid, domain::User>,
|
||||
) -> Result<AccountMemberResponse, AppError> {
|
||||
let user = users
|
||||
.get(&account_member.user_id)
|
||||
.cloned()
|
||||
.ok_or(AppError::Unknown)?;
|
||||
|
||||
Ok(AccountMemberResponse::from_domain(account_member, user))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user