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

Merge remote-tracking branch 'origin/pr-484'

Browse Source
This commit is contained in:
fawney19
2026-05-18 18:01:57 +08:00
parent be939f7e63 1b24e1c22a
commit 7f76eff827
17 changed files with 925 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/aether-data/src/repository/billing/sqlite.rs
View File

@@ -961,7 +961,7 @@ ORDER BY expires_at ASC, created_at ASC, id ASC
allow_wallet_overage &= grant.allow_wallet_overage;
let used = sqlx::query_scalar::<_, f64>(
r#"
SELECT COALESCE(SUM(amount_usd), 0)
SELECT CAST(COALESCE(SUM(amount_usd), 0) AS REAL)
FROM entitlement_usage_ledgers
WHERE user_entitlement_id = ?
AND usage_date = ?

13
crates/aether-data/src/repository/settlement/mysql.rs
View File

@@ -464,6 +464,19 @@ FOR UPDATE
}
None => Some(0.0),
};
if let Some(row) = wallet_row.as_ref() {
let wallet_id: String = row.try_get("id").map_sql_err()?;
let before_recharge: f64 = row.try_get("balance").map_sql_err()?;
let before_gift: f64 = row.try_get("gift_balance").map_sql_err()?;
let before_total = before_recharge + before_gift;
settlement.wallet_id = Some(wallet_id);
settlement.wallet_balance_before = Some(before_total);
settlement.wallet_balance_after = Some(before_total);
settlement.wallet_recharge_balance_before = Some(before_recharge);
settlement.wallet_recharge_balance_after = Some(before_recharge);
settlement.wallet_gift_balance_before = Some(before_gift);
settlement.wallet_gift_balance_after = Some(before_gift);
}
let wallet_debit_cost_usd = if !api_key_is_standalone {
if let Some(user_id) = input.user_id.as_deref().filter(|value| !value.is_empty()) {

14
crates/aether-data/src/repository/settlement/postgres.rs
View File

@@ -530,6 +530,20 @@ LIMIT 1
}
None => Some(0.0),
};
if let Some(row) = wallet_row.as_ref() {
let wallet_id: String = row.try_get("id").map_postgres_err()?;
let before_recharge: f64 = row.try_get("balance").map_postgres_err()?;
let before_gift: f64 =
row.try_get("gift_balance").map_postgres_err()?;
let before_total = before_recharge + before_gift;
settlement.wallet_id = Some(wallet_id);
settlement.wallet_balance_before = Some(before_total);
settlement.wallet_balance_after = Some(before_total);
settlement.wallet_recharge_balance_before = Some(before_recharge);
settlement.wallet_recharge_balance_after = Some(before_recharge);
settlement.wallet_gift_balance_before = Some(before_gift);
settlement.wallet_gift_balance_after = Some(before_gift);
}
let wallet_debit_cost_usd = if !api_key_is_standalone {
if let Some(user_id) =

125
crates/aether-data/src/repository/settlement/sqlite.rs
View File

@@ -270,7 +270,7 @@ ORDER BY expires_at ASC, created_at ASC, id ASC
allow_wallet_overage &= grant.allow_wallet_overage;
let used = sqlx::query_scalar::<_, f64>(
r#"
SELECT COALESCE(SUM(amount_usd), 0)
SELECT CAST(COALESCE(SUM(amount_usd), 0) AS REAL)
FROM entitlement_usage_ledgers
WHERE user_entitlement_id = ?
AND usage_date = ?
@@ -475,6 +475,19 @@ LIMIT 1
}
None => Some(0.0),
};
if let Some(row) = wallet_row.as_ref() {
let wallet_id: String = row.try_get("id").map_sql_err()?;
let before_recharge = sqlite_real(row, "balance")?;
let before_gift = sqlite_real(row, "gift_balance")?;
let before_total = before_recharge + before_gift;
settlement.wallet_id = Some(wallet_id);
settlement.wallet_balance_before = Some(before_total);
settlement.wallet_balance_after = Some(before_total);
settlement.wallet_recharge_balance_before = Some(before_recharge);
settlement.wallet_recharge_balance_after = Some(before_recharge);
settlement.wallet_gift_balance_before = Some(before_gift);
settlement.wallet_gift_balance_after = Some(before_gift);
}
let wallet_debit_cost_usd = if !api_key_is_standalone {
if let Some(user_id) = input.user_id.as_deref().filter(|value| !value.is_empty()) {
@@ -802,6 +815,58 @@ mod tests {
assert_eq!(wallet_total, 12.0);
}
#[tokio::test]
async fn sqlite_repository_records_wallet_for_quota_covered_user_usage() {
let pool = sqlx::sqlite::SqlitePoolOptions::new()
.max_connections(1)
.connect("sqlite::memory:")
.await
.expect("sqlite pool should connect");
run_sqlite_migrations(&pool)
.await
.expect("sqlite migrations should run");
seed_quota_covered_settlement_rows(&pool).await;
let repository = SqliteSettlementRepository::new(pool.clone());
let settlement = repository
.settle_usage(UsageSettlementInput {
request_id: "request-quota-covered".to_string(),
user_id: Some("user-quota".to_string()),
api_key_id: Some("key-quota".to_string()),
api_key_is_standalone: false,
provider_id: None,
status: "completed".to_string(),
billing_status: "pending".to_string(),
total_cost_usd: 3.0,
actual_total_cost_usd: 2.0,
finalized_at_unix_secs: Some(1_260),
})
.await
.expect("settlement should run")
.expect("usage should exist");
assert_eq!(settlement.billing_status, "settled");
assert_eq!(settlement.wallet_id.as_deref(), Some("wallet-quota"));
assert_eq!(settlement.wallet_balance_before, Some(0.0));
assert_eq!(settlement.wallet_balance_after, Some(0.0));
let wallet_total: f64 = sqlx::query_scalar(
"SELECT balance + gift_balance FROM wallets WHERE id = 'wallet-quota'",
)
.fetch_one(&pool)
.await
.expect("wallet should load");
assert_eq!(wallet_total, 0.0);
let quota_used: f64 = sqlx::query_scalar(
"SELECT CAST(COALESCE(SUM(amount_usd), 0) AS REAL) FROM entitlement_usage_ledgers WHERE request_id = 'request-quota-covered'",
)
.fetch_one(&pool)
.await
.expect("quota ledger should load");
assert_eq!(quota_used, 3.0);
}
async fn seed_settlement_rows(pool: &sqlx::SqlitePool) {
sqlx::query(
r#"
@@ -827,4 +892,62 @@ VALUES
.await
.expect("settlement rows should seed");
}
async fn seed_quota_covered_settlement_rows(pool: &sqlx::SqlitePool) {
sqlx::query(
r#"
INSERT INTO users (
id, username, email, role, auth_source, password_hash, is_active,
is_deleted, created_at, updated_at
) VALUES (
'user-quota', 'quota-user', 'quota@example.com', 'user', 'local',
'hash', 1, 0, 1, 1
);
INSERT INTO wallets (
id, user_id, balance, gift_balance, limit_mode, created_at, updated_at
) VALUES (
'wallet-quota', 'user-quota', 0.0, 0.0, 'finite', 1, 1
);
INSERT INTO "usage" (
request_id, user_id, api_key_id, status, billing_status,
total_cost_usd, actual_total_cost_usd
) VALUES (
'request-quota-covered', 'user-quota', 'key-quota', 'completed',
'pending', 3.0, 2.0
);
INSERT INTO billing_plans (
id, title, price_amount, price_currency, duration_unit,
duration_value, entitlements_json, created_at, updated_at
) VALUES (
'plan-quota', 'Quota Plan', 0.0, 'USD', 'month', 1,
'[{"type":"daily_quota","daily_quota_usd":10.0,"reset_timezone":"Asia/Shanghai","allow_wallet_overage":false}]',
1, 1
);
INSERT INTO payment_orders (
id, order_no, wallet_id, user_id, amount_usd, refunded_amount_usd,
refundable_amount_usd, payment_method, gateway_response, status, created_at
) VALUES (
'order-quota', 'order-quota', 'wallet-quota', 'user-quota', 0.0, 0.0,
0.0, 'admin_manual', '{}', 'credited', 1
);
INSERT INTO user_plan_entitlements (
id, user_id, plan_id, payment_order_id, status, starts_at, expires_at,
entitlements_snapshot, created_at, updated_at
) VALUES (
'entitlement-quota', 'user-quota', 'plan-quota', 'order-quota',
'active', 1, 9999999999,
'[{"type":"daily_quota","daily_quota_usd":10.0,"reset_timezone":"Asia/Shanghai","allow_wallet_overage":false}]',
1, 1
);
"#,
)
.execute(pool)
.await
.expect("quota settlement rows should seed");
}
}