fix(payout): use mca_connector_id from ConnectorData to fetch mca_acc…

…ount (#5620) Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
juspay · Aug 14, 2024 · 92a07cf · 92a07cf
1 parent e4f4fba
commit 92a07cf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/crates/router/src/core/payouts.rs b/crates/router/src/core/payouts.rs
@@ -1122,7 +1122,7 @@ pub async fn create_recipient(
         // 1. Form router data
         let router_data = core_utils::construct_payout_router_data(
             state,
-            &connector_data.connector_name,
+            connector_data,
             merchant_account,
             key_store,
             payout_data,
@@ -1313,7 +1313,7 @@ pub async fn check_payout_eligibility(
     // 1. Form Router data
     let router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
@@ -1493,7 +1493,7 @@ pub async fn create_payout(
     // 1. Form Router data
     let mut router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
@@ -1685,7 +1685,7 @@ pub async fn create_payout_retrieve(
     // 1. Form Router data
     let mut router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
@@ -1827,7 +1827,7 @@ pub async fn create_recipient_disburse_account(
     // 1. Form Router data
     let router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
@@ -1912,7 +1912,7 @@ pub async fn cancel_payout(
     // 1. Form Router data
     let router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
@@ -2017,7 +2017,7 @@ pub async fn fulfill_payout(
     // 1. Form Router data
     let mut router_data = core_utils::construct_payout_router_data(
         state,
-        &connector_data.connector_name,
+        connector_data,
         merchant_account,
         key_store,
         payout_data,

diff --git a/crates/router/src/core/utils.rs b/crates/router/src/core/utils.rs
@@ -30,7 +30,7 @@ use crate::{
     db::StorageInterface,
     routes::SessionState,
     types::{
-        self, domain,
+        self, api, domain,
         storage::{self, enums},
         PollConfig,
     },
@@ -49,7 +49,7 @@ const IRRELEVANT_ATTEMPT_ID_IN_DISPUTE_FLOW: &str = "irrelevant_attempt_id_in_di
 #[instrument(skip_all)]
 pub async fn get_mca_for_payout<'a>(
     state: &'a SessionState,
-    connector_id: &str,
+    connector_data: &api::ConnectorData,
     merchant_account: &domain::MerchantAccount,
     key_store: &domain::MerchantKeyStore,
     payout_data: &PayoutData,
@@ -63,8 +63,8 @@ pub async fn get_mca_for_payout<'a>(
                 None,
                 key_store,
                 &payout_data.profile_id,
-                connector_id,
-                payout_data.payout_attempt.merchant_connector_id.as_ref(),
+                &connector_data.connector_name.to_string(),
+                connector_data.merchant_connector_id.as_ref(),
             )
             .await?;
             Ok(merchant_connector_account)
@@ -76,19 +76,20 @@ pub async fn get_mca_for_payout<'a>(
 #[instrument(skip_all)]
 pub async fn construct_payout_router_data<'a, F>(
     state: &'a SessionState,
-    connector_name: &api_models::enums::Connector,
+    connector_data: &api::ConnectorData,
     merchant_account: &domain::MerchantAccount,
     key_store: &domain::MerchantKeyStore,
     payout_data: &mut PayoutData,
 ) -> RouterResult<types::PayoutsRouterData<F>> {
     let merchant_connector_account = get_mca_for_payout(
         state,
-        &connector_name.to_string(),
+        connector_data,
         merchant_account,
         key_store,
         payout_data,
     )
     .await?;
+    let connector_name = connector_data.connector_name;
     payout_data.merchant_connector_account = Some(merchant_connector_account.clone());
     let connector_auth_type: types::ConnectorAuthType = merchant_connector_account
         .get_connector_account_details()
@@ -770,7 +771,7 @@ pub async fn construct_upload_file_router_data<'a>(
     payment_attempt: &storage::PaymentAttempt,
     merchant_account: &domain::MerchantAccount,
     key_store: &domain::MerchantKeyStore,
-    create_file_request: &types::api::CreateFileRequest,
+    create_file_request: &api::CreateFileRequest,
     connector_id: &str,
     file_key: String,
 ) -> RouterResult<types::UploadFileRouterData> {