i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-08 02:17:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(data): preserve API key history end to end

Browse Source
This commit is contained in:
elky
2026-07-18 21:58:21 +08:00
parent 03b7d573e0
commit 8fbda84acb
7 changed files with 462 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/adapters/postgres/src/usage/mod.rs
+17 -2
View File
@@ -6956,8 +6956,23 @@ WHERE stats_daily_api_key.date >=
.push(" AND stats_daily_api_key.api_key_id IS NOT NULL");
if let Some(user_id) = query.user_id.as_deref() {
builder
.push(" AND api_keys.user_id = ")
.push_bind(user_id.to_string());
.push(" AND (api_keys.user_id = ")
.push_bind(user_id.to_string())
.push(
r#" OR (
api_keys.id IS NULL
AND stats_daily_api_key.api_key_id IN (
SELECT identity_usage.api_key_id
FROM usage AS identity_usage
WHERE identity_usage.user_id = "#,
)
.push_bind(user_id.to_string())
.push(
r#"
AND identity_usage.api_key_id IS NOT NULL
GROUP BY identity_usage.api_key_id"#,
)
.push(")))");
}
builder.push(
" GROUP BY stats_daily_api_key.api_key_id ORDER BY stats_daily_api_key.api_key_id ASC",