feat(core): consume card details from billing connectors and first error codes and store them in payment intent table

api-reference-v2/openapi_spec.json

@@ -17808,7 +17808,8 @@
           "billing_connector_payment_details",
           "payment_method_type",
           "payment_method_subtype",
-          "connector"
+          "connector",
+          "card_network"
         ],
         "properties": {
           "total_retry_count": {
@@ -17853,6 +17854,33 @@
             "format": "date-time",
             "description": "Invoice Next billing time",
             "nullable": true
+          },
+          "card_network": {
+            "$ref": "#/components/schemas/CardNetwork"
+          },
+          "card_issuer": {
+            "type": "string",
+            "description": "Card Issuer",
+            "example": "JP MORGAN CHASE",
+            "nullable": true
+          },
+          "first_payment_attempt_pg_error_code": {
+            "type": "string",
+            "description": "First Payment Attempt Payment Gateway Error Code",
+            "example": "card_declined",
+            "nullable": true
+          },
+          "first_payment_attempt_network_decline_code": {
+            "type": "string",
+            "description": "First Payment Attempt Network Error Code",
+            "example": "05",
+            "nullable": true
+          },
+          "first_payment_attempt_network_advice_code": {
+            "type": "string",
+            "description": "First Payment Attempt Network Advice Code",
+            "example": "02",
+            "nullable": true
           }
         }
       },

crates/api_models/src/payments.rs

@@ -8684,9 +8684,41 @@ pub struct PaymentRevenueRecoveryMetadata {
     /// The name of the payment connector through which the payment attempt was made.
     #[schema(value_type = Connector, example = "stripe")]
     pub connector: common_enums::connector_enums::Connector,
+    #[schema(value_type = BillingConnectorPaymentMethodDetails)]
+    /// Extra Payment Method Details that are needed to be stored
+    pub billing_connector_payment_method_details: Option<BillingConnectorPaymentMethodDetails>,
     /// Invoice Next billing time
+    #[serde(default, with = "common_utils::custom_serde::iso8601::option")]
     pub invoice_next_billing_time: Option<PrimitiveDateTime>,
+    /// First Payment Attempt Payment Gateway Error Code
+    #[schema(value_type = Option<String>, example = "card_declined")]
+    pub first_payment_attempt_pg_error_code: Option<String>,
+    /// First Payment Attempt Network Error Code
+    #[schema(value_type = Option<String>, example = "05")]
+    pub first_payment_attempt_network_decline_code: Option<String>,
+    /// First Payment Attempt Network Advice Code
+    #[schema(value_type = Option<String>, example = "02")]
+    pub first_payment_attempt_network_advice_code: Option<String>,
+}
+
+#[cfg(feature = "v2")]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, ToSchema)]
+#[serde(tag = "type", content = "value")]
+pub enum BillingConnectorPaymentMethodDetails {
+    Card(BillingConnectorAdditionalCardInfo),
+}
+
+#[cfg(feature = "v2")]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, ToSchema)]
+pub struct BillingConnectorAdditionalCardInfo {
+    #[schema(value_type = CardNetwork, example = "Visa")]
+    /// Card Network
+    pub card_network: Option<common_enums::enums::CardNetwork>,
+    #[schema(value_type = Option<String>, example = "JP MORGAN CHASE")]
+    /// Card Issuer
+    pub card_issuer: Option<String>,
 }
