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

Isolate standalone key wallet handling

Browse Source
This commit is contained in:
fawney19
2026-04-27 17:24:31 +08:00
parent 3b542434a2
commit 1d23bf4ecb
12 changed files with 240 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-data/src/repository/settlement/sql.rs
+45 -14
View File
@@ -247,11 +247,31 @@ impl SettlementWriteRepository for SqlxSettlementRepository {
};
if final_billing_status == "settled" {
let wallet_row = if let Some(api_key_id) = input
let api_key_id = input
.api_key_id
.as_deref()
.filter(|value| !value.is_empty())
{
.filter(|value| !value.is_empty());
let api_key_is_standalone = if input.api_key_is_standalone {
true
} else if let Some(api_key_id) = api_key_id {
sqlx::query_scalar::<_, bool>(
r#"
SELECT is_standalone
FROM api_keys
WHERE id = $1
LIMIT 1
"#,
)
.bind(api_key_id)
.fetch_optional(&mut **tx)
.await
.map_postgres_err()?
.unwrap_or(false)
} else {
false
};
let wallet_row = if let Some(api_key_id) = api_key_id {
sqlx::query(
r#"
SELECT
@@ -275,11 +295,12 @@ LIMIT 1
let wallet_row = if wallet_row.is_some() {
wallet_row
} else if let Some(user_id) =
input.user_id.as_deref().filter(|value| !value.is_empty())
{
sqlx::query(
r#"
} else if !api_key_is_standalone {
if let Some(user_id) =
input.user_id.as_deref().filter(|value| !value.is_empty())
{
sqlx::query(
r#"
SELECT
id,
CAST(balance AS DOUBLE PRECISION) AS balance,
@@ -289,12 +310,15 @@ FROM wallets
WHERE user_id = $1
FOR UPDATE
LIMIT 1
"#,
)
.bind(user_id)
.fetch_optional(&mut **tx)
.await
.map_postgres_err()?
"#,
)
.bind(user_id)
.fetch_optional(&mut **tx)
.await
.map_postgres_err()?
} else {
None
}
} else {
None
};
@@ -417,4 +441,11 @@ mod tests {
let source = include_str!("sql.rs");
assert!(!source.contains("UPDATE \"usage\"\nSET\n wallet_id = $2"));
}
#[test]
fn settlement_sql_blocks_standalone_key_owner_wallet_fallback() {
let source = include_str!("sql.rs");
assert!(source.contains("SELECT is_standalone"));
assert!(source.contains("} else if !api_key_is_standalone {"));
}
}