fix(router): add payment_method check in get_mandate_type (#5828)

Author: sai-harsha-vardhan

crates/router/src/core/mandate/helpers.rs

@@ -51,32 +51,36 @@ pub fn get_mandate_type(
     setup_future_usage: Option<enums::FutureUsage>,
     customer_acceptance: Option<api_payments::CustomerAcceptance>,
     token: Option<String>,
+    payment_method: Option<enums::PaymentMethod>,
 ) -> CustomResult<Option<api::MandateTransactionType>, errors::ValidationError> {
     match (
         mandate_data.clone(),
         off_session,
         setup_future_usage,
         customer_acceptance.or(mandate_data.and_then(|m_data| m_data.customer_acceptance)),
         token,
+        payment_method,
     ) {
-        (Some(_), Some(_), Some(enums::FutureUsage::OffSession), Some(_), Some(_)) => {
+        (Some(_), Some(_), Some(enums::FutureUsage::OffSession), Some(_), Some(_), _) => {
             Err(errors::ValidationError::InvalidValue {
                 message: "Expected one out of recurring_details and mandate_data but got both"
                     .to_string(),
             }
             .into())
         }
-        (_, _, Some(enums::FutureUsage::OffSession), Some(_), Some(_))
-        | (_, _, Some(enums::FutureUsage::OffSession), Some(_), _)
-        | (Some(_), _, Some(enums::FutureUsage::OffSession), _, _) => {
+        (_, _, Some(enums::FutureUsage::OffSession), Some(_), Some(_), _)
+        | (_, _, Some(enums::FutureUsage::OffSession), Some(_), _, _)
+        | (Some(_), _, Some(enums::FutureUsage::OffSession), _, _, _) => {
             Ok(Some(api::MandateTransactionType::NewMandateTransaction))
         }
 
-        (_, _, Some(enums::FutureUsage::OffSession), _, Some(_))
-        | (_, Some(_), _, _, _)
-        | (_, _, Some(enums::FutureUsage::OffSession), _, _) => Ok(Some(
-            api::MandateTransactionType::RecurringMandateTransaction,
-        )),
+        (_, _, Some(enums::FutureUsage::OffSession), _, Some(_), _)
+        | (_, Some(_), _, _, _, _)
+        | (_, _, Some(enums::FutureUsage::OffSession), _, _, Some(enums::PaymentMethod::Wallet)) => {
+            Ok(Some(
+                api::MandateTransactionType::RecurringMandateTransaction,
+            ))
+        }
 
         _ => Ok(None),
     }

crates/router/src/core/payments/operations/payment_complete_authorize.rs

@@ -111,6 +111,7 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Co
             payment_intent.setup_future_usage,
             request.customer_acceptance.clone(),
             request.payment_token.clone(),
+            payment_attempt.payment_method,
         )
         .change_context(errors::ApiErrorResponse::MandateValidationFailed {
             reason: "Expected one out of recurring_details and mandate_data but got both".into(),

crates/router/src/core/payments/operations/payment_confirm.rs

@@ -524,6 +524,7 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
             payment_intent.setup_future_usage,
             request.customer_acceptance.clone(),
             request.payment_token.clone(),
+            payment_attempt.payment_method.or(request.payment_method),
         )
         .change_context(errors::ApiErrorResponse::MandateValidationFailed {
             reason: "Expected one out of recurring_details and mandate_data but got both".into(),

crates/router/src/core/payments/operations/payment_create.rs

@@ -150,6 +150,7 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
             request.setup_future_usage,
             request.customer_acceptance.clone(),
             request.payment_token.clone(),
+            request.payment_method,
         )
         .change_context(errors::ApiErrorResponse::MandateValidationFailed {
             reason: "Expected one out of recurring_details and mandate_data but got both".into(),

crates/router/src/core/payments/operations/payment_update.rs

@@ -136,6 +136,7 @@ impl<F: Send + Clone> GetTracker<F, PaymentData<F>, api::PaymentsRequest> for Pa
             payment_intent.setup_future_usage,
             request.customer_acceptance.clone(),
             request.payment_token.clone(),
+            payment_attempt.payment_method.or(request.payment_method),
         )
         .change_context(errors::ApiErrorResponse::MandateValidationFailed {
             reason: "Expected one out of recurring_details and mandate_data but got both".into(),