refactor: format syntaxt

This commit is contained in:
Edouard Vanbelle
2026-06-25 00:07:16 +02:00
parent 2643484860
commit 2604ac3309
5 changed files with 23 additions and 28 deletions
@@ -207,13 +207,14 @@ impl StorageUsageService {
drive_id: Uuid,
additional_bytes: u64,
) -> Result<(), DomainError> {
let row: Option<(i64, Option<i64>)> = sqlx::query_as(
"SELECT used_bytes, quota_bytes FROM storage.drives WHERE id = $1",
)
.bind(drive_id)
.fetch_optional(self.pool.as_ref())
.await
.map_err(|e| DomainError::internal_error("StorageUsage", format!("drive quota lookup: {e}")))?;
let row: Option<(i64, Option<i64>)> =
sqlx::query_as("SELECT used_bytes, quota_bytes FROM storage.drives WHERE id = $1")
.bind(drive_id)
.fetch_optional(self.pool.as_ref())
.await
.map_err(|e| {
DomainError::internal_error("StorageUsage", format!("drive quota lookup: {e}"))
})?;
let Some((used, quota)) = row else {
// Anti-enum at the upload edge would normally map to 404,
@@ -468,10 +469,7 @@ impl StorageUsagePort for StorageUsageService {
.await
.map_err(|e| {
error!("Drive storage-usage reconciliation sweep failed: {}", e);
DomainError::internal_error(
"StorageUsage",
format!("drive reconciliation sweep: {e}"),
)
DomainError::internal_error("StorageUsage", format!("drive reconciliation sweep: {e}"))
})?;
info!(
+5 -1
View File
@@ -846,7 +846,11 @@ impl TrashService {
}
}
info!("Trash cleared across {} drive(s) for user {}", drive_ids.len(), user_id);
info!(
"Trash cleared across {} drive(s) for user {}",
drive_ids.len(),
user_id
);
Ok(())
}
}
@@ -355,14 +355,13 @@ impl DriveRepository for DrivePgRepository {
.await
.map_err(|e| Self::map_sqlx_err("delete_atomic.grants", e))?;
let root: (Uuid,) = sqlx::query_as(
"SELECT root_folder_id FROM storage.drives WHERE id = $1",
)
.bind(drive_id)
.fetch_optional(&mut *tx)
.await
.map_err(|e| Self::map_sqlx_err("delete_atomic.lookup_root", e))?
.ok_or_else(|| DriveRepositoryError::NotFound(drive_id.to_string()))?;
let root: (Uuid,) =
sqlx::query_as("SELECT root_folder_id FROM storage.drives WHERE id = $1")
.bind(drive_id)
.fetch_optional(&mut *tx)
.await
.map_err(|e| Self::map_sqlx_err("delete_atomic.lookup_root", e))?
.ok_or_else(|| DriveRepositoryError::NotFound(drive_id.to_string()))?;
sqlx::query("DELETE FROM storage.drives WHERE id = $1")
.bind(drive_id)
+1 -4
View File
@@ -1912,10 +1912,7 @@ impl DedupService {
self.garbage_collect_with_grace(0).await
}
async fn garbage_collect_with_grace(
&self,
grace_secs: i64,
) -> Result<(u64, u64), DomainError> {
async fn garbage_collect_with_grace(&self, grace_secs: i64) -> Result<(u64, u64), DomainError> {
const BATCH_SIZE: i64 = 500;
let mut total_deleted = 0u64;
+1 -4
View File
@@ -425,10 +425,7 @@ pub fn create_api_routes(app_state: &Arc<AppState>) -> Router<Arc<AppState>> {
"/",
get(drive_handler::list_drives).post(drive_handler::create_drive),
)
.route(
"/{id}",
axum::routing::delete(drive_handler::delete_drive),
)
.route("/{id}", axum::routing::delete(drive_handler::delete_drive))
.route(
"/{id}/members",
get(drive_handler::list_drive_members).post(drive_handler::add_drive_member),