Nit picking a little.
This commit is contained in:
@@ -38,16 +38,17 @@ async fn list_account_members(
|
||||
Query(query): Query<QueryParams>,
|
||||
) -> Result<Json<Vec<AccountMemberResponse>>, AppError> {
|
||||
let user_id = auth.user_id();
|
||||
let query = repository::account_members::Query {
|
||||
limit: Some(query.limit.unwrap_or(20)),
|
||||
offset: query.offset,
|
||||
};
|
||||
|
||||
repository::accounts::get_by_id(&pool, user_id, account_id)
|
||||
.await?
|
||||
.map(|_| ())
|
||||
.ok_or(AppError::NotFound)?;
|
||||
|
||||
let query = repository::account_members::Query {
|
||||
limit: Some(query.limit.unwrap_or(20)),
|
||||
offset: query.offset,
|
||||
};
|
||||
|
||||
let members = repository::account_members::list(&pool, user_id, account_id, query)
|
||||
.await?
|
||||
.into_iter()
|
||||
@@ -81,7 +82,6 @@ async fn upsert_account_member(
|
||||
Json(member): Json<AccountMemberRequest>,
|
||||
) -> Result<(StatusCode, Json<AccountMemberResponse>), AppError> {
|
||||
let member = member.into_domain(member_id, account_id)?;
|
||||
|
||||
let upserted = repository::account_members::upsert(&pool, auth.user_id(), member)
|
||||
.await?
|
||||
.ok_or(AppError::NotFound)?;
|
||||
@@ -110,21 +110,18 @@ async fn delete_account_member(
|
||||
.await?
|
||||
.ok_or(AppError::NotFound)?;
|
||||
|
||||
let members = repository::account_members::list(
|
||||
&mut *tx,
|
||||
user_id,
|
||||
account_id,
|
||||
repository::account_members::Query {
|
||||
limit: Some(2),
|
||||
offset: None,
|
||||
},
|
||||
)
|
||||
.await?;
|
||||
let members_query = repository::account_members::Query {
|
||||
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()
|
||||
&& only.id == member_id
|
||||
{
|
||||
return Err(AppError::LastAccountMemberRemoval);
|
||||
}
|
||||
|
||||
let deleted =
|
||||
repository::account_members::delete_by_id(&mut *tx, user_id, account_id, member_id).await?;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user