+
 #[cfg(feature = "v2")]
 impl PaymentRevenueRecoveryMetadata {
     pub fn set_payment_transmission_field_for_api_request(
@@ -8800,6 +8832,14 @@ pub struct PaymentsAttemptRecordRequest {
     /// source where the payment was triggered by
     #[schema(value_type = TriggeredBy, example = "internal" )]
     pub triggered_by: common_enums::TriggeredBy,
+
+    #[schema(value_type = CardNetwork, example = "Visa" )]
+    /// card_network
+    pub card_network: Option<common_enums::CardNetwork>,
+
+    #[schema(example = "Chase")]
+    /// Card Issuer
+    pub card_issuer: Option<String>,
 }
 
 /// Error details for the payment

crates/diesel_models/src/types.rs

@@ -174,6 +174,14 @@ pub struct PaymentRevenueRecoveryMetadata {
     pub connector: common_enums::connector_enums::Connector,
     /// Time at which next invoice will be created
     pub invoice_next_billing_time: Option<time::PrimitiveDateTime>,
+    /// Extra Payment Method Details that are needed to be stored
+    pub billing_connector_payment_method_details: Option<BillingConnectorPaymentMethodDetails>,
+    /// First Payment Attempt Payment Gateway Error Code
+    pub first_payment_attempt_pg_error_code: Option<String>,
+    /// First Payment Attempt Network Error Code
+    pub first_payment_attempt_network_decline_code: Option<String>,
+    /// First Payment Attempt Network Advice Code
+    pub first_payment_attempt_network_advice_code: Option<String>,
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
@@ -184,3 +192,19 @@ pub struct BillingConnectorPaymentDetails {
     /// Billing Connector's Customer Id
     pub connector_customer_id: String,
 }
+
+#[cfg(feature = "v2")]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+#[serde(tag = "type", content = "value")]
+pub enum BillingConnectorPaymentMethodDetails {
+    Card(BillingConnectorAdditionalCardInfo),
+}
+
+#[cfg(feature = "v2")]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+pub struct BillingConnectorAdditionalCardInfo {
+    /// Card Network
+    pub card_network: Option<common_enums::enums::CardNetwork>,
+    /// Card Issuer
+    pub card_issuer: Option<String>,
+}

crates/hyperswitch_connectors/src/connectors/chargebee/transformers.rs

@@ -335,6 +335,8 @@ pub struct ChargebeePaymentMethodDetails {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct ChargebeeCardDetails {
     funding_type: ChargebeeFundingType,
+    brand: common_enums::CardNetwork,
+    iin: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -505,6 +507,8 @@ impl TryFrom<ChargebeeWebhookBody> for revenue_recovery::RevenueRecoveryAttemptD
             network_error_message: None,
             retry_count,
             invoice_next_billing_time,
+            card_network: Some(payment_method_details.card.brand),
+            card_isin: Some(payment_method_details.card.iin),
         })
     }
 }

crates/hyperswitch_connectors/src/connectors/recurly/transformers.rs

@@ -136,6 +136,8 @@ pub struct PaymentMethod {
     pub gateway_token: String,
     pub funding_source: RecurlyFundingTypes,
     pub object: RecurlyPaymentObject,
+    pub card_type: common_enums::CardNetwork,
+    pub first_six: String,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -204,6 +206,8 @@ impl
                     payment_method_type: common_enums::PaymentMethod::from(
                         item.response.payment_method.object,
                     ),
+                    card_network: Some(item.response.payment_method.card_type),
+                    card_isin: Some(item.response.payment_method.first_six),
                 },
             ),
             ..item.data

crates/hyperswitch_connectors/src/connectors/stripebilling/transformers.rs

