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

fix(router): update last used when the customer acceptance is passed in the recurring payment (#5116)

Browse Source
This commit is contained in:
Shankar Singh C
2024-07-02 17:29:06 +05:30
committed by GitHub
parent e3470a240d
commit b2e0caf6d9
4 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/router/src/core/payment_methods/cards.rs
View File

@ -1407,14 +1407,31 @@ pub async fn call_to_locker_hs<'a>(
Ok(stored_card)
}
pub async fn update_payment_method(
pub async fn update_payment_method_metadata_and_last_used(
db: &dyn db::StorageInterface,
pm: payment_method::PaymentMethod,
pm_metadata: serde_json::Value,
pm_metadata: Option<serde_json::Value>,
storage_scheme: MerchantStorageScheme,
) -> errors::CustomResult<(), errors::VaultError> {
let pm_update = payment_method::PaymentMethodUpdate::MetadataUpdate {
metadata: Some(pm_metadata),
let pm_update = payment_method::PaymentMethodUpdate::MetadataUpdateAndLastUsed {
metadata: pm_metadata,
last_used_at: common_utils::date_time::now(),
};
db.update_payment_method(pm, pm_update, storage_scheme)
.await
.change_context(errors::VaultError::UpdateInPaymentMethodDataTableFailed)?;
Ok(())
}
pub async fn update_payment_method_and_last_used(
db: &dyn db::StorageInterface,
pm: payment_method::PaymentMethod,
payment_method_update: Option<Encryption>,
storage_scheme: MerchantStorageScheme,
) -> errors::CustomResult<(), errors::VaultError> {
let pm_update = payment_method::PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {
payment_method_data: payment_method_update,
last_used_at: common_utils::date_time::now(),
};
db.update_payment_method(pm, pm_update, storage_scheme)
.await

11
crates/router/src/core/payments/operations/payment_response.rs
View File

@ -114,9 +114,14 @@ impl<F: Send + Clone> PostUpdateTracker<F, PaymentData<F>, types::PaymentsAuthor
.get_payment_method_billing()
.and_then(|billing_details| billing_details.address.as_ref())
.and_then(|address| address.get_optional_full_name());
let mut should_avoid_saving = false;
if let Some(payment_method_info) = &payment_data.payment_method_info {
if payment_data.payment_intent.off_session.is_none() && resp.response.is_ok() {
should_avoid_saving = resp.request.payment_method_type
== Some(enums::PaymentMethodType::ApplePay)
|| resp.request.payment_method_type
== Some(enums::PaymentMethodType::GooglePay);
payment_methods::cards::update_last_used_at(
payment_method_info,
state,
@ -179,6 +184,12 @@ impl<F: Send + Clone> PostUpdateTracker<F, PaymentData<F>, types::PaymentsAuthor
let (payment_method_id, _payment_method_status) = save_payment_call_future.await?;
payment_data.payment_attempt.payment_method_id = payment_method_id;
Ok(())
} else if should_avoid_saving {
if let Some(pm_info) = &payment_data.payment_method_info {
payment_data.payment_attempt.payment_method_id =
Some(pm_info.payment_method_id.clone());
};
Ok(())
} else {
// Save card flow
let save_payment_data = tokenization::SavePaymentMethodData::from(resp);

51
crates/router/src/core/payments/tokenization.rs
View File

@ -272,20 +272,15 @@ where
pm.metadata.as_ref(),
connector_token,
)?;
if let Some(metadata) = pm_metadata {
payment_methods::cards::update_payment_method(
db,
pm.clone(),
metadata,
merchant_account.storage_scheme,
)
.await
.change_context(
errors::ApiErrorResponse::InternalServerError,
)
.attach_printable("Failed to add payment method in db")?;
};
// update if its a off-session mit payment
payment_methods::cards::update_payment_method_metadata_and_last_used(
db,
pm.clone(),
pm_metadata,
merchant_account.storage_scheme,
)
.await
.change_context(errors::ApiErrorResponse::InternalServerError)
.attach_printable("Failed to add payment method in db")?;
if check_for_mit_mandates {
let connector_mandate_details =
update_connector_mandate_details_in_payment_method(
@ -515,14 +510,10 @@ where
.await
.map(|details| details.into());
let pm_update =
storage::PaymentMethodUpdate::PaymentMethodDataUpdate {
payment_method_data: pm_data_encrypted,
};
db.update_payment_method(
payment_methods::cards::update_payment_method_and_last_used(
db,
existing_pm,
pm_update,
pm_data_encrypted,
merchant_account.storage_scheme,
)
.await
@ -532,7 +523,7 @@ where
}
},
None => {
let customer_saved_pm_id_option = if payment_method_type
let customer_saved_pm_option = if payment_method_type
== Some(api_models::enums::PaymentMethodType::ApplePay)
|| payment_method_type
== Some(api_models::enums::PaymentMethodType::GooglePay)
@ -551,7 +542,7 @@ where
.find(|payment_method| {
payment_method.payment_method_type == payment_method_type
})
.map(|pm| pm.payment_method_id.clone())),
.cloned()),
Err(error) => {
if error.current_context().is_db_not_found() {
Ok(None)
@ -570,8 +561,18 @@ where
Ok(None)
}?;
if let Some(customer_saved_pm_id) = customer_saved_pm_id_option {
resp.payment_method_id = customer_saved_pm_id;
if let Some(customer_saved_pm) = customer_saved_pm_option {
payment_methods::cards::update_last_used_at(
&customer_saved_pm,
state,
merchant_account.storage_scheme,
)
.await
.map_err(|e| {
logger::error!("Failed to update last used at: {:?}", e);
})
.ok();
resp.payment_method_id = customer_saved_pm.payment_method_id;
} else {
let pm_metadata =
create_payment_method_metadata(None, connector_token)?;