refactor(core): updated payments response with payment_method_id & payment_method_status (#3883)

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>

Author: prajjwalkumar17

crates/api_models/src/payments.rs

@@ -2717,6 +2717,13 @@ pub struct PaymentsResponse {
 
     /// Payment Fingerprint
     pub fingerprint: Option<String>,
+
+    /// Payment Method Id
+    pub payment_method_id: Option<String>,
+
+    /// Payment Method Status
+    #[schema(value_type = Option<PaymentMethodStatus>)]
+    pub payment_method_status: Option<common_enums::PaymentMethodStatus>,
 }
 
 #[derive(Setter, Clone, Default, Debug, PartialEq, serde::Serialize, ToSchema)]

crates/common_enums/src/enums.rs

@@ -1205,6 +1205,36 @@ pub enum PaymentMethodStatus {
     Processing,
 }
 
+impl From<AttemptStatus> for PaymentMethodStatus {
+    fn from(attempt_status: AttemptStatus) -> Self {
+        match attempt_status {
+            AttemptStatus::Charged | AttemptStatus::Authorized => Self::Active,
+            AttemptStatus::Failure => Self::Inactive,
+            AttemptStatus::Voided
+            | AttemptStatus::Started
+            | AttemptStatus::Pending
+            | AttemptStatus::Unresolved
+            | AttemptStatus::CodInitiated
+            | AttemptStatus::Authorizing
+            | AttemptStatus::VoidInitiated
+            | AttemptStatus::AuthorizationFailed
+            | AttemptStatus::RouterDeclined
+            | AttemptStatus::AuthenticationSuccessful
+            | AttemptStatus::PaymentMethodAwaited
+            | AttemptStatus::AuthenticationFailed
+            | AttemptStatus::AuthenticationPending
+            | AttemptStatus::CaptureInitiated
+            | AttemptStatus::CaptureFailed
+            | AttemptStatus::VoidFailed
+            | AttemptStatus::AutoRefunded
+            | AttemptStatus::PartialCharged
+            | AttemptStatus::PartialChargedAndChargeable
+            | AttemptStatus::ConfirmationAwaited
+            | AttemptStatus::DeviceDataCollectionPending => Self::Processing,
+        }
+    }
+}
+
 /// To indicate the type of payment experience that the customer would go through
 #[derive(
     Eq,

crates/data_models/src/payments/payment_attempt.rs

@@ -323,6 +323,7 @@ pub enum PaymentAttemptUpdate {
         authentication_id: Option<String>,
         payment_method_billing_address_id: Option<String>,
         fingerprint_id: Option<String>,
+        payment_method_id: Option<String>,
     },
     RejectUpdate {
         status: storage_enums::AttemptStatus,

crates/diesel_models/src/payment_attempt.rs

@@ -226,6 +226,7 @@ pub enum PaymentAttemptUpdate {
         fingerprint_id: Option<String>,
         updated_by: String,
         merchant_connector_id: Option<String>,
+        payment_method_id: Option<String>,
         external_three_ds_authentication_attempted: Option<bool>,
         authentication_connector: Option<String>,
         authentication_id: Option<String>,
@@ -574,6 +575,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 authentication_id,
                 payment_method_billing_address_id,
                 fingerprint_id,
+                payment_method_id,
             } => Self {
                 amount: Some(amount),
                 currency: Some(currency),
@@ -601,6 +603,7 @@ impl From<PaymentAttemptUpdate> for PaymentAttemptUpdateInternal {
                 authentication_id,
                 payment_method_billing_address_id,
                 fingerprint_id,
+                payment_method_id: payment_method_id.map(Some),
                 ..Default::default()
             },
             PaymentAttemptUpdate::VoidUpdate {

crates/openapi/src/openapi.rs

@@ -229,6 +229,7 @@ Never share your secret api keys. Keep them guarded and secure.
         api_models::enums::ReconStatus,
         api_models::enums::ConnectorStatus,
         api_models::enums::AuthorizationStatus,
+        api_models::enums::PaymentMethodStatus,
         api_models::admin::MerchantConnectorCreate,
         api_models::admin::MerchantConnectorUpdate,
         api_models::admin::PrimaryBusinessDetails,

crates/router/src/core/authentication/transformers.rs

@@ -170,6 +170,7 @@ pub fn construct_router_data<F: Clone, Req, Res>(
         frm_metadata: None,
         dispute_id: None,
         refund_id: None,
+        payment_method_status: None,
     })
 }
 

crates/router/src/core/fraud_check/flows/checkout_flow.rs

@@ -64,6 +64,7 @@ impl ConstructFlowSpecificData<frm_api::Checkout, FraudCheckCheckoutData, FraudC
             description: None,
             return_url: None,
             payment_method_id: None,
+            payment_method_status: None,
             address: self.address.clone(),
             auth_type: storage_enums::AuthenticationType::NoThreeDs,
             connector_meta_data: None,

crates/router/src/core/fraud_check/flows/fulfillment_flow.rs

@@ -76,6 +76,7 @@ pub async fn construct_fulfillment_router_data<'a>(
         auth_type: payment_attempt.authentication_type.unwrap_or_default(),
         connector_meta_data: merchant_connector_account.get_metadata(),
         amount_captured: payment_intent.amount_captured,
+        payment_method_status: None,
         request: FraudCheckFulfillmentData {
             amount: payment_attempt.amount,
             order_details: payment_intent.order_details.clone(),

crates/router/src/core/fraud_check/flows/record_return.rs

@@ -84,6 +84,7 @@ impl ConstructFlowSpecificData<RecordReturn, FraudCheckRecordReturnData, FraudCh
             payment_method_token: None,
             connector_customer: None,
             preprocessing_id: None,
+            payment_method_status: None,
             connector_request_reference_id: uuid::Uuid::new_v4().to_string(),
             test_mode: None,
             recurring_mandate_payment_data: None,

crates/router/src/core/fraud_check/flows/sale_flow.rs

@@ -80,6 +80,7 @@ impl ConstructFlowSpecificData<frm_api::Sale, FraudCheckSaleData, FraudCheckResp
             payment_method_token: None,
             connector_customer: None,
             preprocessing_id: None,
+            payment_method_status: None,
             connector_request_reference_id: uuid::Uuid::new_v4().to_string(),
             test_mode: None,
             recurring_mandate_payment_data: None,