@@ -439,14 +439,15 @@ pub struct StripebillingLatestChargeData {
     pub payment_method_details: StripePaymentMethodDetails,
     #[serde(rename = "invoice")]
     pub invoice_id: String,
+    pub payment_intent: String,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct StripePaymentMethodDetails {
     #[serde(rename = "type")]
     pub type_of_payment_method: StripebillingPaymentMethod,
     #[serde(rename = "card")]
-    pub card_funding_type: StripeCardFundingTypeDetails,
+    pub card_details: StripeBillingCardDetails,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
@@ -456,10 +457,31 @@ pub enum StripebillingPaymentMethod {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct StripeCardFundingTypeDetails {
+pub struct StripeBillingCardDetails {
+    pub network: StripebillingCardNetwork,
     pub funding: StripebillingFundingTypes,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
+#[serde(rename_all = "snake_case")]
+pub enum StripebillingCardNetwork {
+    Visa,
+    Mastercard,
+    AmericanExpress,
+    JCB,
+    DinersClub,
+    Discover,
+    CartesBancaires,
+    UnionPay,
+    Interac,
+    RuPay,
+    Maestro,
+    Star,
+    Pulse,
+    Accel,
+    Nyce,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]
 #[serde(rename = "snake_case")]
 pub enum StripebillingFundingTypes {
@@ -509,7 +531,7 @@ impl
                     field_name: "invoice_id",
                 })?;
         let connector_transaction_id = Some(common_utils::types::ConnectorTransactionId::from(
-            charge_details.charge_id,
+            charge_details.payment_intent,
         ));
 
         Ok(Self {
@@ -529,14 +551,16 @@ impl
                     connector_customer_id: charge_details.customer,
                     transaction_created_at: Some(charge_details.created),
                     payment_method_sub_type: common_enums::PaymentMethodType::from(
-                        charge_details
-                            .payment_method_details
-                            .card_funding_type
-                            .funding,
+                        charge_details.payment_method_details.card_details.funding,
                     ),
                     payment_method_type: common_enums::PaymentMethod::from(
                         charge_details.payment_method_details.type_of_payment_method,
                     ),
+                    card_network: Some(common_enums::CardNetwork::from(
+                        charge_details.payment_method_details.card_details.network,
+                    )),
+                    // Todo: Fetch Card issuer details. Generally in the other billing connector we are getting card_issuer using the card bin info. But stripe dosent provide any such details. We should find a way for stripe billing case
+                    card_isin: None,
                 },
             ),
             ..item.data
@@ -611,3 +635,25 @@ impl
         })
     }
 }
+
+impl From<StripebillingCardNetwork> for enums::CardNetwork {
+    fn from(item: StripebillingCardNetwork) -> Self {
+        match item {
+            StripebillingCardNetwork::Visa => Self::Visa,
+            StripebillingCardNetwork::Mastercard => Self::Mastercard,
+            StripebillingCardNetwork::AmericanExpress => Self::AmericanExpress,
+            StripebillingCardNetwork::JCB => Self::JCB,
+            StripebillingCardNetwork::DinersClub => Self::DinersClub,
+            StripebillingCardNetwork::Discover => Self::Discover,
+            StripebillingCardNetwork::CartesBancaires => Self::CartesBancaires,
+            StripebillingCardNetwork::UnionPay => Self::UnionPay,
+            StripebillingCardNetwork::Interac => Self::Interac,
+            StripebillingCardNetwork::RuPay => Self::RuPay,
+            StripebillingCardNetwork::Maestro => Self::Maestro,
+            StripebillingCardNetwork::Star => Self::Star,
+            StripebillingCardNetwork::Pulse => Self::Pulse,
+            StripebillingCardNetwork::Accel => Self::Accel,
+            StripebillingCardNetwork::Nyce => Self::Nyce,
+        }
+    }
+}

crates/hyperswitch_domain_models/src/lib.rs

@@ -55,15 +55,20 @@ use api_models::payments::{
 };
 #[cfg(feature = "v2")]
 use api_models::payments::{
+    BillingConnectorAdditionalCardInfo as ApiBillingConnectorAdditionalCardInfo,
     BillingConnectorPaymentDetails as ApiBillingConnectorPaymentDetails,
+    BillingConnectorPaymentMethodDetails as ApiBillingConnectorPaymentMethodDetails,
     PaymentRevenueRecoveryMetadata as ApiRevenueRecoveryMetadata,
 };
 use diesel_models::types::{
     ApplePayRecurringDetails, ApplePayRegularBillingDetails, FeatureMetadata,
     OrderDetailsWithAmount, RecurringPaymentIntervalUnit, RedirectResponse,
 };
 #[cfg(feature = "v2")]
