resolves comments

Author: Nishanth Challa

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

@@ -337,7 +337,6 @@ pub struct ChargebeeCardDetails {
     funding_type: ChargebeeFundingType,
     brand: common_enums::CardNetwork,
     iin: String,
-    billing_country: common_enums::CountryAlpha2,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

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

@@ -138,7 +138,6 @@ pub struct PaymentMethod {
     pub object: RecurlyPaymentObject,
     pub card_type: common_enums::CardNetwork,
     pub first_six: String,
-    pub cc_bin_country: common_enums::CountryAlpha2,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

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

@@ -459,7 +459,6 @@ pub enum StripebillingPaymentMethod {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct StripeBillingCardDetails {
     pub network: StripebillingCardNetwork,
-    pub country: common_enums::CountryAlpha2,
     pub funding: StripebillingFundingTypes,
 }
 
@@ -560,6 +559,7 @@ impl
                     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,
                 },
             ),

crates/hyperswitch_domain_models/src/payments.rs

@@ -949,43 +949,46 @@ where
         let payment_intent_feature_metadata = self.payment_intent.get_feature_metadata();
         let revenue_recovery = self.payment_intent.get_revenue_recovery_metadata();
         let payment_attempt_connector = self.payment_attempt.connector.clone();
-        let first_pg_error_code = revenue_recovery.as_ref().and_then(|data| {
-            data.first_payment_attempt_pg_error_code
-                .clone()
-                .or_else(|| {
-                    self.payment_attempt
+
+        let feature_metadata_first_pg_error_code = revenue_recovery
+            .as_ref()
+            .and_then(|data| data.first_payment_attempt_pg_error_code.clone());
+
+        let (first_pg_error_code, first_network_advice_code, first_network_decline_code) =
+            feature_metadata_first_pg_error_code.map_or_else(
+                || {
+                    let first_pg_error_code = self
+                        .payment_attempt
                         .error
                         .as_ref()
-                        .map(|error| error.code.clone())
-                })
-        });
+                        .map(|error| error.code.clone());
+                    let first_network_advice_code = self
+                        .payment_attempt
+                        .error
+                        .as_ref()
+                        .and_then(|error| error.network_advice_code.clone());
+                    let first_network_decline_code = self
+                        .payment_attempt
+                        .error
+                        .as_ref()
+                        .and_then(|error| error.network_decline_code.clone());
+                    (
+                        first_pg_error_code,
+                        first_network_advice_code,
+                        first_network_decline_code,
+                    )
+                },
+                |pg_code| {
+                    let advice_code = revenue_recovery
+                        .as_ref()
+                        .and_then(|data| data.first_payment_attempt_network_advice_code.clone());
+                    let decline_code = revenue_recovery
+                        .as_ref()
+                        .and_then(|data| data.first_payment_attempt_network_decline_code.clone());
+                    (Some(pg_code), advice_code, decline_code)
+                },
+            );
 
-        let (first_network_advice_code, first_network_decline_code) =
-            if first_pg_error_code.is_some() {
-                let advice_code = revenue_recovery.as_ref().and_then(|data| {
-                    data.first_payment_attempt_network_advice_code
-                        .clone()
-                        .or_else(|| {
-                            self.payment_attempt
-                                .error
-                                .as_ref()
-                                .map(|error| error.code.clone())
-                        })
-                });
-                let decline_code = revenue_recovery.as_ref().and_then(|data| {
-                    data.first_payment_attempt_network_decline_code
-                        .clone()
-                        .or_else(|| {
-                            self.payment_attempt
-                                .error
-                                .as_ref()
-                                .map(|error| error.code.clone())
-                        })
-                });
-                (advice_code, decline_code)
-            } else {
-                (None, None)
-            };
         let payment_revenue_recovery_metadata = match payment_attempt_connector {
             Some(connector) => Some(diesel_models::types::PaymentRevenueRecoveryMetadata {
                 // Update retry count by one.

crates/router/src/core/webhooks/recovery_incoming.rs

@@ -620,7 +620,12 @@ impl RevenueRecoveryAttempt {
             .clone()
             .async_and_then(|isin| async move {
                 let issuer_identifier_number = isin.clone();
-                state.store.get_card_info(isin.as_str()).await.ok()
+                state
+                    .store
+                    .get_card_info(issuer_identifier_number.as_str())
+                    .await
+                    .map_err(|error| services::logger::warn!(card_info_error=?error))
+                    .ok()
             })
             .await
             .flatten();