fix(core): Resolved comments

Author: Sarthak1799

crates/hyperswitch_domain_models/src/router_request_types.rs

@@ -54,7 +54,7 @@ pub struct PaymentsAuthorizeData {
     pub payment_experience: Option<storage_enums::PaymentExperience>,
     pub payment_method_type: Option<storage_enums::PaymentMethodType>,
     pub surcharge_details: Option<SurchargeDetails>,
-    pub customer_id: Option<String>,
+    pub customer_id: Option<id_type::CustomerId>,
     pub request_incremental_authorization: bool,
     pub metadata: Option<serde_json::Value>,
     pub authentication_data: Option<AuthenticationData>,
@@ -340,18 +340,7 @@ impl TryFrom<CompleteAuthorizeData> for PaymentsPreProcessingData {
 #[derive(Debug, Clone)]
 pub struct PaymentsPostProcessingData {
     pub payment_method_data: PaymentMethodData,
-    pub amount: i64,
-    pub email: Option<pii::Email>,
-    pub customer_id: Option<String>,
-    pub currency: storage_enums::Currency,
-    pub payment_method_type: Option<storage_enums::PaymentMethodType>,
-    pub setup_mandate_details: Option<mandates::MandateData>,
-    pub capture_method: Option<storage_enums::CaptureMethod>,
-    pub order_details: Option<Vec<api_models::payments::OrderDetailsWithAmount>>,
-    pub router_return_url: Option<String>,
-    pub webhook_url: Option<String>,
-    pub complete_authorize_url: Option<String>,
-    pub browser_info: Option<BrowserInformation>,
+    pub customer_id: Option<id_type::CustomerId>,
     pub connector_transaction_id: Option<String>,
 }
 
@@ -365,17 +354,6 @@ impl<F> TryFrom<RouterData<F, PaymentsAuthorizeData, response_types::PaymentsRes
     ) -> Result<Self, Self::Error> {
         Ok(Self {
             payment_method_data: data.request.payment_method_data,
-            amount: data.request.amount,
-            email: data.request.email,
-            currency: data.request.currency,
-            payment_method_type: data.request.payment_method_type,
-            setup_mandate_details: data.request.setup_mandate_details,
-            capture_method: data.request.capture_method,
-            order_details: data.request.order_details,
-            router_return_url: data.request.router_return_url,
-            webhook_url: data.request.webhook_url,
-            complete_authorize_url: data.request.complete_authorize_url,
-            browser_info: data.request.browser_info,
             connector_transaction_id: match data.response {
                 Ok(response_types::PaymentsResponseData::TransactionResponse {
                     resource_id: ResponseId::ConnectorTransactionId(id),

crates/router/src/connector/datatrans/transformers.rs

@@ -193,6 +193,7 @@ impl TryFrom<&DatatransRouterData<&types::PaymentsAuthorizeRouterData>>
             | domain::PaymentMethodData::CardRedirect(_)
             | domain::PaymentMethodData::Voucher(_)
             | domain::PaymentMethodData::GiftCard(_)
+            | domain::PaymentMethodData::OpenBanking(_)
             | domain::PaymentMethodData::CardToken(_) => {
                 Err(errors::ConnectorError::NotImplemented(
                     connector_utils::get_unimplemented_payment_method_error_message("Datatrans"),

crates/router/src/core/fraud_check/flows/checkout_flow.rs

@@ -13,7 +13,10 @@ use crate::{
     },
     errors, services,
     types::{
-        api::fraud_check::{self as frm_api, FraudCheckConnectorData},
+        api::{
+            self,
+            fraud_check::{self as frm_api, FraudCheckConnectorData},
+        },
         domain,
         fraud_check::{FraudCheckCheckoutData, FraudCheckResponseData, FrmCheckoutRouterData},
         storage::enums as storage_enums,
@@ -136,6 +139,17 @@ impl ConstructFlowSpecificData<frm_api::Checkout, FraudCheckCheckoutData, FraudC
 
         Ok(router_data)
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        _state: &SessionState,
+        _merchant_account: &domain::MerchantAccount,
+        _key_store: &domain::MerchantKeyStore,
+        _merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        _connector: &api::ConnectorData,
+    ) -> RouterResult<Option<MerchantRecipientData>> {
+        Ok(None)
+    }
 }
 
 #[async_trait]

crates/router/src/core/fraud_check/flows/record_return.rs

@@ -11,7 +11,7 @@ use crate::{
     },
     errors, services,
     types::{
-        api::RecordReturn,
+        api::{self, RecordReturn},
         domain,
         fraud_check::{
             FraudCheckRecordReturnData, FraudCheckResponseData, FrmRecordReturnRouterData,
@@ -108,6 +108,17 @@ impl ConstructFlowSpecificData<RecordReturn, FraudCheckRecordReturnData, FraudCh
 
         Ok(router_data)
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        _state: &SessionState,
+        _merchant_account: &domain::MerchantAccount,
+        _key_store: &domain::MerchantKeyStore,
+        _merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        _connector: &api::ConnectorData,
+    ) -> RouterResult<Option<MerchantRecipientData>> {
+        Ok(None)
+    }
 }
 
 #[async_trait]

crates/router/src/core/fraud_check/flows/sale_flow.rs

@@ -11,7 +11,7 @@ use crate::{
     },
     errors, services,
     types::{
-        api::fraud_check as frm_api,
+        api::{self, fraud_check as frm_api},
         domain,
         fraud_check::{FraudCheckResponseData, FraudCheckSaleData, FrmSaleRouterData},
         storage::enums as storage_enums,
@@ -117,6 +117,17 @@ impl ConstructFlowSpecificData<frm_api::Sale, FraudCheckSaleData, FraudCheckResp
 
         Ok(router_data)
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        _state: &SessionState,
+        _merchant_account: &domain::MerchantAccount,
+        _key_store: &domain::MerchantKeyStore,
+        _merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        _connector: &api::ConnectorData,
+    ) -> RouterResult<Option<MerchantRecipientData>> {
+        Ok(None)
+    }
 }
 
 #[async_trait]

crates/router/src/core/fraud_check/flows/transaction_flow.rs

@@ -10,7 +10,7 @@ use crate::{
     },
     errors, services,
     types::{
-        api::fraud_check as frm_api,
+        api::{self, fraud_check as frm_api},
         domain,
         fraud_check::{
             FraudCheckResponseData, FraudCheckTransactionData, FrmTransactionRouterData,
@@ -121,6 +121,17 @@ impl
 
         Ok(router_data)
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        _state: &SessionState,
+        _merchant_account: &domain::MerchantAccount,
+        _key_store: &domain::MerchantKeyStore,
+        _merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        _connector: &api::ConnectorData,
+    ) -> RouterResult<Option<MerchantRecipientData>> {
+        Ok(None)
+    }
 }
 
 #[async_trait]

crates/router/src/core/payments.rs

@@ -90,8 +90,8 @@ use crate::{
         BrowserInformation,
     },
     utils::{
-        add_apple_pay_flow_metrics, add_connector_http_status_code_metrics, Encode, OptionExt,
-        ValueExt,
+        add_apple_pay_flow_metrics, add_connector_http_status_code_metrics, user::parse_value,
+        Encode, OptionExt, ValueExt,
     },
     workflows::payment_sync,
 };
@@ -1507,14 +1507,15 @@ where
         .get_required_value("PaymentMethod")?;
 
     let merchant_recipient_data = if payment_method == enums::PaymentMethod::OpenBanking {
-        get_merchant_bank_data_for_open_banking_connectors(
-            &merchant_connector_account,
-            key_store,
-            &connector,
-            state,
-            merchant_account,
-        )
-        .await?
+        payment_data
+            .get_merchant_recipient_data(
+                state,
+                merchant_account,
+                key_store,
+                &merchant_connector_account,
+                &connector,
+            )
+            .await?
     } else {
         None
     };
@@ -1697,7 +1698,7 @@ where
     Ok((router_data, merchant_connector_account))
 }
 
-async fn get_merchant_bank_data_for_open_banking_connectors(
+pub async fn get_merchant_bank_data_for_open_banking_connectors(
     merchant_connector_account: &helpers::MerchantConnectorAccountType,
     key_store: &domain::MerchantKeyStore,
     connector: &api::ConnectorData,
@@ -1711,10 +1712,12 @@ async fn get_merchant_bank_data_for_open_banking_connectors(
         .peek()
         .clone();
 
-    let merchant_recipient_data =
-        serde_json::from_value::<router_types::AdditionalMerchantData>(merchant_data)
-            .change_context(errors::ApiErrorResponse::InternalServerError)
-            .attach_printable("failed to decode MerchantRecipientData")?;
+    let merchant_recipient_data = parse_value::<router_types::AdditionalMerchantData>(
+        merchant_data,
+        "AdditionalMerchantData",
+    )
+    .change_context(errors::ApiErrorResponse::InternalServerError)
+    .attach_printable("failed to decode MerchantRecipientData")?;
 
     let connector_name = enums::Connector::to_string(&connector.connector_name);
     let locker_based_connector_list = state.conf.locker_based_open_banking_connectors.clone();
@@ -1725,6 +1728,7 @@ async fn get_merchant_bank_data_for_open_banking_connectors(
     let recipient_id = helpers::get_recipient_id_for_open_banking(&merchant_recipient_data)?;
     let final_recipient_data = if let Some(id) = recipient_id {
         if contains {
+            // Customer Id for OpenBanking connectors will be merchant_id as the account data stored at locker belongs to the merchant
             let cust_id = id_type::CustomerId::from(merchant_account.merchant_id.clone().into())
                 .change_context(errors::ApiErrorResponse::InternalServerError)
                 .attach_printable("Failed to convert to CustomerId")?;

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

@@ -37,6 +37,15 @@ pub trait ConstructFlowSpecificData<F, Req, Res> {
         merchant_connector_account: &helpers::MerchantConnectorAccountType,
         merchant_recipient_data: Option<types::MerchantRecipientData>,
     ) -> RouterResult<types::RouterData<F, Req, Res>>;
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        state: &SessionState,
+        merchant_account: &domain::MerchantAccount,
+        key_store: &domain::MerchantKeyStore,
+        merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        connector: &api::ConnectorData,
+    ) -> RouterResult<Option<types::MerchantRecipientData>>;
 }
 
 #[allow(clippy::too_many_arguments)]

crates/router/src/core/payments/flows/approve_flow.rs

@@ -41,6 +41,17 @@ impl
         ))
         .await
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        _state: &SessionState,
+        _merchant_account: &domain::MerchantAccount,
+        _key_store: &domain::MerchantKeyStore,
+        _merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        _connector: &api::ConnectorData,
+    ) -> RouterResult<Option<types::MerchantRecipientData>> {
+        Ok(None)
+    }
 }
 
 #[async_trait]

crates/router/src/core/payments/flows/authorize_flow.rs

@@ -57,6 +57,24 @@ impl
         ))
         .await
     }
+
+    async fn get_merchant_recipient_data<'a>(
+        &self,
+        state: &SessionState,
+        merchant_account: &domain::MerchantAccount,
+        key_store: &domain::MerchantKeyStore,
+        merchant_connector_account: &helpers::MerchantConnectorAccountType,
+        connector: &api::ConnectorData,
+    ) -> RouterResult<Option<types::MerchantRecipientData>> {
+        payments::get_merchant_bank_data_for_open_banking_connectors(
+            merchant_connector_account,
+            key_store,
+            connector,
+            state,
+            merchant_account,
+        )
+        .await
+    }
 }
 #[async_trait]
 impl Feature<api::Authorize, types::PaymentsAuthorizeData> for types::PaymentsAuthorizeRouterData {