Standardized the upsert and delete pattern across the repo.

This commit is contained in:
2026-10-09 15:09:04 +02:00
parent 4a84c8330a
commit 66984567f8
30 changed files with 776 additions and 386 deletions
+11 -13
View File
@@ -13,10 +13,7 @@ use crate::{
crypto::{generate_secret, hash_secret},
domain::UserAppSecret,
error::AppError,
repository::{
self, ReferenceRelation, RepositoryError,
dtos::{Delete, Upsert},
},
repository::{self, ReferenceRelation, RepositoryError},
};
pub fn create_router() -> axum::Router<PgPool> {
@@ -102,13 +99,15 @@ async fn upsert_user_app_secret(
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let upsert = repository::user_app_secrets::upsert(&mut *tx, secret).await?;
let upserted = repository::user_app_secrets::upsert(&mut *tx, secret).await?;
tx.commit().await.map_err(RepositoryError::from)?;
let (status, secret) = match upsert {
Upsert::Created(secret) => (StatusCode::CREATED, secret),
Upsert::Updated(secret) => (StatusCode::OK, secret),
let status = if upserted.previous.is_some() {
StatusCode::OK
} else {
StatusCode::CREATED
};
let secret = upserted.current;
Ok((
status,
@@ -127,13 +126,12 @@ async fn delete_user_app_secret(
) -> Result<StatusCode, AppError> {
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let result = repository::user_app_secrets::delete_by_id(&mut *tx, app_id, secret_id).await?;
let deleted = repository::user_app_secrets::delete_by_id(&mut *tx, app_id, secret_id).await?;
tx.commit().await.map_err(RepositoryError::from)?;
match result {
Delete::Deleted => Ok(StatusCode::NO_CONTENT),
Delete::NotFound => Err(AppError::NotFound),
}
deleted.ok_or(AppError::NotFound)?;
Ok(StatusCode::NO_CONTENT)
}
async fn ensure_app_ownership(