resolved comment and conflicts

Author: swetasharma03

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

@@ -1659,82 +1659,6 @@ impl TryFrom<&GooglePayWalletData> for StripePaymentMethodData {
     }
 }
 
-fn get_stripe_billing_address(
-    billing_details: Option<hyperswitch_domain_models::address::Address>,
-) -> Option<StripeBillingAddress> {
-    match billing_details {
-        Some(bd) => {
-            let billing_address = bd.address.as_ref();
-            Some(StripeBillingAddress {
-                city: billing_address.and_then(|a| a.city.clone()),
-                country: billing_address.and_then(|a| a.country),
-                address_line1: billing_address.and_then(|a| a.line1.clone()),
-                address_line2: billing_address.and_then(|a| a.line2.clone()),
-                zip_code: billing_address.and_then(|a| a.zip.clone()),
-                state: billing_address.and_then(|a| a.state.clone()),
-                name: billing_address.and_then(|a| {
-                    a.first_name.as_ref().map(|first_name| {
-                        format!(
-                            "{} {}",
-                            first_name.clone().expose(),
-                            a.last_name.clone().expose_option().unwrap_or_default()
-                        )
-                        .into()
-                    })
-                }),
-                email: bd.email.clone(),
-                phone: bd.phone.as_ref().map(|p| {
-                    format!(
-                        "{}{}",
-                        p.country_code.clone().unwrap_or_default(),
-                        p.number.clone().expose_option().unwrap_or_default()
-                    )
-                    .into()
-                }),
-            })
-        }
-        None => None,
-    }
-}
-
-fn get_stripe_billing_address_card_token(
-    billing_details: Option<hyperswitch_domain_models::address::Address>,
-) -> Option<StripeBillingAddressCardToken> {
-    let bd = billing_details?;
-
-    let billing_address = bd.address.as_ref()?;
-
-    let name = match (&billing_address.first_name, &billing_address.last_name) {
-        (Some(first_name), Some(last_name)) => Some(
-            format!(
-                "{} {}",
-                first_name.clone().expose(),
-                last_name.clone().expose()
-            )
-            .into(),
-        ),
-        (Some(first_name), None) => Some(first_name.clone().expose().into()),
-        _ => None,
-    };
-
-    Some(StripeBillingAddressCardToken {
-        name,
-        email: bd.email.clone(),
-        phone: bd.phone.as_ref().map(|p| {
-            format!(
-                "{}{}",
-                p.country_code.clone().unwrap_or_default(),
-                p.number.clone().expose_option().unwrap_or_default()
-            )
-            .into()
-        }),
-        address_line1: billing_address.line1.clone(),
-        address_line2: billing_address.line2.clone(),
-        state: billing_address.state.clone(),
-        city: billing_address.city.clone(),
-    })
-}
-
 impl TryFrom<(&PaymentsAuthorizeRouterData, MinorUnit)> for PaymentIntentRequest {
     type Error = error_stack::Report<ConnectorError>;
     fn try_from(data: (&PaymentsAuthorizeRouterData, MinorUnit)) -> Result<Self, Self::Error> {

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

@@ -2,7 +2,7 @@ use std::{fmt::Debug, marker::PhantomData, str::FromStr};
 
 use api_models::payments::{
     Address, ConnectorMandateReferenceId, CustomerDetails, CustomerDetailsResponse, FrmMessage,
-    RequestSurchargeDetails,
+    MandateIds, RequestSurchargeDetails,
 };
 use common_enums::{Currency, RequestIncrementalAuthorization};
 use common_utils::{
@@ -3388,6 +3388,17 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthoriz
     }
 }
 
+fn get_off_session(
+    mandate_id: Option<&MandateIds>,
+    off_session_flag: Option<bool>,
+) -> Option<bool> {
+    match (mandate_id, off_session_flag) {
+        (_, Some(false)) => Some(false),
+        (Some(_), _) | (_, Some(true)) => Some(true),
+        (None, None) => None,
+    }
+}
+
 #[cfg(all(any(feature = "v1", feature = "v2"), not(feature = "customer_v2")))]
 impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthorizeData {
     type Error = error_stack::Report<errors::ApiErrorResponse>;
@@ -3542,14 +3553,10 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthoriz
             })
             .transpose()?
             .map(pii::SecretSerdeValue::new);
-        let is_off_session = match (
+        let is_off_session = get_off_session(
             payment_data.mandate_id.as_ref(),
             payment_data.payment_intent.off_session,
-        ) {
-            (_, Some(false)) => Some(false),
-            (Some(_), _) | (_, Some(true)) => Some(true),
-            (None, None) => None,
-        };
+        );
 
         Ok(Self {
             payment_method_data: (payment_method_data.get_required_value("payment_method_data")?),
@@ -4392,14 +4399,11 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::SetupMandateRequ
             })
             .transpose()?
             .map(pii::SecretSerdeValue::new);
-        let is_off_session = match (
+
+        let is_off_session = get_off_session(
             payment_data.mandate_id.as_ref(),
             payment_data.payment_intent.off_session,
-        ) {
-            (_, Some(false)) => Some(false),
-            (Some(_), _) | (_, Some(true)) => Some(true),
-            (None, None) => None,
-        };
+        );
 
         Ok(Self {
             currency: payment_data.currency,
@@ -4545,14 +4549,11 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::CompleteAuthoriz
             .and_then(|braintree| braintree.merchant_account_id.clone());
         let merchant_config_currency =
             braintree_metadata.and_then(|braintree| braintree.merchant_config_currency);
-        let is_off_session = match (
+
+        let is_off_session = get_off_session(
             payment_data.mandate_id.as_ref(),
             payment_data.payment_intent.off_session,
-        ) {
-            (_, Some(false)) => Some(false),
-            (Some(_), _) | (_, Some(true)) => Some(true),
-            (None, None) => None,
-        };
+        );
 
         Ok(Self {
             setup_future_usage: payment_data.payment_intent.setup_future_usage,