From 440ca81c25b4c2e9fd9c8efcc2045ae8ab05b290 Mon Sep 17 00:00:00 2001 From: trisua Date: Thu, 17 Jul 2025 13:46:20 -0400 Subject: [PATCH] fix: properly update app usage --- crates/app/src/routes/api/v1/app_data.rs | 26 ++++++++++++++++++++++-- crates/core/src/database/apps.rs | 1 + 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/crates/app/src/routes/api/v1/app_data.rs b/crates/app/src/routes/api/v1/app_data.rs index c074c8f..b4c0d03 100644 --- a/crates/app/src/routes/api/v1/app_data.rs +++ b/crates/app/src/routes/api/v1/app_data.rs @@ -61,6 +61,10 @@ pub async fn create_request( } // ... + if let Err(e) = data.update_app_data_used(app.id, new_size as i32).await { + return Json(e.into()); + } + match data .create_app_data(AppData::new(app.id, req.key, req.value)) .await @@ -105,6 +109,10 @@ pub async fn update_value_request( } // ... + if let Err(e) = data.update_app_data_used(app.id, new_size as i32).await { + return Json(e.into()); + } + match data.update_app_data_value(id, &req.value).await { Ok(_) => Json(ApiReturn { ok: true, @@ -121,8 +129,22 @@ pub async fn delete_request( Path(id): Path, ) -> impl IntoResponse { let data = &(data.read().await).0; - if get_app_from_key!(data, jar).is_none() { - return Json(Error::NotAllowed.into()); + let app = match get_app_from_key!(data, jar) { + Some(x) => x, + None => return Json(Error::NotAllowed.into()), + }; + + let app_data = match data.get_app_data_by_id(id).await { + Ok(x) => x, + Err(e) => return Json(e.into()), + }; + + // ... + if let Err(e) = data + .update_app_data_used(app.id, (app.data_used - app_data.value.len()) as i32) + .await + { + return Json(e.into()); } match data.delete_app_data(id).await { diff --git a/crates/core/src/database/apps.rs b/crates/core/src/database/apps.rs index c6a4f42..4915907 100644 --- a/crates/core/src/database/apps.rs +++ b/crates/core/src/database/apps.rs @@ -157,6 +157,7 @@ impl DataManager { auto_method!(update_app_quota_status(AppQuota) -> "UPDATE apps SET quota_status = $1 WHERE id = $2" --serde --cache-key-tmpl="atto.app:{}"); auto_method!(update_app_scopes(Vec)@get_app_by_id:FinePermission::MANAGE_APPS; -> "UPDATE apps SET scopes = $1 WHERE id = $2" --serde --cache-key-tmpl="atto.app:{}"); auto_method!(update_app_api_key(&str) -> "UPDATE apps SET api_key = $1 WHERE id = $2" --cache-key-tmpl="atto.app:{}"); + auto_method!(update_app_data_used(i32) -> "UPDATE apps SET data_used = $1 WHERE id = $2" --cache-key-tmpl="atto.app:{}"); auto_method!(incr_app_grants() -> "UPDATE apps SET grants = grants + 1 WHERE id = $1" --cache-key-tmpl="atto.app:{}" --incr); auto_method!(decr_app_grants()@get_app_by_id -> "UPDATE apps SET grants = grants - 1 WHERE id = $1" --cache-key-tmpl="atto.app:{}" --decr=grants);