add create_webhook_url fn changes

Author: dgeee13

crates/router/src/core/payments.rs

@@ -6564,15 +6564,16 @@ pub async fn payment_external_authentication(
         &payment_attempt.clone(),
         payment_connector_name,
     ));
-    let merchant_connector_account_id = merchant_connector_account
-        .get_mca_id()
-        .ok_or(errors::ApiErrorResponse::InternalServerError)
-        .attach_printable("Error while finding mca_id from merchant_connector_account")?;
+    let mca_id_option = merchant_connector_account.get_mca_id(); // Bind temporary value
+    let merchant_connector_account_id_or_connector_name = mca_id_option
+        .as_ref()
+        .map(|mca_id| mca_id.get_string_repr())
+        .unwrap_or(&authentication_connector);
 
     let webhook_url = helpers::create_webhook_url(
         &state.base_url,
         merchant_id,
-        &merchant_connector_account_id.get_string_repr().to_string(),
+        merchant_connector_account_id_or_connector_name,
     );
 
     let authentication_details = business_profile

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

@@ -1241,9 +1241,9 @@ pub fn create_authorize_url(
 }
 
 pub fn create_webhook_url(
-    router_base_url: &String,
+    router_base_url: &str,
     merchant_id: &id_type::MerchantId,
-    merchant_connector_id_or_connector_name: &String,
+    merchant_connector_id_or_connector_name: &str,
 ) -> String {
     format!(
         "{}/webhooks/{}/{}",

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

@@ -224,7 +224,7 @@ pub async fn construct_payment_router_data_for_authorize<'a>(
     let webhook_url = Some(helpers::create_webhook_url(
         router_base_url,
         &attempt.merchant_id,
-        &merchant_connector_account.get_id().get_string_repr().to_string(),
+        merchant_connector_account.get_id().get_string_repr(),
     ));
 
     let router_return_url = payment_data
@@ -2745,17 +2745,17 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsAuthoriz
             attempt,
             connector_name,
         ));
-        let merchant_connector_account_id = payment_data
+        let merchant_connector_account_id_or_connector_name = payment_data
             .payment_attempt
-            .clone()
             .merchant_connector_id
-            .map(|mca_id| mca_id.get_string_repr().to_string())
-            .unwrap_or(connector_name.to_string());
+            .as_ref()
+            .map(|mca_id| mca_id.get_string_repr())
+            .unwrap_or(connector_name);
 
         let webhook_url = Some(helpers::create_webhook_url(
             router_base_url,
             &attempt.merchant_id,
-            &merchant_connector_account_id,
+            merchant_connector_account_id_or_connector_name,
         ));
         let router_return_url = Some(helpers::create_redirect_url(
             router_base_url,
@@ -3575,17 +3575,16 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::SetupMandateRequ
                     .map(|customer| customer.clone().into_inner())
             });
         let amount = payment_data.payment_attempt.get_total_amount();
-        let merchant_connector_account_id = payment_data
+        let merchant_connector_account_id_or_connector_name = payment_data
             .payment_attempt
             .merchant_connector_id
-            .clone()
-            .get_required_value("merchant_connector_id")
-            .change_context(errors::ApiErrorResponse::InternalServerError)
-            .attach_printable("Merchant connector id is not present in payment_attempt")?;
+            .as_ref()
+            .map(|mca_id| mca_id.get_string_repr())
+            .unwrap_or(connector_name);
         let webhook_url = Some(helpers::create_webhook_url(
             router_base_url,
             &attempt.merchant_id,
-            &merchant_connector_account_id.get_string_repr().to_string(),
+            merchant_connector_account_id_or_connector_name,
         ));
 
         Ok(Self {
@@ -3784,17 +3783,16 @@ impl<F: Clone> TryFrom<PaymentAdditionalData<'_, F>> for types::PaymentsPreProce
                     .collect::<Result<Vec<_>, _>>()
             })
             .transpose()?;
-        let merchant_connector_account_id = payment_data
+        let merchant_connector_account_id_or_connector_name = payment_data
             .payment_attempt
             .merchant_connector_id
-            .clone()
-            .get_required_value("merchant_connector_id")
-            .change_context(errors::ApiErrorResponse::InternalServerError)
-            .attach_printable("Merchant connector id is not present in payment_attempt")?;
+            .as_ref()
+            .map(|mca_id| mca_id.get_string_repr())
+            .unwrap_or(connector_name);
         let webhook_url = Some(helpers::create_webhook_url(
             router_base_url,
             &attempt.merchant_id,
-            &merchant_connector_account_id.get_string_repr().to_string(),
+            merchant_connector_account_id_or_connector_name,
         ));
         let router_return_url = Some(helpers::create_redirect_url(
             router_base_url,

crates/router/src/core/relay/utils.rs

@@ -32,7 +32,7 @@ pub async fn construct_relay_refund_router_data<'a, F>(
     let webhook_url = Some(payments::helpers::create_webhook_url(
         &state.base_url.clone(),
         merchant_id,
-        &connector_account.get_id().get_string_repr().to_string(),
+        connector_account.get_id().get_string_repr(),
     ));
 
     let supported_connector = &state

crates/router/src/core/utils.rs

@@ -285,16 +285,16 @@ pub async fn construct_refund_router_data<'a, F>(
         .payment_method
         .get_required_value("payment_method_type")
         .change_context(errors::ApiErrorResponse::InternalServerError)?;
-    let merchant_connector_account_id = payment_attempt
+    let merchant_connector_account_id_or_connector_name = payment_attempt
         .merchant_connector_id
-        .clone()
-        .get_required_value("merchant_connector_id")
-        .change_context(errors::ApiErrorResponse::InternalServerError)
-        .attach_printable("Merchant connector id is not present in payment_attempt")?;
+        .as_ref()
+        .map(|mca_id| mca_id.get_string_repr())
+        .unwrap_or(connector_id);
+
     let webhook_url = Some(helpers::create_webhook_url(
         &state.base_url.clone(),
         merchant_account.get_id(),
-        &merchant_connector_account_id.get_string_repr().to_string(),
+        merchant_connector_account_id_or_connector_name,
     ));
     let test_mode: Option<bool> = merchant_connector_account.is_test_mode_on();