mtd/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Mural fixes (#4709)

Browse Source
This commit is contained in:
aecsocket
2025-11-03 16:12:30 -08:00
committed by GitHub
parent 5a41a35716
commit 2d218d79c6
1 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/labrinth/src/routes/v3/payouts.rs
View File

@@ -591,7 +591,8 @@ pub async fn create_payout(
// we first make sure that `amount - total fees` is greater than zero, // we first make sure that `amount - total fees` is greater than zero,
// then we issue a payout request with `amount - platform fees` // then we issue a payout request with `amount - platform fees`
if (body.amount - fees.total_fee()).round_dp(2) <= Decimal::ZERO { let amount_minus_fee = body.amount - fees.total_fee();
if amount_minus_fee.round_dp(2) <= Decimal::ZERO {
return Err(ApiError::InvalidInput( return Err(ApiError::InvalidInput(
"You need to withdraw more to cover the fee!".to_string(), "You need to withdraw more to cover the fee!".to_string(),
)); ));
@@ -608,7 +609,7 @@ pub async fn create_payout(
body: &body, body: &body,
user: &user, user: &user,
payout_id, payout_id,
raw_amount: body.amount, amount_minus_fee,
total_fee: fees.total_fee(), total_fee: fees.total_fee(),
sent_to_method, sent_to_method,
payouts_queue: &payouts_queue, payouts_queue: &payouts_queue,
@@ -647,7 +648,9 @@ struct PayoutContext<'a> {
body: &'a Withdrawal, body: &'a Withdrawal,
user: &'a DBUser, user: &'a DBUser,
payout_id: DBPayoutId, payout_id: DBPayoutId,
raw_amount: Decimal, /// Set as the [`DBPayout::amount`] field.
amount_minus_fee: Decimal,
/// Set as the [`DBPayout::fee`] field.
total_fee: Decimal, total_fee: Decimal,
sent_to_method: Decimal, sent_to_method: Decimal,
payouts_queue: &'a PayoutsQueue, payouts_queue: &'a PayoutsQueue,
@@ -671,7 +674,7 @@ async fn tremendous_payout(
body, body,
user, user,
payout_id, payout_id,
raw_amount, amount_minus_fee,
total_fee, total_fee,
sent_to_method, sent_to_method,
payouts_queue, payouts_queue,
@@ -688,7 +691,7 @@ async fn tremendous_payout(
user_id: user.id, user_id: user.id,
created: Utc::now(), created: Utc::now(),
status: PayoutStatus::InTransit, status: PayoutStatus::InTransit,
amount: raw_amount, amount: amount_minus_fee,
fee: Some(total_fee), fee: Some(total_fee),
method: Some(PayoutMethodType::Tremendous), method: Some(PayoutMethodType::Tremendous),
method_address: Some(user_email.to_string()), method_address: Some(user_email.to_string()),
@@ -775,7 +778,7 @@ async fn mural_pay_payout(
body: _body, body: _body,
user, user,
payout_id, payout_id,
raw_amount, amount_minus_fee,
total_fee, total_fee,
sent_to_method, sent_to_method,
payouts_queue, payouts_queue,
@@ -801,7 +804,7 @@ async fn mural_pay_payout(
user_id: user.id, user_id: user.id,
created: Utc::now(), created: Utc::now(),
status: PayoutStatus::Success, status: PayoutStatus::Success,
amount: raw_amount, amount: amount_minus_fee,
fee: Some(total_fee), fee: Some(total_fee),
method: Some(PayoutMethodType::MuralPay), method: Some(PayoutMethodType::MuralPay),
method_address: Some(user_email.to_string()), method_address: Some(user_email.to_string()),
@@ -814,7 +817,7 @@ async fn paypal_payout(
body, body,
user, user,
payout_id, payout_id,
raw_amount, amount_minus_fee,
total_fee, total_fee,
sent_to_method, sent_to_method,
payouts_queue, payouts_queue,
@@ -876,7 +879,7 @@ async fn paypal_payout(
user_id: user.id, user_id: user.id,
created: Utc::now(), created: Utc::now(),
status: PayoutStatus::InTransit, status: PayoutStatus::InTransit,
amount: raw_amount, amount: amount_minus_fee,
fee: Some(total_fee), fee: Some(total_fee),
method: Some(body.method.method_type()), method: Some(body.method.method_type()),
method_address: Some(display_address.clone()), method_address: Some(display_address.clone()),
@@ -1032,25 +1035,36 @@ pub async fn transaction_history(
}); });
let mut payouts_available = sqlx::query!( let mut payouts_available = sqlx::query!(
"SELECT date_available, amount "
SELECT date_available, SUM(amount) AS amount
FROM payouts_values FROM payouts_values
WHERE user_id = $1 WHERE user_id = $1
AND NOW() >= date_available", AND NOW() >= date_available
GROUP BY date_available
",
DBUserId::from(user.id) as DBUserId DBUserId::from(user.id) as DBUserId
) )
.fetch(&**pool) .fetch(&**pool)
.map(|record| { .map(|record| {
let record = record let record = record
.wrap_internal_err("failed to fetch available payout record")?; .wrap_internal_err("failed to fetch available payout record")?;
Ok(TransactionItem::PayoutAvailable { let amount = record.amount.unwrap_or_default();
created: record.date_available, if amount > Decimal::ZERO {
payout_source: PayoutSource::CreatorRewards, Ok(Some(TransactionItem::PayoutAvailable {
amount: record.amount, created: record.date_available,
}) payout_source: PayoutSource::CreatorRewards,
amount,
}))
} else {
Ok(None)
}
}) })
.collect::<Result<Vec<_>, ApiError>>() .collect::<Result<Vec<_>, ApiError>>()
.await .await
.wrap_internal_err("failed to fetch available payouts")?; .wrap_internal_err("failed to fetch available payouts")?
.into_iter()
.flatten()
.collect::<Vec<_>>();
let mut txn_items = Vec::new(); let mut txn_items = Vec::new();
txn_items.extend(withdrawals); txn_items.extend(withdrawals);