Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: return highest bonus #2421

Merged
merged 2 commits into from
Apr 15, 2024
Merged

fix: return highest bonus #2421

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e11cb
fix: calculate max referral bonus
bonomat Apr 15, 2024
4e8d1b3
Update coordinator/src/referrals.rs
bonomat Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions coordinator/src/referrals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::db::bonus_tiers::BonusTier;
use anyhow::Context;
use anyhow::Result;
use bitcoin::secp256k1::PublicKey;
use commons::BonusStatusType;
use commons::ReferralStatus;
use diesel::r2d2::ConnectionManager;
use diesel::r2d2::PooledConnection;
Expand Down Expand Up @@ -87,20 +86,9 @@ pub fn update_referral_status_for_user(
"Updating referral status"
);

// first we check his existing status. If he currently has an active referent status we return
// here
let status = get_referral_status(trader_pubkey, connection)?;
if let Some(bonus_level) = &status.bonus_status_type {
if BonusStatusType::Referent == *bonus_level {
tracing::debug!(
trader_pubkey = trader_pubkey_str,
bonus_tier = status.referral_tier,
bonus_level = ?bonus_level,
"User has active bonus status"
);
return Ok(status);
}
}
// first we check his existing status. If we need to compare it later against the newly computed
// one
let existing_status = get_referral_status(trader_pubkey, connection)?;

// next we need to calculate if he qualifier for a referral program
bonomat marked this conversation as resolved.
Show resolved Hide resolved
let user = db::user::get_user(connection, &trader_pubkey)?.context("User not found")?;
Expand Down Expand Up @@ -138,6 +126,16 @@ pub fn update_referral_status_for_user(
total_referrals = total_referrals,
"Trader has referral status"
);
let referral_fee_bonus = Decimal::from_f32(maybe_bonus_tier.fee_rebate).expect("to fit");
if existing_status.referral_fee_bonus > referral_fee_bonus {
tracing::debug!(
trader_pubkey = trader_pubkey_str,
bonus_tier = existing_status.referral_tier,
bonus_level = ?existing_status.bonus_status_type,
"User has active bonus status"
);
return Ok(existing_status);
}

return Ok(ReferralStatus {
referral_code,
Expand All @@ -147,18 +145,18 @@ pub fn update_referral_status_for_user(
.count(),
number_of_total_referrals: total_referrals,
referral_tier: maybe_bonus_tier.tier_level as usize,
referral_fee_bonus: Decimal::from_f32(maybe_bonus_tier.fee_rebate).expect("to fit"),
referral_fee_bonus,
bonus_status_type: Some(maybe_bonus_tier.bonus_tier_type.into()),
});
}

tracing::debug!(
trader_pubkey = trader_pubkey.to_string(),
"Trader doesn't have any new referral status yet"
trader_pubkey = trader_pubkey_str,
bonus_tier = existing_status.referral_tier,
bonus_status_type = ?existing_status.bonus_status_type,
"User's bonus status"
);

// User doesn't have any new referral status yet
Ok(status)
Ok(existing_status)
}

/// Returns the tier_level of the calculated tier.
Expand Down
Loading