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

fix(core): update amount_capturable in update trackers (#2142)

Browse Source
This commit is contained in:
Hrithikesh
2023-09-13 14:44:31 +05:30
committed by GitHub
parent 9d74a75ddb
commit bed8326597
5 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/data_models/src/payments/payment_attempt.rs
View File

@ -216,6 +216,7 @@ pub enum PaymentAttemptUpdate {
payment_token: Option<String>,
connector: Option<String>,
straight_through_algorithm: Option<serde_json::Value>,
amount_capturable: Option<i64>,
},
AuthenticationTypeUpdate {
authentication_type: storage_enums::AuthenticationType,
@ -236,6 +237,7 @@ pub enum PaymentAttemptUpdate {
straight_through_algorithm: Option<serde_json::Value>,
error_code: Option<Option<String>>,
error_message: Option<Option<String>>,
amount_capturable: Option<i64>,
},
RejectUpdate {
status: storage_enums::AttemptStatus,

6
crates/diesel_models/src/payment_attempt.rs
View File

@ -137,6 +137,7 @@ pub enum PaymentAttemptUpdate {
payment_token: Option<String>,
connector: Option<String>,
straight_through_algorithm: Option<serde_json::Value>,
amount_capturable: Option<i64>,
},
AuthenticationTypeUpdate {
authentication_type: storage_enums::AuthenticationType,
@ -157,6 +158,7 @@ pub enum PaymentAttemptUpdate {
straight_through_algorithm: Option<serde_json::Value>,
error_code: Option<Option<String>>,
error_message: Option<Option<String>>,
amount_capturable: Option<i64>,
},
VoidUpdate {
status: storage_enums::AttemptStatus,
@ -339,6 +341,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
} => Self {
amount: Some(amount),
currency: Some(currency),
@ -356,6 +359,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
..Default::default()
},
PaymentAttemptUpdate::VoidUpdate {
@ -432,10 +436,12 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
} => Self {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
..Default::default()
},
PaymentAttemptUpdate::UnresolvedResponseUpdate {

3
crates/router/src/core/payments/operations/payment_confirm.rs
View File

@ -513,7 +513,7 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
.take();
let order_details = payment_data.payment_intent.order_details.clone();
let metadata = payment_data.payment_intent.metadata.clone();
let authorized_amount = payment_data.payment_attempt.amount;
let payment_attempt_fut = db
.update_payment_attempt_with_attempt_id(
payment_data.payment_attempt,
@ -533,6 +533,7 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
straight_through_algorithm,
error_code,
error_message,
amount_capturable: Some(authorized_amount),
},
storage_scheme,
)

5
crates/router/src/core/payments/operations/payment_create.rs
View File

@ -386,6 +386,7 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
.payment_attempt
.straight_through_algorithm
.clone();
let authorized_amount = payment_data.payment_attempt.amount;
payment_data.payment_attempt = db
.update_payment_attempt_with_attempt_id(
@ -394,6 +395,10 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
payment_token,
connector,
straight_through_algorithm,
amount_capturable: match payment_data.confirm.unwrap_or(true) {
true => Some(authorized_amount),
false => None,
},
},
storage_scheme,
)

8
crates/storage_impl/src/payments/payment_attempt.rs
View File

@ -1089,10 +1089,12 @@ impl DataModelExt for PaymentAttemptUpdate {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
} => DieselPaymentAttemptUpdate::UpdateTrackers {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
},
Self::AuthenticationTypeUpdate {
authentication_type,
@ -1115,6 +1117,7 @@ impl DataModelExt for PaymentAttemptUpdate {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
} => DieselPaymentAttemptUpdate::ConfirmUpdate {
amount,
currency,
@ -1131,6 +1134,7 @@ impl DataModelExt for PaymentAttemptUpdate {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
},
Self::VoidUpdate {
status,
@ -1275,10 +1279,12 @@ impl DataModelExt for PaymentAttemptUpdate {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
} => Self::UpdateTrackers {
payment_token,
connector,
straight_through_algorithm,
amount_capturable,
},
DieselPaymentAttemptUpdate::AuthenticationTypeUpdate {
authentication_type,
@ -1301,6 +1307,7 @@ impl DataModelExt for PaymentAttemptUpdate {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
} => Self::ConfirmUpdate {
amount,
currency,
@ -1317,6 +1324,7 @@ impl DataModelExt for PaymentAttemptUpdate {
straight_through_algorithm,
error_code,
error_message,
amount_capturable,
},
DieselPaymentAttemptUpdate::VoidUpdate {
status,