-use diesel_models::types::{BillingConnectorPaymentDetails, PaymentRevenueRecoveryMetadata};
+use diesel_models::types::{
+    BillingConnectorAdditionalCardInfo, BillingConnectorPaymentDetails,
+    BillingConnectorPaymentMethodDetails, PaymentRevenueRecoveryMetadata,
+};
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub enum RemoteStorageObject<T: ForeignIDRef> {
@@ -267,6 +272,44 @@ impl ApiModelToDieselModelConvertor<ApiApplePayRecurringDetails> for ApplePayRec
     }
 }
 
+#[cfg(feature = "v2")]
+impl ApiModelToDieselModelConvertor<ApiBillingConnectorAdditionalCardInfo>
+    for BillingConnectorAdditionalCardInfo
+{
+    fn convert_from(from: ApiBillingConnectorAdditionalCardInfo) -> Self {
+        Self {
+            card_issuer: from.card_issuer,
+            card_network: from.card_network,
+        }
+    }
+
+    fn convert_back(self) -> ApiBillingConnectorAdditionalCardInfo {
+        ApiBillingConnectorAdditionalCardInfo {
+            card_issuer: self.card_issuer,
+            card_network: self.card_network,
+        }
+    }
+}
+
+#[cfg(feature = "v2")]
+impl ApiModelToDieselModelConvertor<ApiBillingConnectorPaymentMethodDetails>
+    for BillingConnectorPaymentMethodDetails
+{
+    fn convert_from(from: ApiBillingConnectorPaymentMethodDetails) -> Self {
+        match from {
+            ApiBillingConnectorPaymentMethodDetails::Card(data) => {
+                Self::Card(BillingConnectorAdditionalCardInfo::convert_from(data))
+            }
+        }
+    }
+
+    fn convert_back(self) -> ApiBillingConnectorPaymentMethodDetails {
+        match self {
+            Self::Card(data) => ApiBillingConnectorPaymentMethodDetails::Card(data.convert_back()),
+        }
+    }
+}
+
 #[cfg(feature = "v2")]
 impl ApiModelToDieselModelConvertor<ApiRevenueRecoveryMetadata> for PaymentRevenueRecoveryMetadata {
     fn convert_from(from: ApiRevenueRecoveryMetadata) -> Self {
@@ -282,6 +325,14 @@ impl ApiModelToDieselModelConvertor<ApiRevenueRecoveryMetadata> for PaymentReven
             payment_method_subtype: from.payment_method_subtype,
             connector: from.connector,
             invoice_next_billing_time: from.invoice_next_billing_time,
+            billing_connector_payment_method_details: from
+                .billing_connector_payment_method_details
+                .map(BillingConnectorPaymentMethodDetails::convert_from),
+            first_payment_attempt_network_advice_code: from
+                .first_payment_attempt_network_advice_code,
+            first_payment_attempt_network_decline_code: from
+                .first_payment_attempt_network_decline_code,
+            first_payment_attempt_pg_error_code: from.first_payment_attempt_pg_error_code,
         }
     }
 
@@ -298,6 +349,14 @@ impl ApiModelToDieselModelConvertor<ApiRevenueRecoveryMetadata> for PaymentReven
             payment_method_subtype: self.payment_method_subtype,
             connector: self.connector,
             invoice_next_billing_time: self.invoice_next_billing_time,
+            billing_connector_payment_method_details: self
+                .billing_connector_payment_method_details
+                .map(|data| data.convert_back()),
+            first_payment_attempt_network_advice_code: self
+                .first_payment_attempt_network_advice_code,
+            first_payment_attempt_network_decline_code: self
+                .first_payment_attempt_network_decline_code,
+            first_payment_attempt_pg_error_code: self.first_payment_attempt_pg_error_code,
         }
     }
 }