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

refactor: attempt and intent status (#210)

Browse Source
This commit is contained in:
Sangamesh Kulkarni
2022-12-23 19:28:06 +05:30
committed by GitHub
parent c9276a30d7
commit 279961e169
10 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/api_models/src/enums.rs
View File

@ -15,9 +15,9 @@
pub enum AttemptStatus { pub enum AttemptStatus {
Started, Started,
AuthenticationFailed, AuthenticationFailed,
JuspayDeclined, RouterDeclined,
PendingVbv, AuthenticationPending,
VbvSuccessful, AuthenticationSuccessful,
Authorized, Authorized,
AuthorizationFailed, AuthorizationFailed,
Charged, Charged,
@ -506,11 +506,11 @@ impl From<AttemptStatus> for IntentStatus {
AttemptStatus::PaymentMethodAwaited => IntentStatus::RequiresPaymentMethod, AttemptStatus::PaymentMethodAwaited => IntentStatus::RequiresPaymentMethod,
AttemptStatus::Authorized => IntentStatus::RequiresCapture, AttemptStatus::Authorized => IntentStatus::RequiresCapture,
AttemptStatus::PendingVbv => IntentStatus::RequiresCustomerAction, AttemptStatus::AuthenticationPending => IntentStatus::RequiresCustomerAction,
AttemptStatus::PartialCharged AttemptStatus::PartialCharged
| AttemptStatus::Started | AttemptStatus::Started
| AttemptStatus::VbvSuccessful | AttemptStatus::AuthenticationSuccessful
| AttemptStatus::Authorizing | AttemptStatus::Authorizing
| AttemptStatus::CodInitiated | AttemptStatus::CodInitiated
| AttemptStatus::VoidInitiated | AttemptStatus::VoidInitiated
@ -520,7 +520,7 @@ impl From<AttemptStatus> for IntentStatus {
AttemptStatus::AuthenticationFailed AttemptStatus::AuthenticationFailed
| AttemptStatus::AuthorizationFailed | AttemptStatus::AuthorizationFailed
| AttemptStatus::VoidFailed | AttemptStatus::VoidFailed
| AttemptStatus::JuspayDeclined | AttemptStatus::RouterDeclined
| AttemptStatus::CaptureFailed | AttemptStatus::CaptureFailed
| AttemptStatus::Failure => IntentStatus::Failed, | AttemptStatus::Failure => IntentStatus::Failed,
AttemptStatus::Voided => IntentStatus::Cancelled, AttemptStatus::Voided => IntentStatus::Cancelled,

2
crates/router/src/connector/adyen/transformers.rs
View File

@ -471,7 +471,7 @@ pub fn get_redirection_response(
"Authorised" => storage_enums::AttemptStatus::Charged, "Authorised" => storage_enums::AttemptStatus::Charged,
"Refused" => storage_enums::AttemptStatus::Failure, "Refused" => storage_enums::AttemptStatus::Failure,
"Cancelled" => storage_enums::AttemptStatus::Failure, "Cancelled" => storage_enums::AttemptStatus::Failure,
"RedirectShopper" => storage_enums::AttemptStatus::PendingVbv, "RedirectShopper" => storage_enums::AttemptStatus::AuthenticationPending,
_ => storage_enums::AttemptStatus::Pending, _ => storage_enums::AttemptStatus::Pending,
}; };

2
crates/router/src/connector/checkout/transformers.rs
View File

@ -486,7 +486,7 @@ impl TryFrom<types::RefundsResponseRouterData<api::RSync, &ActionResponse>>
impl From<CheckoutRedirectResponseStatus> for enums::AttemptStatus { impl From<CheckoutRedirectResponseStatus> for enums::AttemptStatus {
fn from(item: CheckoutRedirectResponseStatus) -> Self { fn from(item: CheckoutRedirectResponseStatus) -> Self {
match item { match item {
CheckoutRedirectResponseStatus::Success => Self::VbvSuccessful, CheckoutRedirectResponseStatus::Success => Self::AuthenticationSuccessful,
CheckoutRedirectResponseStatus::Failure => Self::Failure, CheckoutRedirectResponseStatus::Failure => Self::Failure,
} }

2
crates/router/src/connector/stripe/transformers.rs
View File

@ -309,7 +309,7 @@ impl From<StripePaymentStatus> for enums::AttemptStatus {
StripePaymentStatus::Succeeded => Self::Charged, StripePaymentStatus::Succeeded => Self::Charged,
StripePaymentStatus::Failed => Self::Failure, StripePaymentStatus::Failed => Self::Failure,
StripePaymentStatus::Processing => Self::Authorizing, StripePaymentStatus::Processing => Self::Authorizing,
StripePaymentStatus::RequiresCustomerAction => Self::PendingVbv, StripePaymentStatus::RequiresCustomerAction => Self::AuthenticationPending,
StripePaymentStatus::RequiresPaymentMethod => Self::PaymentMethodAwaited, StripePaymentStatus::RequiresPaymentMethod => Self::PaymentMethodAwaited,
StripePaymentStatus::RequiresConfirmation => Self::ConfirmationAwaited, StripePaymentStatus::RequiresConfirmation => Self::ConfirmationAwaited,
StripePaymentStatus::Canceled => Self::Voided, StripePaymentStatus::Canceled => Self::Voided,

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

@ -273,7 +273,7 @@ impl<F: Clone> UpdateTracker<F, PaymentData<F>, api::PaymentsRequest> for Paymen
), ),
_ => ( _ => (
enums::IntentStatus::RequiresCustomerAction, enums::IntentStatus::RequiresCustomerAction,
enums::AttemptStatus::PendingVbv, enums::AttemptStatus::AuthenticationPending,
), ),
}; };

2
crates/router/src/scheduler/workflows/payment_sync.rs
View File

@ -47,7 +47,7 @@ impl ProcessTrackerWorkflow for PaymentsSyncWorkflow {
.await?; .await?;
let terminal_status = vec![ let terminal_status = vec![
enums::AttemptStatus::JuspayDeclined, enums::AttemptStatus::RouterDeclined,
enums::AttemptStatus::Charged, enums::AttemptStatus::Charged,
enums::AttemptStatus::AutoRefunded, enums::AttemptStatus::AutoRefunded,
enums::AttemptStatus::Voided, enums::AttemptStatus::Voided,

6
crates/router/src/types/transformers.rs
View File

@ -187,13 +187,13 @@ impl From<F<storage_enums::AttemptStatus>> for F<storage_enums::IntentStatus> {
storage_enums::AttemptStatus::Authorized => { storage_enums::AttemptStatus::Authorized => {
storage_enums::IntentStatus::RequiresCapture storage_enums::IntentStatus::RequiresCapture
} }
storage_enums::AttemptStatus::PendingVbv => { storage_enums::AttemptStatus::AuthenticationPending => {
storage_enums::IntentStatus::RequiresCustomerAction storage_enums::IntentStatus::RequiresCustomerAction
} }
storage_enums::AttemptStatus::PartialCharged storage_enums::AttemptStatus::PartialCharged
| storage_enums::AttemptStatus::Started | storage_enums::AttemptStatus::Started
| storage_enums::AttemptStatus::VbvSuccessful | storage_enums::AttemptStatus::AuthenticationSuccessful
| storage_enums::AttemptStatus::Authorizing | storage_enums::AttemptStatus::Authorizing
| storage_enums::AttemptStatus::CodInitiated | storage_enums::AttemptStatus::CodInitiated
| storage_enums::AttemptStatus::VoidInitiated | storage_enums::AttemptStatus::VoidInitiated
@ -203,7 +203,7 @@ impl From<F<storage_enums::AttemptStatus>> for F<storage_enums::IntentStatus> {
storage_enums::AttemptStatus::AuthenticationFailed storage_enums::AttemptStatus::AuthenticationFailed
| storage_enums::AttemptStatus::AuthorizationFailed | storage_enums::AttemptStatus::AuthorizationFailed
| storage_enums::AttemptStatus::VoidFailed | storage_enums::AttemptStatus::VoidFailed
| storage_enums::AttemptStatus::JuspayDeclined | storage_enums::AttemptStatus::RouterDeclined
| storage_enums::AttemptStatus::CaptureFailed | storage_enums::AttemptStatus::CaptureFailed
| storage_enums::AttemptStatus::Failure => storage_enums::IntentStatus::Failed, | storage_enums::AttemptStatus::Failure => storage_enums::IntentStatus::Failed,
storage_enums::AttemptStatus::Voided => storage_enums::IntentStatus::Cancelled, storage_enums::AttemptStatus::Voided => storage_enums::IntentStatus::Cancelled,

6
crates/storage_models/src/enums.rs
View File

@ -33,9 +33,9 @@ pub mod diesel_exports {
pub enum AttemptStatus { pub enum AttemptStatus {
Started, Started,
AuthenticationFailed, AuthenticationFailed,
JuspayDeclined, RouterDeclined,
PendingVbv, AuthenticationPending,
VbvSuccessful, AuthenticationSuccessful,
Authorized, Authorized,
AuthorizationFailed, AuthorizationFailed,
Charged, Charged,

3
migrations/2022-12-22-091431_attempt_status_rename/down.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TYPE "AttemptStatus" RENAME VALUE 'router_declined' TO 'juspay_declined';
ALTER TYPE "AttemptStatus" RENAME VALUE 'authentication_successful' TO 'pending_vbv';
ALTER TYPE "AttemptStatus" RENAME VALUE 'authentication_pending' TO 'vbv_successful';

3
migrations/2022-12-22-091431_attempt_status_rename/up.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TYPE "AttemptStatus" RENAME VALUE 'juspay_declined' TO 'router_declined';
ALTER TYPE "AttemptStatus" RENAME VALUE 'pending_vbv' TO 'authentication_successful';
ALTER TYPE "AttemptStatus" RENAME VALUE 'vbv_successful' TO 'authentication_pending';