rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-11-01 11:06:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(payouts): update helper functions for deciding whether or not to consume flows based on current status (#5248)

Browse Source
This commit is contained in:
Kashif
2024-07-12 13:03:06 +05:30
committed by GitHub
parent 1081e38089
commit d65d7b5cca
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
crates/router/src/core/payouts.rs
View File

@ -368,8 +368,6 @@ pub async fn payouts_confirm_core(
let payout_attempt = payout_data.payout_attempt.to_owned();
let status = payout_attempt.status;
helpers::update_payouts_and_payout_attempt(&mut payout_data, &merchant_account, &req, &state)
.await?;
helpers::validate_payout_status_against_not_allowed_statuses(
&status,
&[
@ -384,10 +382,11 @@ pub async fn payouts_confirm_core(
"confirm",
)?;
// Update payout link's status
helpers::update_payouts_and_payout_attempt(&mut payout_data, &merchant_account, &req, &state)
.await?;
let db = &*state.store;
// payout_data.payout_link
payout_data.payout_link = payout_data
.payout_link
.clone()
@ -467,15 +466,17 @@ pub async fn payouts_update_core(
)
.await?;
payouts_core(
&state,
&merchant_account,
&key_store,
&mut payout_data,
req.routing.clone(),
req.connector.clone(),
)
.await?;
if let Some(true) = payout_data.payouts.confirm {
payouts_core(
&state,
&merchant_account,
&key_store,
&mut payout_data,
req.routing.clone(),
req.connector.clone(),
)
.await?;
}
response_handler(&merchant_account, &payout_data).await
}
@ -2052,6 +2053,18 @@ pub async fn payout_create_db_entries(
format!("payout_{payout_id}_secret").as_str(),
);
let amount = MinorUnit::from(req.amount.unwrap_or(api::Amount::Zero));
let status = if req.payout_method_data.is_some()
|| req.payout_token.is_some()
|| stored_payout_method_data.is_some()
{
match req.confirm {
Some(true) => storage_enums::PayoutStatus::RequiresCreation,
_ => storage_enums::PayoutStatus::RequiresConfirmation,
}
} else {
storage_enums::PayoutStatus::RequiresPayoutMethodData
};
let payouts_req = storage::PayoutsNew {
payout_id: payout_id.to_string(),
merchant_id: merchant_id.to_string(),
@ -2076,6 +2089,7 @@ pub async fn payout_create_db_entries(
.map(|link_data| link_data.link_id.clone()),
client_secret: Some(client_secret),
priority: req.priority,
status,
..Default::default()
};
let payouts = db
@ -2086,17 +2100,6 @@ pub async fn payout_create_db_entries(
})
.attach_printable("Error inserting payouts in db")?;
// Make payout_attempt entry
let status = if req.payout_method_data.is_some()
|| req.payout_token.is_some()
|| stored_payout_method_data.is_some()
{
match req.confirm {
Some(true) => storage_enums::PayoutStatus::RequiresCreation,
_ => storage_enums::PayoutStatus::RequiresConfirmation,
}
} else {
storage_enums::PayoutStatus::RequiresPayoutMethodData
};
let payout_attempt_id = utils::get_payment_attempt_id(payout_id, 1);
let payout_attempt_req = storage::PayoutAttemptNew {

20
crates/router/src/core/payouts/helpers.rs
View File

@ -887,9 +887,12 @@ pub async fn get_gsm_record(
}
pub fn is_payout_initiated(status: api_enums::PayoutStatus) -> bool {
matches!(
!matches!(
status,
api_enums::PayoutStatus::Pending | api_enums::PayoutStatus::RequiresFulfillment
api_enums::PayoutStatus::RequiresCreation
| api_enums::PayoutStatus::RequiresConfirmation
| api_enums::PayoutStatus::RequiresPayoutMethodData
| api_enums::PayoutStatus::RequiresVendorAccountCreation
)
}
@ -910,10 +913,13 @@ pub(crate) fn validate_payout_status_against_not_allowed_statuses(
pub fn is_payout_terminal_state(status: api_enums::PayoutStatus) -> bool {
!matches!(
status,
api_enums::PayoutStatus::Pending
| api_enums::PayoutStatus::RequiresCreation
| api_enums::PayoutStatus::RequiresFulfillment
api_enums::PayoutStatus::RequiresCreation
| api_enums::PayoutStatus::RequiresConfirmation
| api_enums::PayoutStatus::RequiresPayoutMethodData
| api_enums::PayoutStatus::RequiresVendorAccountCreation
// Initiated by the underlying connector
| api_enums::PayoutStatus::Pending
| api_enums::PayoutStatus::RequiresFulfillment
)
}
@ -930,7 +936,9 @@ pub fn is_eligible_for_local_payout_cancellation(status: api_enums::PayoutStatus
matches!(
status,
api_enums::PayoutStatus::RequiresCreation
| api_enums::PayoutStatus::RequiresPayoutMethodData,
| api_enums::PayoutStatus::RequiresConfirmation
| api_enums::PayoutStatus::RequiresPayoutMethodData
| api_enums::PayoutStatus::RequiresVendorAccountCreation
)
}