diff --git "a/diffs/pr_10213/efce83d/diff.json" "b/diffs/pr_10213/efce83d/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_10213/efce83d/diff.json" @@ -0,0 +1,770 @@ +{ + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51", + "pr_number": 10213, + "rust_files": [ + "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs", + "crates/hyperswitch_connectors/src/utils.rs", + "crates/hyperswitch_domain_models/src/payment_methods.rs", + "crates/hyperswitch_domain_models/src/router_data.rs", + "crates/hyperswitch_interfaces/src/conversion_impls.rs", + "crates/router/src/core/authentication/transformers.rs", + "crates/router/src/core/fraud_check/flows/checkout_flow.rs", + "crates/router/src/core/fraud_check/flows/fulfillment_flow.rs", + "crates/router/src/core/fraud_check/flows/record_return.rs", + "crates/router/src/core/fraud_check/flows/sale_flow.rs", + "crates/router/src/core/fraud_check/flows/transaction_flow.rs", + "crates/router/src/core/mandate/utils.rs", + "crates/router/src/core/payment_methods.rs", + "crates/router/src/core/payments/helpers.rs", + "crates/router/src/core/payments/transformers.rs", + "crates/router/src/core/relay/utils.rs", + "crates/router/src/core/unified_authentication_service/utils.rs", + "crates/router/src/core/utils.rs", + "crates/router/src/core/webhooks/utils.rs", + "crates/router/src/types.rs", + "crates/router/src/types/api/verify_connector.rs", + "crates/router/tests/connectors/utils.rs" + ], + "diffs": [ + { + "id": "crates/router/src/core/utils.rs::function::construct_accept_dispute_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_accept_dispute_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n &dispute.connector,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: dispute.connector.to_string(),\n tenant_id: state.tenant.tenant_id.clone(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::AcceptDisputeRequestData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n dispute_status: dispute.dispute_status,\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &dispute.connector,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n refund_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_accept_dispute_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n &dispute.connector,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: dispute.connector.to_string(),\n tenant_id: state.tenant.tenant_id.clone(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::AcceptDisputeRequestData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n dispute_status: dispute.dispute_status,\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &dispute.connector,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n refund_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::function::get_recurring_processing_model", + "file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn get_recurring_processing_model(\n item: &PaymentsAuthorizeRouterData,\n) -> Result {\n // is_migrated_card to be changed intto is_migrated_payment_method to cover all migrated payment methods.\n let shopper_reference = Some(match item.is_migrated_card {\n Some(true) => match item.get_connector_customer_id() {\n Ok(connector_customer_id) => connector_customer_id,\n Err(_) => {\n let customer_id = item.get_customer_id()?;\n format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )\n }\n },\n _ => {\n let customer_id = item.get_customer_id()?;\n format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )\n }\n });\n\n match (item.request.setup_future_usage, item.request.off_session) {\n (Some(storage_enums::FutureUsage::OffSession), _) => {\n let store_payment_method = item.request.is_mandate_payment();\n Ok((\n Some(AdyenRecurringModel::UnscheduledCardOnFile),\n Some(store_payment_method),\n shopper_reference,\n ))\n }\n (_, Some(true)) => Ok((\n Some(AdyenRecurringModel::UnscheduledCardOnFile),\n None,\n shopper_reference,\n )),\n _ => Ok((None, None, None)),\n }\n}", + "after_code": "fn get_recurring_processing_model(\n item: &PaymentsAuthorizeRouterData,\n) -> Result {\n let shopper_reference = match item.get_connector_customer_id() {\n Ok(connector_customer_id) => Some(connector_customer_id),\n Err(_) => {\n let customer_id = item.get_customer_id()?;\n Some(format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n ))\n }\n };\n\n match (item.request.setup_future_usage, item.request.off_session) {\n (Some(storage_enums::FutureUsage::OffSession), _) => {\n let store_payment_method = item.request.is_mandate_payment();\n Ok((\n Some(AdyenRecurringModel::UnscheduledCardOnFile),\n Some(store_payment_method),\n shopper_reference,\n ))\n }\n (_, Some(true)) => Ok((\n Some(AdyenRecurringModel::UnscheduledCardOnFile),\n None,\n shopper_reference,\n )),\n _ => Ok((None, None, None)),\n }\n}", + "diff_span": { + "before": " item: &PaymentsAuthorizeRouterData,\n) -> Result {\n // is_migrated_card to be changed intto is_migrated_payment_method to cover all migrated payment methods.\n let shopper_reference = Some(match item.is_migrated_card {\n Some(true) => match item.get_connector_customer_id() {\n Ok(connector_customer_id) => connector_customer_id,\n Err(_) => {\n let customer_id = item.get_customer_id()?;\n format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )\n }\n },\n _ => {\n let customer_id = item.get_customer_id()?;\n format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )\n }\n });\n\n match (item.request.setup_future_usage, item.request.off_session) {", + "after": " item: &PaymentsAuthorizeRouterData,\n) -> Result {\n let shopper_reference = match item.get_connector_customer_id() {\n Ok(connector_customer_id) => Some(connector_customer_id),\n Err(_) => {\n let customer_id = item.get_customer_id()?;\n Some(format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n ))\n }\n };\n\n match (item.request.setup_future_usage, item.request.off_session) {" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types.rs::RouterData::function::foreign_from", + "file": "crates/router/src/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_from(item: (&RouterData, T2)) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data\n .connector_mandate_request_reference_id\n .clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n }", + "after_code": "fn foreign_from(item: (&RouterData, T2)) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data\n .connector_mandate_request_reference_id\n .clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n }\n }", + "diff_span": { + "before": " minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_interfaces/src/conversion_impls.rs::function::get_default_router_data", + "file": "crates/hyperswitch_interfaces/src/conversion_impls.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn get_default_router_data(\n tenant_id: id_type::TenantId,\n flow_name: &str,\n request: Req,\n response: Result,\n) -> RouterData {\n RouterData {\n tenant_id,\n flow: std::marker::PhantomData,\n merchant_id: id_type::MerchantId::get_irrelevant_merchant_id(),\n customer_id: None,\n connector_customer: None,\n connector: get_irrelevant_id_string(\"connector\", flow_name),\n payment_id: id_type::PaymentId::get_irrelevant_id(flow_name)\n .get_string_repr()\n .to_owned(),\n attempt_id: get_irrelevant_id_string(\"attempt_id\", flow_name),\n status: common_enums::AttemptStatus::default(),\n payment_method: common_enums::PaymentMethod::default(),\n connector_auth_type: router_data::ConnectorAuthType::default(),\n description: None,\n address: PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request,\n response,\n connector_request_reference_id: get_irrelevant_id_string(\n \"connector_request_reference_id\",\n flow_name,\n ),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n connector_response: None,\n payment_method_status: None,\n is_migrated_card: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n payment_method_type: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n}", + "after_code": "fn get_default_router_data(\n tenant_id: id_type::TenantId,\n flow_name: &str,\n request: Req,\n response: Result,\n) -> RouterData {\n RouterData {\n tenant_id,\n flow: std::marker::PhantomData,\n merchant_id: id_type::MerchantId::get_irrelevant_merchant_id(),\n customer_id: None,\n connector_customer: None,\n connector: get_irrelevant_id_string(\"connector\", flow_name),\n payment_id: id_type::PaymentId::get_irrelevant_id(flow_name)\n .get_string_repr()\n .to_owned(),\n attempt_id: get_irrelevant_id_string(\"attempt_id\", flow_name),\n status: common_enums::AttemptStatus::default(),\n payment_method: common_enums::PaymentMethod::default(),\n connector_auth_type: router_data::ConnectorAuthType::default(),\n description: None,\n address: PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request,\n response,\n connector_request_reference_id: get_irrelevant_id_string(\n \"connector_request_reference_id\",\n flow_name,\n ),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n connector_response: None,\n payment_method_status: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n payment_method_type: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n}", + "diff_span": { + "before": " connector_response: None,\n payment_method_status: None,\n is_migrated_card: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_setup_mandate", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data_for_setup_mandate<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentConfirmData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let connector_customer_id = customer.as_ref().and_then(|customer| {\n customer\n .get_connector_customer_id(merchant_connector_account)\n .map(String::from)\n });\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let router_base_url = &state.base_url;\n let attempt = &payment_data.payment_attempt;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_id,\n None,\n ));\n\n let webhook_url = match merchant_connector_account {\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n merchant_connector_account,\n ) => Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n merchant_connector_account.get_id().get_string_repr(),\n )),\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n payment_data.webhook_url\n }\n };\n\n let router_return_url = payment_data\n .payment_intent\n .create_finish_redirection_url(\n router_base_url,\n merchant_context\n .get_merchant_account()\n .publishable_key\n .as_ref(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to construct finish redirection url\")?\n .to_string();\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from);\n\n let browser_info = payment_data\n .payment_attempt\n .browser_info\n .clone()\n .map(types::BrowserInformation::from);\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::SetupMandateRequestData {\n currency: payment_data.payment_intent.amount_details.currency,\n payment_method_data: payment_data\n .payment_method_data\n .get_required_value(\"payment_method_data\")?,\n amount: Some(\n payment_data\n .payment_attempt\n .amount_details\n .get_net_amount()\n .get_amount_as_i64(),\n ),\n confirm: true,\n statement_descriptor_suffix: None,\n customer_acceptance: None,\n mandate_id: None,\n setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n off_session: None,\n setup_mandate_details: None,\n router_return_url: Some(router_return_url.clone()),\n webhook_url,\n browser_info,\n email,\n customer_name: None,\n return_url: Some(router_return_url),\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n RequestIncrementalAuthorization::True\n ),\n metadata: payment_data.payment_intent.metadata,\n minor_amount: Some(payment_data.payment_attempt.amount_details.get_net_amount()),\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n capture_method: Some(payment_data.payment_intent.capture_method),\n complete_authorize_url,\n connector_testing_data: None,\n customer_id: None,\n enable_partial_authorization: None,\n payment_channel: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n is_stored_credential: None,\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: payment_data.payment_address.clone(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: connector_customer_id,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data_for_setup_mandate<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentConfirmData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let connector_customer_id = customer.as_ref().and_then(|customer| {\n customer\n .get_connector_customer_id(merchant_connector_account)\n .map(String::from)\n });\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let router_base_url = &state.base_url;\n let attempt = &payment_data.payment_attempt;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_id,\n None,\n ));\n\n let webhook_url = match merchant_connector_account {\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n merchant_connector_account,\n ) => Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n merchant_connector_account.get_id().get_string_repr(),\n )),\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n payment_data.webhook_url\n }\n };\n\n let router_return_url = payment_data\n .payment_intent\n .create_finish_redirection_url(\n router_base_url,\n merchant_context\n .get_merchant_account()\n .publishable_key\n .as_ref(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to construct finish redirection url\")?\n .to_string();\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from);\n\n let browser_info = payment_data\n .payment_attempt\n .browser_info\n .clone()\n .map(types::BrowserInformation::from);\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::SetupMandateRequestData {\n currency: payment_data.payment_intent.amount_details.currency,\n payment_method_data: payment_data\n .payment_method_data\n .get_required_value(\"payment_method_data\")?,\n amount: Some(\n payment_data\n .payment_attempt\n .amount_details\n .get_net_amount()\n .get_amount_as_i64(),\n ),\n confirm: true,\n statement_descriptor_suffix: None,\n customer_acceptance: None,\n mandate_id: None,\n setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n off_session: None,\n setup_mandate_details: None,\n router_return_url: Some(router_return_url.clone()),\n webhook_url,\n browser_info,\n email,\n customer_name: None,\n return_url: Some(router_return_url),\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n RequestIncrementalAuthorization::True\n ),\n metadata: payment_data.payment_intent.metadata,\n minor_amount: Some(payment_data.payment_attempt.amount_details.get_net_amount()),\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n capture_method: Some(payment_data.payment_intent.capture_method),\n complete_authorize_url,\n connector_testing_data: None,\n customer_id: None,\n enable_partial_authorization: None,\n payment_channel: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n is_stored_credential: None,\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: payment_data.payment_address.clone(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: connector_customer_id,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_sdk_session", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data_for_sdk_session<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentIntentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n let billing_address = payment_data\n .payment_intent\n .billing_address\n .as_ref()\n .map(|billing_address| billing_address.clone().into_inner());\n // fetch email from customer or billing address (fallback)\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from)\n .or(billing_address\n .as_ref()\n .and_then(|address| address.email.clone()));\n // fetch customer name from customer or billing address (fallback)\n let customer_name = customer\n .as_ref()\n .and_then(|customer| customer.name.clone())\n .map(|name| name.into_inner())\n .or(billing_address.and_then(|address| {\n address\n .address\n .as_ref()\n .and_then(|address_details| address_details.get_optional_full_name())\n }));\n let order_details = payment_data\n .payment_intent\n .order_details\n .clone()\n .map(|order_details| {\n order_details\n .into_iter()\n .map(|order_detail| order_detail.expose())\n .collect()\n });\n let required_amount_type = StringMajorUnitForConnector;\n\n let apple_pay_amount = required_amount_type\n .convert(\n payment_data.payment_intent.amount_details.order_amount,\n payment_data.payment_intent.amount_details.currency,\n )\n .change_context(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Failed to convert amount to string major unit for applePay\".to_string(),\n })?;\n\n let apple_pay_recurring_details = payment_data\n .payment_intent\n .feature_metadata\n .clone()\n .and_then(|feature_metadata| feature_metadata.apple_pay_recurring_details)\n .map(|apple_pay_recurring_details| {\n ForeignInto::foreign_into((apple_pay_recurring_details, apple_pay_amount))\n });\n\n let order_tax_amount = payment_data\n .payment_intent\n .amount_details\n .tax_details\n .clone()\n .and_then(|tax| tax.get_default_tax_amount());\n\n let payment_attempt = payment_data.get_payment_attempt();\n let payment_method = Some(payment_attempt.payment_method_type);\n let payment_method_type = Some(payment_attempt.payment_method_subtype);\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::PaymentsSessionData {\n amount: payment_data\n .payment_intent\n .amount_details\n .order_amount\n .get_amount_as_i64(),\n currency: payment_data.payment_intent.amount_details.currency,\n country: payment_data\n .payment_intent\n .billing_address\n .and_then(|billing_address| {\n billing_address\n .get_inner()\n .address\n .as_ref()\n .and_then(|address| address.country)\n }),\n // TODO: populate surcharge here\n surcharge_details: None,\n order_details,\n email,\n minor_amount: payment_data.payment_intent.amount_details.order_amount,\n apple_pay_recurring_details,\n customer_name,\n metadata: payment_data.payment_intent.metadata,\n order_tax_amount,\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n payment_method,\n payment_method_type,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data.payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: \"\".to_string(),\n status: enums::AttemptStatus::Started,\n payment_method: enums::PaymentMethod::Wallet,\n payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: payment_data\n .payment_intent\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id: \"\".to_string(),\n preprocessing_id: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data_for_sdk_session<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentIntentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n let billing_address = payment_data\n .payment_intent\n .billing_address\n .as_ref()\n .map(|billing_address| billing_address.clone().into_inner());\n // fetch email from customer or billing address (fallback)\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from)\n .or(billing_address\n .as_ref()\n .and_then(|address| address.email.clone()));\n // fetch customer name from customer or billing address (fallback)\n let customer_name = customer\n .as_ref()\n .and_then(|customer| customer.name.clone())\n .map(|name| name.into_inner())\n .or(billing_address.and_then(|address| {\n address\n .address\n .as_ref()\n .and_then(|address_details| address_details.get_optional_full_name())\n }));\n let order_details = payment_data\n .payment_intent\n .order_details\n .clone()\n .map(|order_details| {\n order_details\n .into_iter()\n .map(|order_detail| order_detail.expose())\n .collect()\n });\n let required_amount_type = StringMajorUnitForConnector;\n\n let apple_pay_amount = required_amount_type\n .convert(\n payment_data.payment_intent.amount_details.order_amount,\n payment_data.payment_intent.amount_details.currency,\n )\n .change_context(errors::ApiErrorResponse::PreconditionFailed {\n message: \"Failed to convert amount to string major unit for applePay\".to_string(),\n })?;\n\n let apple_pay_recurring_details = payment_data\n .payment_intent\n .feature_metadata\n .clone()\n .and_then(|feature_metadata| feature_metadata.apple_pay_recurring_details)\n .map(|apple_pay_recurring_details| {\n ForeignInto::foreign_into((apple_pay_recurring_details, apple_pay_amount))\n });\n\n let order_tax_amount = payment_data\n .payment_intent\n .amount_details\n .tax_details\n .clone()\n .and_then(|tax| tax.get_default_tax_amount());\n\n let payment_attempt = payment_data.get_payment_attempt();\n let payment_method = Some(payment_attempt.payment_method_type);\n let payment_method_type = Some(payment_attempt.payment_method_subtype);\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::PaymentsSessionData {\n amount: payment_data\n .payment_intent\n .amount_details\n .order_amount\n .get_amount_as_i64(),\n currency: payment_data.payment_intent.amount_details.currency,\n country: payment_data\n .payment_intent\n .billing_address\n .and_then(|billing_address| {\n billing_address\n .get_inner()\n .address\n .as_ref()\n .and_then(|address| address.country)\n }),\n // TODO: populate surcharge here\n surcharge_details: None,\n order_details,\n email,\n minor_amount: payment_data.payment_intent.amount_details.order_amount,\n apple_pay_recurring_details,\n customer_name,\n metadata: payment_data.payment_intent.metadata,\n order_tax_amount,\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n payment_method,\n payment_method_type,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data.payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: \"\".to_string(),\n status: enums::AttemptStatus::Started,\n payment_method: enums::PaymentMethod::Wallet,\n payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: payment_data\n .payment_intent\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id: \"\".to_string(),\n preprocessing_id: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_payout_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payout_router_data<'a, F>(\n state: &SessionState,\n connector_data: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n payout_data: &mut PayoutData,\n) -> RouterResult> {\n let merchant_connector_account = payout_data\n .merchant_connector_account\n .clone()\n .get_required_value(\"merchant_connector_account\")?;\n let connector_name = connector_data.connector_name;\n let connector_auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let billing = payout_data.billing_address.to_owned();\n\n let billing_address = billing.map(api_models::payments::Address::from);\n\n let address = PaymentAddress::new(None, billing_address.map(From::from), None, None);\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let payouts = &payout_data.payouts;\n let payout_attempt = &payout_data.payout_attempt;\n let customer_details = &payout_data.customer_details;\n let connector_label = format!(\n \"{}_{}\",\n payout_data.profile_id.get_string_repr(),\n connector_name\n );\n let connector_customer_id = customer_details\n .as_ref()\n .and_then(|c| c.connector_customer.as_ref())\n .and_then(|connector_customer_value| {\n connector_customer_value\n .clone()\n .expose()\n .get(connector_label)\n .cloned()\n })\n .and_then(|id| serde_json::from_value::(id).ok());\n\n let vendor_details: Option =\n match api_models::enums::PayoutConnectors::try_from(connector_name.to_owned()).map_err(\n |err| report!(errors::ApiErrorResponse::InternalServerError).attach_printable(err),\n )? {\n api_models::enums::PayoutConnectors::Stripe => {\n payout_data.payouts.metadata.to_owned().and_then(|meta| {\n let val = meta\n .peek()\n .to_owned()\n .parse_value(\"PayoutVendorAccountDetails\")\n .ok();\n val\n })\n }\n _ => None,\n };\n\n let webhook_url = helpers::create_webhook_url(\n &state.base_url,\n &merchant_context.get_merchant_account().get_id().to_owned(),\n merchant_connector_account\n .get_mca_id()\n .get_required_value(\"merchant_connector_id\")?\n .get_string_repr(),\n );\n\n let connector_transfer_method_id =\n payout_helpers::should_create_connector_transfer_method(&*payout_data, connector_data)?;\n\n let browser_info = payout_data.browser_info.to_owned();\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().to_owned(),\n customer_id: customer_details.to_owned().map(|c| c.customer_id),\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: connector_customer_id,\n connector: connector_name.to_string(),\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"payout\")\n .get_string_repr()\n .to_owned(),\n attempt_id: \"\".to_string(),\n status: enums::AttemptStatus::Failure,\n payment_method: enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type,\n description: None,\n address,\n auth_type: enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n payment_method_status: None,\n request: types::PayoutsData {\n payout_id: payouts.payout_id.clone(),\n amount: payouts.amount.get_amount_as_i64(),\n minor_amount: payouts.amount,\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n destination_currency: payouts.destination_currency,\n source_currency: payouts.source_currency,\n entity_type: payouts.entity_type.to_owned(),\n payout_type: payouts.payout_type,\n vendor_details,\n priority: payouts.priority,\n customer_details: customer_details\n .to_owned()\n .map(|c| payments::CustomerDetails {\n customer_id: Some(c.customer_id),\n name: c.name.map(Encryptable::into_inner),\n email: c.email.map(Email::from),\n phone: c.phone.map(Encryptable::into_inner),\n phone_country_code: c.phone_country_code,\n tax_registration_id: c.tax_registration_id.map(Encryptable::into_inner),\n }),\n connector_transfer_method_id,\n webhook_url: Some(webhook_url),\n browser_info,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.to_owned(),\n },\n response: Ok(types::PayoutsResponseData::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: payout_attempt.payout_attempt_id.clone(),\n payout_method_data: payout_data.payout_method_data.to_owned(),\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payout_router_data<'a, F>(\n state: &SessionState,\n connector_data: &api::ConnectorData,\n merchant_context: &domain::MerchantContext,\n payout_data: &mut PayoutData,\n) -> RouterResult> {\n let merchant_connector_account = payout_data\n .merchant_connector_account\n .clone()\n .get_required_value(\"merchant_connector_account\")?;\n let connector_name = connector_data.connector_name;\n let connector_auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let billing = payout_data.billing_address.to_owned();\n\n let billing_address = billing.map(api_models::payments::Address::from);\n\n let address = PaymentAddress::new(None, billing_address.map(From::from), None, None);\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let payouts = &payout_data.payouts;\n let payout_attempt = &payout_data.payout_attempt;\n let customer_details = &payout_data.customer_details;\n let connector_label = format!(\n \"{}_{}\",\n payout_data.profile_id.get_string_repr(),\n connector_name\n );\n let connector_customer_id = customer_details\n .as_ref()\n .and_then(|c| c.connector_customer.as_ref())\n .and_then(|connector_customer_value| {\n connector_customer_value\n .clone()\n .expose()\n .get(connector_label)\n .cloned()\n })\n .and_then(|id| serde_json::from_value::(id).ok());\n\n let vendor_details: Option =\n match api_models::enums::PayoutConnectors::try_from(connector_name.to_owned()).map_err(\n |err| report!(errors::ApiErrorResponse::InternalServerError).attach_printable(err),\n )? {\n api_models::enums::PayoutConnectors::Stripe => {\n payout_data.payouts.metadata.to_owned().and_then(|meta| {\n let val = meta\n .peek()\n .to_owned()\n .parse_value(\"PayoutVendorAccountDetails\")\n .ok();\n val\n })\n }\n _ => None,\n };\n\n let webhook_url = helpers::create_webhook_url(\n &state.base_url,\n &merchant_context.get_merchant_account().get_id().to_owned(),\n merchant_connector_account\n .get_mca_id()\n .get_required_value(\"merchant_connector_id\")?\n .get_string_repr(),\n );\n\n let connector_transfer_method_id =\n payout_helpers::should_create_connector_transfer_method(&*payout_data, connector_data)?;\n\n let browser_info = payout_data.browser_info.to_owned();\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().to_owned(),\n customer_id: customer_details.to_owned().map(|c| c.customer_id),\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: connector_customer_id,\n connector: connector_name.to_string(),\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"payout\")\n .get_string_repr()\n .to_owned(),\n attempt_id: \"\".to_string(),\n status: enums::AttemptStatus::Failure,\n payment_method: enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type,\n description: None,\n address,\n auth_type: enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n payment_method_status: None,\n request: types::PayoutsData {\n payout_id: payouts.payout_id.clone(),\n amount: payouts.amount.get_amount_as_i64(),\n minor_amount: payouts.amount,\n connector_payout_id: payout_attempt.connector_payout_id.clone(),\n destination_currency: payouts.destination_currency,\n source_currency: payouts.source_currency,\n entity_type: payouts.entity_type.to_owned(),\n payout_type: payouts.payout_type,\n vendor_details,\n priority: payouts.priority,\n customer_details: customer_details\n .to_owned()\n .map(|c| payments::CustomerDetails {\n customer_id: Some(c.customer_id),\n name: c.name.map(Encryptable::into_inner),\n email: c.email.map(Email::from),\n phone: c.phone.map(Encryptable::into_inner),\n phone_country_code: c.phone_country_code,\n tax_registration_id: c.tax_registration_id.map(Encryptable::into_inner),\n }),\n connector_transfer_method_id,\n webhook_url: Some(webhook_url),\n browser_info,\n payout_connector_metadata: payout_attempt.payout_connector_metadata.to_owned(),\n },\n response: Ok(types::PayoutsResponseData::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: payout_attempt.payout_attempt_id.clone(),\n payout_method_data: payout_data.payout_method_data.to_owned(),\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_payments_dynamic_tax_calculation_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payments_dynamic_tax_calculation_router_data(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_data: &mut PaymentData,\n merchant_connector_account: &MerchantConnectorAccount,\n) -> RouterResult {\n let payment_intent = &payment_data.payment_intent.clone();\n let payment_attempt = &payment_data.payment_attempt.clone();\n\n #[cfg(feature = \"v1\")]\n let test_mode: Option = merchant_connector_account.test_mode;\n\n #[cfg(feature = \"v2\")]\n let test_mode = None;\n\n let connector_auth_type: types::ConnectorAuthType = merchant_connector_account\n .connector_account_details\n .clone()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let shipping_address = payment_data\n .tax_data\n .clone()\n .map(|tax_data| tax_data.shipping_details)\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Missing shipping_details\")?;\n\n let order_details: Option> = payment_intent\n .order_details\n .clone()\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::, _>>()\n })\n .transpose()?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().to_owned(),\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account.connector_name.clone(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status: payment_attempt.status,\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type,\n description: None,\n address: payment_data.address.clone(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: types::PaymentsTaxCalculationData {\n amount: payment_intent.amount,\n shipping_cost: payment_intent.shipping_cost,\n order_details,\n currency: payment_data.currency,\n shipping_address,\n },\n response: Err(ErrorResponse::default()),\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &merchant_connector_account.connector_name,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n payment_method_status: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payments_dynamic_tax_calculation_router_data(\n state: &SessionState,\n merchant_context: &domain::MerchantContext,\n payment_data: &mut PaymentData,\n merchant_connector_account: &MerchantConnectorAccount,\n) -> RouterResult {\n let payment_intent = &payment_data.payment_intent.clone();\n let payment_attempt = &payment_data.payment_attempt.clone();\n\n #[cfg(feature = \"v1\")]\n let test_mode: Option = merchant_connector_account.test_mode;\n\n #[cfg(feature = \"v2\")]\n let test_mode = None;\n\n let connector_auth_type: types::ConnectorAuthType = merchant_connector_account\n .connector_account_details\n .clone()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let shipping_address = payment_data\n .tax_data\n .clone()\n .map(|tax_data| tax_data.shipping_details)\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Missing shipping_details\")?;\n\n let order_details: Option> = payment_intent\n .order_details\n .clone()\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::, _>>()\n })\n .transpose()?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().to_owned(),\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account.connector_name.clone(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status: payment_attempt.status,\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type,\n description: None,\n address: payment_data.address.clone(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: types::PaymentsTaxCalculationData {\n amount: payment_intent.amount,\n shipping_cost: payment_intent.shipping_cost,\n order_details,\n currency: payment_data.currency,\n shipping_address,\n },\n response: Err(ErrorResponse::default()),\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &merchant_connector_account.connector_name,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n payment_method_status: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::AdyenPaymentRequest<'_>::function::try_from", + "file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }", + "after_code": "fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }", + "diff_span": { + "before": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;", + "after": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payment_methods.rs::function::create_single_use_tokenization_flow", + "file": "crates/router/src/core/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn create_single_use_tokenization_flow(\n state: SessionState,\n req_state: routes::app::ReqState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n payment_method_create_request: &payment_methods::PaymentMethodCreate,\n payment_method: &api::PaymentMethodResponse,\n payment_method_session: &domain::payment_methods::PaymentMethodSession,\n) -> RouterResult<()> {\n let customer_id = payment_method_create_request.customer_id.to_owned();\n let connector_id = payment_method_create_request\n .get_tokenize_connector_id()\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"psp_tokenization.connector_id\",\n })\n .attach_printable(\"Failed to get tokenize connector id\")?;\n\n let db = &state.store;\n\n let merchant_connector_account_details = db\n .find_merchant_connector_account_by_id(\n &(&state).into(),\n &connector_id,\n merchant_context.get_merchant_key_store(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: connector_id.get_string_repr().to_owned(),\n })\n .attach_printable(\"error while fetching merchant_connector_account from connector_id\")?;\n let auth_type = merchant_connector_account_details\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let payment_method_data_request = types::PaymentMethodTokenizationData {\n payment_method_data: domain::PaymentMethodData::try_from(\n payment_method_create_request.payment_method_data.clone(),\n )\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"card_cvc\",\n })\n .attach_printable(\n \"Failed to convert type from Payment Method Create Data to Payment Method Data\",\n )?,\n browser_info: None,\n currency: api_models::enums::Currency::default(),\n amount: None,\n split_payments: None,\n mandate_id: None,\n setup_future_usage: None,\n customer_acceptance: None,\n setup_mandate_details: None,\n };\n\n let payment_method_session_address = types::PaymentAddress::new(\n None,\n payment_method_session\n .billing\n .clone()\n .map(|address| address.into_inner()),\n None,\n None,\n );\n\n let mut router_data =\n types::RouterData:: {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account_details\n .connector_name\n .to_string(),\n payment_id: consts::IRRELEVANT_PAYMENT_INTENT_ID.to_string(), //Static\n attempt_id: consts::IRRELEVANT_PAYMENT_ATTEMPT_ID.to_string(), //Static\n tenant_id: state.tenant.tenant_id.clone(),\n status: common_enums::enums::AttemptStatus::default(),\n payment_method: common_enums::enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: payment_method_session_address,\n auth_type: common_enums::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: payment_method_data_request.clone(),\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n connector_request_reference_id: payment_method_session.id.get_string_repr().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n connector_response: None,\n payment_method_status: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n let payment_method_token_response = Box::pin(tokenization::add_token_for_payment_method(\n &mut router_data,\n payment_method_data_request.clone(),\n state.clone(),\n &merchant_connector_account_details.clone(),\n ))\n .await?;\n\n let token_response = payment_method_token_response.token.map_err(|err| {\n errors::ApiErrorResponse::ExternalConnectorError {\n code: err.code,\n message: err.message,\n connector: (merchant_connector_account_details.clone())\n .connector_name\n .to_string(),\n status_code: err.status_code,\n reason: err.reason,\n }\n })?;\n\n let value = domain::SingleUsePaymentMethodToken::get_single_use_token_from_payment_method_token(\n token_response.clone().into(),\n connector_id.clone(),\n );\n\n let key = domain::SingleUseTokenKey::store_key(&payment_method.id);\n\n add_single_use_token_to_store(&state, key, value)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to store single use token\")?;\n\n Ok(())\n}", + "after_code": "async fn create_single_use_tokenization_flow(\n state: SessionState,\n req_state: routes::app::ReqState,\n merchant_context: domain::MerchantContext,\n profile: domain::Profile,\n payment_method_create_request: &payment_methods::PaymentMethodCreate,\n payment_method: &api::PaymentMethodResponse,\n payment_method_session: &domain::payment_methods::PaymentMethodSession,\n) -> RouterResult<()> {\n let customer_id = payment_method_create_request.customer_id.to_owned();\n let connector_id = payment_method_create_request\n .get_tokenize_connector_id()\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"psp_tokenization.connector_id\",\n })\n .attach_printable(\"Failed to get tokenize connector id\")?;\n\n let db = &state.store;\n\n let merchant_connector_account_details = db\n .find_merchant_connector_account_by_id(\n &(&state).into(),\n &connector_id,\n merchant_context.get_merchant_key_store(),\n )\n .await\n .to_not_found_response(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: connector_id.get_string_repr().to_owned(),\n })\n .attach_printable(\"error while fetching merchant_connector_account from connector_id\")?;\n let auth_type = merchant_connector_account_details\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let payment_method_data_request = types::PaymentMethodTokenizationData {\n payment_method_data: domain::PaymentMethodData::try_from(\n payment_method_create_request.payment_method_data.clone(),\n )\n .change_context(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"card_cvc\",\n })\n .attach_printable(\n \"Failed to convert type from Payment Method Create Data to Payment Method Data\",\n )?,\n browser_info: None,\n currency: api_models::enums::Currency::default(),\n amount: None,\n split_payments: None,\n mandate_id: None,\n setup_future_usage: None,\n customer_acceptance: None,\n setup_mandate_details: None,\n };\n\n let payment_method_session_address = types::PaymentAddress::new(\n None,\n payment_method_session\n .billing\n .clone()\n .map(|address| address.into_inner()),\n None,\n None,\n );\n\n let mut router_data =\n types::RouterData:: {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account_details\n .connector_name\n .to_string(),\n payment_id: consts::IRRELEVANT_PAYMENT_INTENT_ID.to_string(), //Static\n attempt_id: consts::IRRELEVANT_PAYMENT_ATTEMPT_ID.to_string(), //Static\n tenant_id: state.tenant.tenant_id.clone(),\n status: common_enums::enums::AttemptStatus::default(),\n payment_method: common_enums::enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: payment_method_session_address,\n auth_type: common_enums::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: payment_method_data_request.clone(),\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n connector_request_reference_id: payment_method_session.id.get_string_repr().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n connector_response: None,\n payment_method_status: None,\n minor_amount_captured: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n let payment_method_token_response = Box::pin(tokenization::add_token_for_payment_method(\n &mut router_data,\n payment_method_data_request.clone(),\n state.clone(),\n &merchant_connector_account_details.clone(),\n ))\n .await?;\n\n let token_response = payment_method_token_response.token.map_err(|err| {\n errors::ApiErrorResponse::ExternalConnectorError {\n code: err.code,\n message: err.message,\n connector: (merchant_connector_account_details.clone())\n .connector_name\n .to_string(),\n status_code: err.status_code,\n reason: err.reason,\n }\n })?;\n\n let value = domain::SingleUsePaymentMethodToken::get_single_use_token_from_payment_method_token(\n token_response.clone().into(),\n connector_id.clone(),\n );\n\n let key = domain::SingleUseTokenKey::store_key(&payment_method.id);\n\n add_single_use_token_to_store(&state, key, value)\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to store single use token\")?;\n\n Ok(())\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_capture", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data_for_capture<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentCaptureData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n let connector = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_id,\n api::GetToken::Connector,\n payment_data.payment_attempt.merchant_connector_id.clone(),\n )?;\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let amount_to_capture = payment_data\n .payment_attempt\n .amount_details\n .get_amount_to_capture()\n .unwrap_or(payment_data.payment_attempt.amount_details.get_net_amount());\n\n let amount = payment_data.payment_attempt.amount_details.get_net_amount();\n let request = types::PaymentsCaptureData {\n capture_method: Some(payment_data.payment_intent.capture_method),\n amount_to_capture: amount_to_capture.get_amount_as_i64(), // This should be removed once we start moving to connector module\n minor_amount_to_capture: amount_to_capture,\n currency: payment_data.payment_intent.amount_details.currency,\n connector_transaction_id: connector\n .connector\n .connector_transaction_id(&payment_data.payment_attempt)?\n .ok_or(errors::ApiErrorResponse::ResourceIdNotFound)?,\n payment_amount: amount.get_amount_as_i64(), // This should be removed once we start moving to connector module\n minor_payment_amount: amount,\n connector_meta: payment_data\n .payment_attempt\n .connector_metadata\n .clone()\n .expose_option(),\n // TODO: add multiple capture data\n multiple_capture_data: None,\n // TODO: why do we need browser info during capture?\n browser_info: None,\n metadata: payment_data.payment_intent.metadata.expose_option(),\n integrity_object: None,\n split_payments: None,\n webhook_url: None,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data_for_capture<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentCaptureData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n let connector = api::ConnectorData::get_connector_by_name(\n &state.conf.connectors,\n connector_id,\n api::GetToken::Connector,\n payment_data.payment_attempt.merchant_connector_id.clone(),\n )?;\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let amount_to_capture = payment_data\n .payment_attempt\n .amount_details\n .get_amount_to_capture()\n .unwrap_or(payment_data.payment_attempt.amount_details.get_net_amount());\n\n let amount = payment_data.payment_attempt.amount_details.get_net_amount();\n let request = types::PaymentsCaptureData {\n capture_method: Some(payment_data.payment_intent.capture_method),\n amount_to_capture: amount_to_capture.get_amount_as_i64(), // This should be removed once we start moving to connector module\n minor_amount_to_capture: amount_to_capture,\n currency: payment_data.payment_intent.amount_details.currency,\n connector_transaction_id: connector\n .connector\n .connector_transaction_id(&payment_data.payment_attempt)?\n .ok_or(errors::ApiErrorResponse::ResourceIdNotFound)?,\n payment_amount: amount.get_amount_as_i64(), // This should be removed once we start moving to connector module\n minor_payment_amount: amount,\n connector_meta: payment_data\n .payment_attempt\n .connector_metadata\n .clone()\n .expose_option(),\n // TODO: add multiple capture data\n multiple_capture_data: None,\n // TODO: why do we need browser info during capture?\n browser_info: None,\n metadata: payment_data.payment_intent.metadata.expose_option(),\n integrity_object: None,\n split_payments: None,\n webhook_url: None,\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_submit_evidence_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_submit_evidence_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n submit_evidence_request_data: types::SubmitEvidenceRequestData,\n) -> RouterResult {\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n request: submit_evidence_request_data,\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n payment_method_status: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_submit_evidence_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n submit_evidence_request_data: types::SubmitEvidenceRequestData,\n) -> RouterResult {\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n request: submit_evidence_request_data,\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n payment_method_status: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/transaction_flow.rs::FrmData::function::construct_router_data", + "file": "crates/router/src/core/fraud_check/flows/transaction_flow.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult<\n RouterData,\n > {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let payment_method = self.payment_attempt.payment_method;\n let currency = self.payment_attempt.currency;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckTransactionData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency,\n payment_method,\n error_code: self.payment_attempt.error_code.clone(),\n error_message: self.payment_attempt.error_message.clone(),\n connector_transaction_id: self\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string),\n connector: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n payment_method_status: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }", + "after_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult<\n RouterData,\n > {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let payment_method = self.payment_attempt.payment_method;\n let currency = self.payment_attempt.currency;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckTransactionData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency,\n payment_method,\n error_code: self.payment_attempt.error_code.clone(),\n error_message: self.payment_attempt.error_message.clone(),\n connector_transaction_id: self\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string),\n connector: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n payment_method_status: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/fulfillment_flow.rs::function::construct_fulfillment_router_data", + "file": "crates/router/src/core/fraud_check/flows/fulfillment_flow.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_fulfillment_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n connector: String,\n fulfillment_request: FrmFulfillmentRequest,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let connector_id = connector.clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n &connector,\n None,\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method =\n utils::OptionExt::get_required_value(payment_attempt.payment_method, \"payment_method\")?;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n connector,\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: FraudCheckFulfillmentData {\n amount: payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: payment_intent.order_details.clone(),\n fulfillment_req: fulfillment_request,\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_fulfillment_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n connector: String,\n fulfillment_request: FrmFulfillmentRequest,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let connector_id = connector.clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n &connector,\n None,\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method =\n utils::OptionExt::get_required_value(payment_attempt.payment_method, \"payment_method\")?;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n connector,\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: FraudCheckFulfillmentData {\n amount: payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: payment_intent.order_details.clone(),\n fulfillment_req: fulfillment_request,\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n &connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/helpers.rs::function::router_data_type_conversion", + "file": "crates/router/src/core/payments/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn router_data_type_conversion(\n router_data: RouterData,\n request: Req2,\n response: Result,\n) -> RouterData {\n RouterData {\n flow: std::marker::PhantomData,\n request,\n response,\n merchant_id: router_data.merchant_id,\n tenant_id: router_data.tenant_id,\n address: router_data.address,\n amount_captured: router_data.amount_captured,\n minor_amount_captured: router_data.minor_amount_captured,\n auth_type: router_data.auth_type,\n connector: router_data.connector,\n connector_auth_type: router_data.connector_auth_type,\n connector_meta_data: router_data.connector_meta_data,\n description: router_data.description,\n payment_id: router_data.payment_id,\n payment_method: router_data.payment_method,\n payment_method_type: router_data.payment_method_type,\n status: router_data.status,\n attempt_id: router_data.attempt_id,\n access_token: router_data.access_token,\n session_token: router_data.session_token,\n payment_method_status: router_data.payment_method_status,\n reference_id: router_data.reference_id,\n payment_method_token: router_data.payment_method_token,\n customer_id: router_data.customer_id,\n connector_customer: router_data.connector_customer,\n preprocessing_id: router_data.preprocessing_id,\n payment_method_balance: router_data.payment_method_balance,\n recurring_mandate_payment_data: router_data.recurring_mandate_payment_data,\n connector_request_reference_id: router_data.connector_request_reference_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: router_data.test_mode,\n connector_api_version: router_data.connector_api_version,\n connector_http_status_code: router_data.connector_http_status_code,\n external_latency: router_data.external_latency,\n apple_pay_flow: router_data.apple_pay_flow,\n frm_metadata: router_data.frm_metadata,\n refund_id: router_data.refund_id,\n dispute_id: router_data.dispute_id,\n connector_response: router_data.connector_response,\n integrity_check: Ok(()),\n connector_wallets_details: router_data.connector_wallets_details,\n additional_merchant_data: router_data.additional_merchant_data,\n header_payload: router_data.header_payload,\n connector_mandate_request_reference_id: router_data.connector_mandate_request_reference_id,\n authentication_id: router_data.authentication_id,\n psd2_sca_exemption_type: router_data.psd2_sca_exemption_type,\n raw_connector_response: router_data.raw_connector_response,\n is_payment_id_from_merchant: router_data.is_payment_id_from_merchant,\n l2_l3_data: router_data.l2_l3_data,\n minor_amount_capturable: router_data.minor_amount_capturable,\n authorized_amount: router_data.authorized_amount,\n is_migrated_card: router_data.is_migrated_card,\n }\n}", + "after_code": "pub fn router_data_type_conversion(\n router_data: RouterData,\n request: Req2,\n response: Result,\n) -> RouterData {\n RouterData {\n flow: std::marker::PhantomData,\n request,\n response,\n merchant_id: router_data.merchant_id,\n tenant_id: router_data.tenant_id,\n address: router_data.address,\n amount_captured: router_data.amount_captured,\n minor_amount_captured: router_data.minor_amount_captured,\n auth_type: router_data.auth_type,\n connector: router_data.connector,\n connector_auth_type: router_data.connector_auth_type,\n connector_meta_data: router_data.connector_meta_data,\n description: router_data.description,\n payment_id: router_data.payment_id,\n payment_method: router_data.payment_method,\n payment_method_type: router_data.payment_method_type,\n status: router_data.status,\n attempt_id: router_data.attempt_id,\n access_token: router_data.access_token,\n session_token: router_data.session_token,\n payment_method_status: router_data.payment_method_status,\n reference_id: router_data.reference_id,\n payment_method_token: router_data.payment_method_token,\n customer_id: router_data.customer_id,\n connector_customer: router_data.connector_customer,\n preprocessing_id: router_data.preprocessing_id,\n payment_method_balance: router_data.payment_method_balance,\n recurring_mandate_payment_data: router_data.recurring_mandate_payment_data,\n connector_request_reference_id: router_data.connector_request_reference_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: router_data.test_mode,\n connector_api_version: router_data.connector_api_version,\n connector_http_status_code: router_data.connector_http_status_code,\n external_latency: router_data.external_latency,\n apple_pay_flow: router_data.apple_pay_flow,\n frm_metadata: router_data.frm_metadata,\n refund_id: router_data.refund_id,\n dispute_id: router_data.dispute_id,\n connector_response: router_data.connector_response,\n integrity_check: Ok(()),\n connector_wallets_details: router_data.connector_wallets_details,\n additional_merchant_data: router_data.additional_merchant_data,\n header_payload: router_data.header_payload,\n connector_mandate_request_reference_id: router_data.connector_mandate_request_reference_id,\n authentication_id: router_data.authentication_id,\n psd2_sca_exemption_type: router_data.psd2_sca_exemption_type,\n raw_connector_response: router_data.raw_connector_response,\n is_payment_id_from_merchant: router_data.is_payment_id_from_merchant,\n l2_l3_data: router_data.l2_l3_data,\n minor_amount_capturable: router_data.minor_amount_capturable,\n authorized_amount: router_data.authorized_amount,\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: router_data.minor_amount_capturable,\n authorized_amount: router_data.authorized_amount,\n is_migrated_card: router_data.is_migrated_card,\n }\n}", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types/api/verify_connector.rs::VerifyConnectorData::function::get_router_data", + "file": "crates/router/src/types/api/verify_connector.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn get_router_data(\n &self,\n state: &SessionState,\n request_data: R1,\n access_token: Option,\n ) -> types::RouterData {\n let attempt_id =\n common_utils::generate_id_with_default_len(consts::VERIFY_CONNECTOR_ID_PREFIX);\n types::RouterData {\n flow: std::marker::PhantomData,\n status: storage_enums::AttemptStatus::Started,\n request: request_data,\n response: Err(errors::ApiErrorResponse::InternalServerError.into()),\n connector: self.connector.id().to_string(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n test_mode: None,\n attempt_id: attempt_id.clone(),\n description: None,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n merchant_id: common_utils::id_type::MerchantId::default(),\n reference_id: None,\n access_token,\n session_token: None,\n payment_method: storage_enums::PaymentMethod::Card,\n payment_method_type: None,\n amount_captured: None,\n minor_amount_captured: None,\n preprocessing_id: None,\n connector_customer: None,\n connector_auth_type: self.connector_auth.clone(),\n connector_meta_data: None,\n connector_wallets_details: None,\n payment_method_token: None,\n connector_api_version: None,\n recurring_mandate_payment_data: None,\n payment_method_status: None,\n connector_request_reference_id: attempt_id,\n address: types::PaymentAddress::new(None, None, None, None),\n payment_id: common_utils::id_type::PaymentId::default()\n .get_string_repr()\n .to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after_code": "fn get_router_data(\n &self,\n state: &SessionState,\n request_data: R1,\n access_token: Option,\n ) -> types::RouterData {\n let attempt_id =\n common_utils::generate_id_with_default_len(consts::VERIFY_CONNECTOR_ID_PREFIX);\n types::RouterData {\n flow: std::marker::PhantomData,\n status: storage_enums::AttemptStatus::Started,\n request: request_data,\n response: Err(errors::ApiErrorResponse::InternalServerError.into()),\n connector: self.connector.id().to_string(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n test_mode: None,\n attempt_id: attempt_id.clone(),\n description: None,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n merchant_id: common_utils::id_type::MerchantId::default(),\n reference_id: None,\n access_token,\n session_token: None,\n payment_method: storage_enums::PaymentMethod::Card,\n payment_method_type: None,\n amount_captured: None,\n minor_amount_captured: None,\n preprocessing_id: None,\n connector_customer: None,\n connector_auth_type: self.connector_auth.clone(),\n connector_meta_data: None,\n connector_wallets_details: None,\n payment_method_token: None,\n connector_api_version: None,\n recurring_mandate_payment_data: None,\n payment_method_status: None,\n connector_request_reference_id: attempt_id,\n address: types::PaymentAddress::new(None, None, None, None),\n payment_id: common_utils::id_type::PaymentId::default()\n .get_string_repr()\n .to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/record_return.rs::impl::FrmData", + "file": "crates/router/src/core/fraud_check/flows/record_return.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult>\n {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n let currency = self.payment_attempt.clone().currency;\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: utils::OptionExt::get_required_value(\n self.payment_attempt.payment_method,\n \"payment_method\",\n )?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckRecordReturnData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n refund_method: RefundMethod::OriginalPaymentInstrument, //we dont consume this data now in payments...hence hardcoded\n currency,\n refund_transaction_id: self.refund.clone().map(|refund| refund.refund_id),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::RecordReturnResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n return_id: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }\n}", + "after_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult>\n {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n let currency = self.payment_attempt.clone().currency;\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: utils::OptionExt::get_required_value(\n self.payment_attempt.payment_method,\n \"payment_method\",\n )?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckRecordReturnData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n refund_method: RefundMethod::OriginalPaymentInstrument, //we dont consume this data now in payments...hence hardcoded\n currency,\n refund_transaction_id: self.refund.clone().map(|refund| refund.refund_id),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::RecordReturnResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n return_id: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/sale_flow.rs::impl::FrmData", + "file": "crates/router/src/core/fraud_check/flows/sale_flow.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult> {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult> {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckSaleData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n },\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }\n}", + "after_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult> {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult> {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckSaleData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n },\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/record_return.rs::FrmData::function::construct_router_data", + "file": "crates/router/src/core/fraud_check/flows/record_return.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n let currency = self.payment_attempt.clone().currency;\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: utils::OptionExt::get_required_value(\n self.payment_attempt.payment_method,\n \"payment_method\",\n )?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckRecordReturnData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n refund_method: RefundMethod::OriginalPaymentInstrument, //we dont consume this data now in payments...hence hardcoded\n currency,\n refund_transaction_id: self.refund.clone().map(|refund| refund.refund_id),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::RecordReturnResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n return_id: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }", + "after_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n let currency = self.payment_attempt.clone().currency;\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: utils::OptionExt::get_required_value(\n self.payment_attempt.payment_method,\n \"payment_method\",\n )?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckRecordReturnData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n refund_method: RefundMethod::OriginalPaymentInstrument, //we dont consume this data now in payments...hence hardcoded\n currency,\n refund_transaction_id: self.refund.clone().map(|refund| refund.refund_id),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::RecordReturnResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n return_id: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_router_data_for_psync", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_router_data_for_psync<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentStatusData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n // TODO: Take Globalid / CustomerReferenceId and convert to connector reference id\n let customer_id = None;\n\n let payment_intent = payment_data.payment_intent;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let attempt = &payment_data.payment_attempt;\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let request = types::PaymentsSyncData {\n amount: attempt.amount_details.get_net_amount(),\n integrity_object: None,\n mandate_id: None,\n connector_transaction_id: match attempt.get_connector_payment_id() {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: attempt.encoded_data.clone().expose_option(),\n capture_method: Some(payment_intent.capture_method),\n connector_meta: attempt.connector_metadata.clone().expose_option(),\n sync_type: types::SyncRequestType::SinglePaymentSync,\n payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from feature metadata\n split_payments: None,\n payment_experience: None,\n connector_reference_id: attempt.connector_response_reference_id.clone(),\n setup_future_usage: Some(payment_intent.setup_future_usage),\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: attempt.get_id().get_string_repr().to_owned(),\n status: attempt.status,\n payment_method: attempt.payment_method_type,\n payment_method_type: Some(attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: attempt.preprocessing_step_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_router_data_for_psync<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentStatusData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n // TODO: Take Globalid / CustomerReferenceId and convert to connector reference id\n let customer_id = None;\n\n let payment_intent = payment_data.payment_intent;\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let attempt = &payment_data.payment_attempt;\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let request = types::PaymentsSyncData {\n amount: attempt.amount_details.get_net_amount(),\n integrity_object: None,\n mandate_id: None,\n connector_transaction_id: match attempt.get_connector_payment_id() {\n Some(connector_txn_id) => {\n types::ResponseId::ConnectorTransactionId(connector_txn_id.to_owned())\n }\n None => types::ResponseId::NoResponseId,\n },\n encoded_data: attempt.encoded_data.clone().expose_option(),\n capture_method: Some(payment_intent.capture_method),\n connector_meta: attempt.connector_metadata.clone().expose_option(),\n sync_type: types::SyncRequestType::SinglePaymentSync,\n payment_method_type: Some(attempt.payment_method_subtype),\n currency: payment_intent.amount_details.currency,\n // TODO: Get the charges object from feature metadata\n split_payments: None,\n payment_experience: None,\n connector_reference_id: attempt.connector_response_reference_id.clone(),\n setup_future_usage: Some(payment_intent.setup_future_usage),\n };\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_intent.id.get_string_repr().to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: attempt.get_id().get_string_repr().to_owned(),\n status: attempt.status,\n payment_method: attempt.payment_method_type,\n payment_method_type: Some(attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: attempt.authentication_type,\n connector_meta_data: None,\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: attempt.preprocessing_step_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_refund_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_refund_router_data<'a, F>(\n state: &'a SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n money: (MinorUnit, enums::Currency),\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n refund: &'a diesel_refund::Refund,\n split_refunds: Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n) -> RouterResult> {\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let status = payment_attempt.status;\n\n let (payment_amount, currency) = money;\n\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_id_or_connector_name = payment_attempt\n .merchant_connector_id\n .as_ref()\n .map(|mca_id| mca_id.get_string_repr())\n .unwrap_or(connector_id);\n\n let webhook_url = Some(helpers::create_webhook_url(\n &state.base_url.clone(),\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account_id_or_connector_name,\n ));\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let browser_info: Option = payment_attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let connector_refund_id = refund.get_optional_connector_refund_id().cloned();\n let capture_method = payment_attempt.capture_method;\n\n let braintree_metadata = payment_intent\n .connector_metadata\n .clone()\n .map(|cm| {\n cm.parse_value::(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.braintree);\n\n let merchant_account_id = braintree_metadata\n .as_ref()\n .and_then(|braintree| braintree.merchant_account_id.clone());\n let merchant_config_currency =\n braintree_metadata.and_then(|braintree| braintree.merchant_config_currency);\n let additional_payment_method_data: Option =\n payment_attempt\n .payment_method_data\n .clone()\n .and_then(|value| match serde_json::from_value(value) {\n Ok(data) => Some(data),\n Err(e) => {\n router_env::logger::error!(\"Failed to deserialize payment_method_data: {}\", e);\n None\n }\n });\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: payment_intent.customer_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n // Does refund need shipping/billing address ?\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n payment_method_status: None,\n minor_amount_captured: payment_intent.amount_captured,\n request: types::RefundsData {\n refund_id: refund.refund_id.clone(),\n connector_transaction_id: refund.get_connector_transaction_id().clone(),\n refund_amount: refund.refund_amount.get_amount_as_i64(),\n minor_refund_amount: refund.refund_amount,\n currency,\n payment_amount: payment_amount.get_amount_as_i64(),\n minor_payment_amount: payment_amount,\n webhook_url,\n connector_metadata: payment_attempt.connector_metadata.clone(),\n refund_connector_metadata: refund.metadata.clone(),\n reason: refund.refund_reason.clone(),\n connector_refund_id: connector_refund_id.clone(),\n browser_info,\n split_refunds,\n integrity_object: None,\n refund_status: refund.refund_status,\n merchant_account_id,\n merchant_config_currency,\n capture_method,\n additional_payment_method_data,\n },\n\n response: Ok(types::RefundsResponseData {\n connector_refund_id: connector_refund_id.unwrap_or_default(),\n refund_status: refund.refund_status,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: refund.refund_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: Some(refund.refund_id.clone()),\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_refund_router_data<'a, F>(\n state: &'a SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n money: (MinorUnit, enums::Currency),\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n refund: &'a diesel_refund::Refund,\n split_refunds: Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n) -> RouterResult> {\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let status = payment_attempt.status;\n\n let (payment_amount, currency) = money;\n\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let merchant_connector_account_id_or_connector_name = payment_attempt\n .merchant_connector_id\n .as_ref()\n .map(|mca_id| mca_id.get_string_repr())\n .unwrap_or(connector_id);\n\n let webhook_url = Some(helpers::create_webhook_url(\n &state.base_url.clone(),\n merchant_context.get_merchant_account().get_id(),\n merchant_connector_account_id_or_connector_name,\n ));\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let browser_info: Option = payment_attempt\n .browser_info\n .clone()\n .map(|b| b.parse_value(\"BrowserInformation\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"browser_info\",\n })?;\n\n let connector_refund_id = refund.get_optional_connector_refund_id().cloned();\n let capture_method = payment_attempt.capture_method;\n\n let braintree_metadata = payment_intent\n .connector_metadata\n .clone()\n .map(|cm| {\n cm.parse_value::(\"ConnectorMetadata\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed parsing ConnectorMetadata\")\n })\n .transpose()?\n .and_then(|cm| cm.braintree);\n\n let merchant_account_id = braintree_metadata\n .as_ref()\n .and_then(|braintree| braintree.merchant_account_id.clone());\n let merchant_config_currency =\n braintree_metadata.and_then(|braintree| braintree.merchant_config_currency);\n let additional_payment_method_data: Option =\n payment_attempt\n .payment_method_data\n .clone()\n .and_then(|value| match serde_json::from_value(value) {\n Ok(data) => Some(data),\n Err(e) => {\n router_env::logger::error!(\"Failed to deserialize payment_method_data: {}\", e);\n None\n }\n });\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: payment_intent.customer_id.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n // Does refund need shipping/billing address ?\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n payment_method_status: None,\n minor_amount_captured: payment_intent.amount_captured,\n request: types::RefundsData {\n refund_id: refund.refund_id.clone(),\n connector_transaction_id: refund.get_connector_transaction_id().clone(),\n refund_amount: refund.refund_amount.get_amount_as_i64(),\n minor_refund_amount: refund.refund_amount,\n currency,\n payment_amount: payment_amount.get_amount_as_i64(),\n minor_payment_amount: payment_amount,\n webhook_url,\n connector_metadata: payment_attempt.connector_metadata.clone(),\n refund_connector_metadata: refund.metadata.clone(),\n reason: refund.refund_reason.clone(),\n connector_refund_id: connector_refund_id.clone(),\n browser_info,\n split_refunds,\n integrity_object: None,\n refund_status: refund.refund_status,\n merchant_account_id,\n merchant_config_currency,\n capture_method,\n additional_payment_method_data,\n },\n\n response: Ok(types::RefundsResponseData {\n connector_refund_id: connector_refund_id.unwrap_or_default(),\n refund_status: refund.refund_status,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: refund.refund_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: Some(refund.refund_id.clone()),\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_domain_models/src/router_data.rs::struct::RouterData", + "file": "crates/hyperswitch_domain_models/src/router_data.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct RouterData {\n pub flow: PhantomData,\n pub merchant_id: id_type::MerchantId,\n pub customer_id: Option,\n pub connector_customer: Option,\n pub connector: String,\n // TODO: This should be a PaymentId type.\n // Make this change after all the connector dependency has been removed from connectors\n pub payment_id: String,\n pub attempt_id: String,\n pub tenant_id: id_type::TenantId,\n pub status: common_enums::enums::AttemptStatus,\n pub payment_method: common_enums::enums::PaymentMethod,\n pub payment_method_type: Option,\n pub connector_auth_type: ConnectorAuthType,\n pub description: Option,\n pub address: PaymentAddress,\n pub auth_type: common_enums::enums::AuthenticationType,\n pub connector_meta_data: Option,\n pub connector_wallets_details: Option,\n pub amount_captured: Option,\n pub access_token: Option,\n pub session_token: Option,\n pub reference_id: Option,\n pub payment_method_token: Option,\n pub recurring_mandate_payment_data: Option,\n pub preprocessing_id: Option,\n /// This is the balance amount for gift cards or voucher\n pub payment_method_balance: Option,\n\n ///for switching between two different versions of the same connector\n pub connector_api_version: Option,\n\n /// Contains flow-specific data required to construct a request and send it to the connector.\n pub request: Request,\n\n /// Contains flow-specific data that the connector responds with.\n pub response: Result,\n\n /// Contains a reference ID that should be sent in the connector request\n pub connector_request_reference_id: String,\n\n #[cfg(feature = \"payouts\")]\n /// Contains payout method data\n pub payout_method_data: Option,\n\n #[cfg(feature = \"payouts\")]\n /// Contains payout's quote ID\n pub quote_id: Option,\n\n pub test_mode: Option,\n pub connector_http_status_code: Option,\n pub external_latency: Option,\n /// Contains apple pay flow type simplified or manual\n pub apple_pay_flow: Option,\n\n pub frm_metadata: Option,\n\n pub dispute_id: Option,\n pub refund_id: Option,\n\n /// This field is used to store various data regarding the response from connector\n pub connector_response: Option,\n pub payment_method_status: Option,\n pub is_migrated_card: Option,\n\n // minor amount for amount framework\n pub minor_amount_captured: Option,\n pub minor_amount_capturable: Option,\n\n // stores the authorized amount in case of partial authorization\n pub authorized_amount: Option,\n\n pub integrity_check: Result<(), IntegrityCheckError>,\n\n pub additional_merchant_data: Option,\n\n pub header_payload: Option,\n\n pub connector_mandate_request_reference_id: Option,\n\n pub l2_l3_data: Option>,\n\n pub authentication_id: Option,\n /// Contains the type of sca exemption required for the transaction\n pub psd2_sca_exemption_type: Option,\n\n /// Contains stringified connector raw response body\n pub raw_connector_response: Option>,\n\n /// Indicates whether the payment ID was provided by the merchant (true),\n /// or generated internally by Hyperswitch (false)\n pub is_payment_id_from_merchant: Option,\n}", + "after_code": "pub struct RouterData {\n pub flow: PhantomData,\n pub merchant_id: id_type::MerchantId,\n pub customer_id: Option,\n pub connector_customer: Option,\n pub connector: String,\n // TODO: This should be a PaymentId type.\n // Make this change after all the connector dependency has been removed from connectors\n pub payment_id: String,\n pub attempt_id: String,\n pub tenant_id: id_type::TenantId,\n pub status: common_enums::enums::AttemptStatus,\n pub payment_method: common_enums::enums::PaymentMethod,\n pub payment_method_type: Option,\n pub connector_auth_type: ConnectorAuthType,\n pub description: Option,\n pub address: PaymentAddress,\n pub auth_type: common_enums::enums::AuthenticationType,\n pub connector_meta_data: Option,\n pub connector_wallets_details: Option,\n pub amount_captured: Option,\n pub access_token: Option,\n pub session_token: Option,\n pub reference_id: Option,\n pub payment_method_token: Option,\n pub recurring_mandate_payment_data: Option,\n pub preprocessing_id: Option,\n /// This is the balance amount for gift cards or voucher\n pub payment_method_balance: Option,\n\n ///for switching between two different versions of the same connector\n pub connector_api_version: Option,\n\n /// Contains flow-specific data required to construct a request and send it to the connector.\n pub request: Request,\n\n /// Contains flow-specific data that the connector responds with.\n pub response: Result,\n\n /// Contains a reference ID that should be sent in the connector request\n pub connector_request_reference_id: String,\n\n #[cfg(feature = \"payouts\")]\n /// Contains payout method data\n pub payout_method_data: Option,\n\n #[cfg(feature = \"payouts\")]\n /// Contains payout's quote ID\n pub quote_id: Option,\n\n pub test_mode: Option,\n pub connector_http_status_code: Option,\n pub external_latency: Option,\n /// Contains apple pay flow type simplified or manual\n pub apple_pay_flow: Option,\n\n pub frm_metadata: Option,\n\n pub dispute_id: Option,\n pub refund_id: Option,\n\n /// This field is used to store various data regarding the response from connector\n pub connector_response: Option,\n pub payment_method_status: Option,\n\n // minor amount for amount framework\n pub minor_amount_captured: Option,\n pub minor_amount_capturable: Option,\n\n // stores the authorized amount in case of partial authorization\n pub authorized_amount: Option,\n\n pub integrity_check: Result<(), IntegrityCheckError>,\n\n pub additional_merchant_data: Option,\n\n pub header_payload: Option,\n\n pub connector_mandate_request_reference_id: Option,\n\n pub l2_l3_data: Option>,\n\n pub authentication_id: Option,\n /// Contains the type of sca exemption required for the transaction\n pub psd2_sca_exemption_type: Option,\n\n /// Contains stringified connector raw response body\n pub raw_connector_response: Option>,\n\n /// Indicates whether the payment ID was provided by the merchant (true),\n /// or generated internally by Hyperswitch (false)\n pub is_payment_id_from_merchant: Option,\n}", + "diff_span": { + "before": " pub connector_response: Option,\n pub payment_method_status: Option,\n pub is_migrated_card: Option,\n\n // minor amount for amount framework", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data<'a, F, T>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n merchant_recipient_data: Option,\n header_payload: Option,\n payment_method: Option,\n payment_method_type: Option,\n) -> RouterResult>\nwhere\n T: TryFrom>,\n types::RouterData: Feature,\n F: Clone,\n error_stack::Report:\n From<>>::Error>,\n{\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let payment_method = payment_data\n .payment_attempt\n .payment_method\n .or(payment_method)\n .get_required_value(\"payment_method\")?;\n\n let payment_method_type = payment_data\n .payment_attempt\n .payment_method_type\n .or(payment_method_type);\n\n let resource_id = match payment_data\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string)\n {\n Some(id) => types::ResponseId::ConnectorTransactionId(id),\n None => types::ResponseId::NoResponseId,\n };\n\n // [#44]: why should response be filled during request\n let response = Ok(types::PaymentsResponseData::TransactionResponse {\n resource_id,\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n });\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = api_models::enums::Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let apple_pay_flow = payments::decide_apple_pay_flow(\n state,\n payment_data.payment_attempt.payment_method_type,\n Some(merchant_connector_account),\n );\n\n let unified_address = if let Some(payment_method_info) =\n payment_data.payment_method_info.clone()\n {\n let payment_method_billing = payment_method_info\n .payment_method_billing_address\n .map(|decrypted_data| decrypted_data.into_inner().expose())\n .map(|decrypted_value| decrypted_value.parse_value(\"payment_method_billing_address\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to parse payment_method_billing_address\")?;\n payment_data\n .address\n .clone()\n .unify_with_payment_data_billing(payment_method_billing)\n } else {\n payment_data.address\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n let order_details = payment_data\n .payment_intent\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::, _>>()\n })\n .transpose()?;\n let l2_l3_data =\n (state.conf.l2_l3_data_config.enabled && payment_data.is_l2_l3_enabled).then(|| {\n let shipping_address = unified_address.get_shipping();\n let billing_address = unified_address.get_payment_billing();\n let merchant_tax_registration_id = merchant_context\n .get_merchant_account()\n .get_merchant_tax_registration_id();\n\n Box::new(types::L2L3Data {\n order_date: payment_data.payment_intent.order_date,\n tax_status: payment_data.payment_intent.tax_status,\n customer_tax_registration_id: customer.as_ref().and_then(|c| {\n c.tax_registration_id\n .as_ref()\n .map(|e| e.clone().into_inner())\n }),\n order_details: order_details.clone(),\n discount_amount: payment_data.payment_intent.discount_amount,\n shipping_cost: payment_data.payment_intent.shipping_cost,\n shipping_amount_tax: payment_data.payment_intent.shipping_amount_tax,\n duty_amount: payment_data.payment_intent.duty_amount,\n order_tax_amount: payment_data\n .payment_attempt\n .net_amount\n .get_order_tax_amount(),\n merchant_order_reference_id: payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone(),\n customer_id: payment_data.payment_intent.customer_id.clone(),\n billing_address_city: billing_address\n .as_ref()\n .and_then(|addr| addr.address.as_ref())\n .and_then(|details| details.city.clone()),\n merchant_tax_registration_id,\n customer_name: customer\n .as_ref()\n .and_then(|c| c.name.as_ref().map(|e| e.clone().into_inner())),\n customer_email: payment_data.email,\n customer_phone_number: customer\n .as_ref()\n .and_then(|c| c.phone.as_ref().map(|e| e.clone().into_inner())),\n customer_phone_country_code: customer\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n shipping_details: shipping_address\n .and_then(|address| address.address.as_ref())\n .cloned(),\n })\n });\n crate::logger::debug!(\"unified address details {:?}\", unified_address);\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n attempt_id: payment_data.payment_attempt.attempt_id.clone(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data.payment_intent.description.clone(),\n address: unified_address,\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n request: T::try_from(additional_data)?,\n response,\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.status),\n is_migrated_card: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.is_migrated_card()),\n payment_method_token: payment_data\n .pm_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token))),\n connector_customer: payment_data.connector_customer_id,\n recurring_mandate_payment_data: payment_data.recurring_mandate_payment_data,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: merchant_recipient_data.map(|data| {\n api_models::admin::AdditionalMerchantData::foreign_from(\n types::AdditionalMerchantData::OpenBankingRecipientData(data),\n )\n }),\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: payment_data.payment_intent.psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data<'a, F, T>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n merchant_recipient_data: Option,\n header_payload: Option,\n payment_method: Option,\n payment_method_type: Option,\n) -> RouterResult>\nwhere\n T: TryFrom>,\n types::RouterData: Feature,\n F: Clone,\n error_stack::Report:\n From<>>::Error>,\n{\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let payment_method = payment_data\n .payment_attempt\n .payment_method\n .or(payment_method)\n .get_required_value(\"payment_method\")?;\n\n let payment_method_type = payment_data\n .payment_attempt\n .payment_method_type\n .or(payment_method_type);\n\n let resource_id = match payment_data\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string)\n {\n Some(id) => types::ResponseId::ConnectorTransactionId(id),\n None => types::ResponseId::NoResponseId,\n };\n\n // [#44]: why should response be filled during request\n let response = Ok(types::PaymentsResponseData::TransactionResponse {\n resource_id,\n redirection_data: Box::new(None),\n mandate_reference: Box::new(None),\n connector_metadata: None,\n network_txn_id: None,\n connector_response_reference_id: None,\n incremental_authorization_allowed: None,\n charges: None,\n });\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = api_models::enums::Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let apple_pay_flow = payments::decide_apple_pay_flow(\n state,\n payment_data.payment_attempt.payment_method_type,\n Some(merchant_connector_account),\n );\n\n let unified_address = if let Some(payment_method_info) =\n payment_data.payment_method_info.clone()\n {\n let payment_method_billing = payment_method_info\n .payment_method_billing_address\n .map(|decrypted_data| decrypted_data.into_inner().expose())\n .map(|decrypted_value| decrypted_value.parse_value(\"payment_method_billing_address\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to parse payment_method_billing_address\")?;\n payment_data\n .address\n .clone()\n .unify_with_payment_data_billing(payment_method_billing)\n } else {\n payment_data.address\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n let order_details = payment_data\n .payment_intent\n .order_details\n .as_ref()\n .map(|order_details| {\n order_details\n .iter()\n .map(|data| {\n data.to_owned()\n .parse_value(\"OrderDetailsWithAmount\")\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"OrderDetailsWithAmount\",\n })\n .attach_printable(\"Unable to parse OrderDetailsWithAmount\")\n })\n .collect::, _>>()\n })\n .transpose()?;\n let l2_l3_data =\n (state.conf.l2_l3_data_config.enabled && payment_data.is_l2_l3_enabled).then(|| {\n let shipping_address = unified_address.get_shipping();\n let billing_address = unified_address.get_payment_billing();\n let merchant_tax_registration_id = merchant_context\n .get_merchant_account()\n .get_merchant_tax_registration_id();\n\n Box::new(types::L2L3Data {\n order_date: payment_data.payment_intent.order_date,\n tax_status: payment_data.payment_intent.tax_status,\n customer_tax_registration_id: customer.as_ref().and_then(|c| {\n c.tax_registration_id\n .as_ref()\n .map(|e| e.clone().into_inner())\n }),\n order_details: order_details.clone(),\n discount_amount: payment_data.payment_intent.discount_amount,\n shipping_cost: payment_data.payment_intent.shipping_cost,\n shipping_amount_tax: payment_data.payment_intent.shipping_amount_tax,\n duty_amount: payment_data.payment_intent.duty_amount,\n order_tax_amount: payment_data\n .payment_attempt\n .net_amount\n .get_order_tax_amount(),\n merchant_order_reference_id: payment_data\n .payment_intent\n .merchant_order_reference_id\n .clone(),\n customer_id: payment_data.payment_intent.customer_id.clone(),\n billing_address_city: billing_address\n .as_ref()\n .and_then(|addr| addr.address.as_ref())\n .and_then(|details| details.city.clone()),\n merchant_tax_registration_id,\n customer_name: customer\n .as_ref()\n .and_then(|c| c.name.as_ref().map(|e| e.clone().into_inner())),\n customer_email: payment_data.email,\n customer_phone_number: customer\n .as_ref()\n .and_then(|c| c.phone.as_ref().map(|e| e.clone().into_inner())),\n customer_phone_country_code: customer\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n shipping_details: shipping_address\n .and_then(|address| address.address.as_ref())\n .cloned(),\n })\n });\n crate::logger::debug!(\"unified address details {:?}\", unified_address);\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n attempt_id: payment_data.payment_attempt.attempt_id.clone(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data.payment_intent.description.clone(),\n address: unified_address,\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n request: T::try_from(additional_data)?,\n response,\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: payment_data.payment_method_info.map(|info| info.status),\n payment_method_token: payment_data\n .pm_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token))),\n connector_customer: payment_data.connector_customer_id,\n recurring_mandate_payment_data: payment_data.recurring_mandate_payment_data,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: merchant_recipient_data.map(|data| {\n api_models::admin::AdditionalMerchantData::foreign_from(\n types::AdditionalMerchantData::OpenBankingRecipientData(data),\n )\n }),\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: payment_data.payment_intent.psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " session_token: None,\n reference_id: None,\n payment_method_status: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.status),\n is_migrated_card: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.is_migrated_card()),\n payment_method_token: payment_data\n .pm_token", + "after": " session_token: None,\n reference_id: None,\n payment_method_status: payment_data.payment_method_info.map(|info| info.status),\n payment_method_token: payment_data\n .pm_token" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/authentication/transformers.rs::function::construct_router_data", + "file": "crates/router/src/core/authentication/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn construct_router_data(\n state: &SessionState,\n authentication_connector_name: String,\n payment_method: PaymentMethod,\n merchant_id: common_utils::id_type::MerchantId,\n address: types::PaymentAddress,\n request_data: Req,\n merchant_connector_account: &payments_helpers::MerchantConnectorAccountType,\n psd2_sca_exemption_type: Option,\n payment_id: common_utils::id_type::PaymentId,\n) -> RouterResult> {\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n Ok(types::RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: None,\n connector: authentication_connector_name,\n payment_id: payment_id.get_string_repr().to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address,\n auth_type: common_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: request_data,\n response: Err(types::ErrorResponse::default()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after_code": "pub fn construct_router_data(\n state: &SessionState,\n authentication_connector_name: String,\n payment_method: PaymentMethod,\n merchant_id: common_utils::id_type::MerchantId,\n address: types::PaymentAddress,\n request_data: Req,\n merchant_connector_account: &payments_helpers::MerchantConnectorAccountType,\n psd2_sca_exemption_type: Option,\n payment_id: common_utils::id_type::PaymentId,\n) -> RouterResult> {\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n Ok(types::RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: None,\n connector: authentication_connector_name,\n payment_id: payment_id.get_string_repr().to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address,\n auth_type: common_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: request_data,\n response: Err(types::ErrorResponse::default()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n })\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types.rs::impl::RouterData", + "file": "crates/router/src/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n ForeignFrom<(\n &RouterData,\n PayoutsData,\n )> for RouterData\n{\n fn foreign_from(\n item: (\n &RouterData,\n PayoutsData,\n ),\n ) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n payout_method_data: data.payout_method_data.clone(),\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n header_payload: data.header_payload.clone(),\n authentication_id: None,\n psd2_sca_exemption_type: None,\n additional_merchant_data: data.additional_merchant_data.clone(),\n connector_mandate_request_reference_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }\n}", + "after_code": "impl\n ForeignFrom<(\n &RouterData,\n PayoutsData,\n )> for RouterData\n{\n fn foreign_from(\n item: (\n &RouterData,\n PayoutsData,\n ),\n ) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n payout_method_data: data.payout_method_data.clone(),\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n header_payload: data.header_payload.clone(),\n authentication_id: None,\n psd2_sca_exemption_type: None,\n additional_merchant_data: data.additional_merchant_data.clone(),\n connector_mandate_request_reference_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_dispute_list_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_dispute_list_router_data<'a>(\n state: &'a SessionState,\n merchant_connector_account: MerchantConnectorAccount,\n req: types::FetchDisputesRequestData,\n) -> RouterResult {\n let merchant_id = merchant_connector_account.merchant_id.clone();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n Ok(types::RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account.connector_name.clone(),\n payment_id: consts::IRRELEVANT_PAYMENT_INTENT_ID.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: consts::IRRELEVANT_PAYMENT_ATTEMPT_ID.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method: common_enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata().clone(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: req,\n response: Err(ErrorResponse::default()),\n //TODO\n connector_request_reference_id:\n \"IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW\".to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after_code": "pub async fn construct_dispute_list_router_data<'a>(\n state: &'a SessionState,\n merchant_connector_account: MerchantConnectorAccount,\n req: types::FetchDisputesRequestData,\n) -> RouterResult {\n let merchant_id = merchant_connector_account.merchant_id.clone();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n Ok(types::RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n connector_customer: None,\n connector: merchant_connector_account.connector_name.clone(),\n payment_id: consts::IRRELEVANT_PAYMENT_INTENT_ID.to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: consts::IRRELEVANT_PAYMENT_ATTEMPT_ID.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method: common_enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata().clone(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: req,\n response: Err(ErrorResponse::default()),\n //TODO\n connector_request_reference_id:\n \"IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW\".to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n })\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/checkout_flow.rs::FrmData::function::construct_router_data", + "file": "crates/router/src/core/fraud_check/flows/checkout_flow.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n use crate::connector::utils::PaymentsAttemptData;\n\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let browser_info: Option = self.payment_attempt.get_browser_info().ok();\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n payment_method_status: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckCheckoutData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n browser_info,\n payment_method_data: self\n .payment_attempt\n .payment_method_data\n .as_ref()\n .map(|pm_data| {\n pm_data\n .clone()\n .parse_value::(\n \"AdditionalPaymentData\",\n )\n })\n .transpose()\n .unwrap_or_default(),\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n gateway: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }", + "after_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n use crate::connector::utils::PaymentsAttemptData;\n\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let browser_info: Option = self.payment_attempt.get_browser_info().ok();\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n payment_method_status: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckCheckoutData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n browser_info,\n payment_method_data: self\n .payment_attempt\n .payment_method_data\n .as_ref()\n .map(|pm_data| {\n pm_data\n .clone()\n .parse_value::(\n \"AdditionalPaymentData\",\n )\n })\n .transpose()\n .unwrap_or_default(),\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n gateway: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types/api/verify_connector.rs::impl::VerifyConnectorData", + "file": "crates/router/src/types/api/verify_connector.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl VerifyConnectorData {\n fn get_payment_authorize_data(&self) -> types::PaymentsAuthorizeData {\n types::PaymentsAuthorizeData {\n payment_method_data: domain::PaymentMethodData::Card(self.card_details.clone()),\n email: None,\n customer_name: None,\n amount: 1000,\n minor_amount: common_utils::types::MinorUnit::new(1000),\n confirm: true,\n order_tax_amount: None,\n currency: storage_enums::Currency::USD,\n metadata: None,\n mandate_id: None,\n webhook_url: None,\n customer_id: None,\n off_session: None,\n browser_info: None,\n session_token: None,\n order_details: None,\n order_category: None,\n capture_method: None,\n enrolled_for_3ds: false,\n router_return_url: None,\n surcharge_details: None,\n setup_future_usage: None,\n payment_experience: None,\n payment_method_type: None,\n statement_descriptor: None,\n setup_mandate_details: None,\n complete_authorize_url: None,\n related_transaction_id: None,\n statement_descriptor_suffix: None,\n request_extended_authorization: None,\n request_incremental_authorization: false,\n authentication_data: None,\n customer_acceptance: None,\n split_payments: None,\n merchant_order_reference_id: None,\n integrity_object: None,\n additional_payment_method_data: None,\n shipping_cost: None,\n merchant_account_id: None,\n merchant_config_currency: None,\n connector_testing_data: None,\n order_id: None,\n locale: None,\n payment_channel: None,\n enable_partial_authorization: None,\n enable_overcapture: None,\n is_stored_credential: None,\n mit_category: None,\n }\n }\n\n fn get_router_data(\n &self,\n state: &SessionState,\n request_data: R1,\n access_token: Option,\n ) -> types::RouterData {\n let attempt_id =\n common_utils::generate_id_with_default_len(consts::VERIFY_CONNECTOR_ID_PREFIX);\n types::RouterData {\n flow: std::marker::PhantomData,\n status: storage_enums::AttemptStatus::Started,\n request: request_data,\n response: Err(errors::ApiErrorResponse::InternalServerError.into()),\n connector: self.connector.id().to_string(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n test_mode: None,\n attempt_id: attempt_id.clone(),\n description: None,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n merchant_id: common_utils::id_type::MerchantId::default(),\n reference_id: None,\n access_token,\n session_token: None,\n payment_method: storage_enums::PaymentMethod::Card,\n payment_method_type: None,\n amount_captured: None,\n minor_amount_captured: None,\n preprocessing_id: None,\n connector_customer: None,\n connector_auth_type: self.connector_auth.clone(),\n connector_meta_data: None,\n connector_wallets_details: None,\n payment_method_token: None,\n connector_api_version: None,\n recurring_mandate_payment_data: None,\n payment_method_status: None,\n connector_request_reference_id: attempt_id,\n address: types::PaymentAddress::new(None, None, None, None),\n payment_id: common_utils::id_type::PaymentId::default()\n .get_string_repr()\n .to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }\n}", + "after_code": "impl VerifyConnectorData {\n fn get_payment_authorize_data(&self) -> types::PaymentsAuthorizeData {\n types::PaymentsAuthorizeData {\n payment_method_data: domain::PaymentMethodData::Card(self.card_details.clone()),\n email: None,\n customer_name: None,\n amount: 1000,\n minor_amount: common_utils::types::MinorUnit::new(1000),\n confirm: true,\n order_tax_amount: None,\n currency: storage_enums::Currency::USD,\n metadata: None,\n mandate_id: None,\n webhook_url: None,\n customer_id: None,\n off_session: None,\n browser_info: None,\n session_token: None,\n order_details: None,\n order_category: None,\n capture_method: None,\n enrolled_for_3ds: false,\n router_return_url: None,\n surcharge_details: None,\n setup_future_usage: None,\n payment_experience: None,\n payment_method_type: None,\n statement_descriptor: None,\n setup_mandate_details: None,\n complete_authorize_url: None,\n related_transaction_id: None,\n statement_descriptor_suffix: None,\n request_extended_authorization: None,\n request_incremental_authorization: false,\n authentication_data: None,\n customer_acceptance: None,\n split_payments: None,\n merchant_order_reference_id: None,\n integrity_object: None,\n additional_payment_method_data: None,\n shipping_cost: None,\n merchant_account_id: None,\n merchant_config_currency: None,\n connector_testing_data: None,\n order_id: None,\n locale: None,\n payment_channel: None,\n enable_partial_authorization: None,\n enable_overcapture: None,\n is_stored_credential: None,\n mit_category: None,\n }\n }\n\n fn get_router_data(\n &self,\n state: &SessionState,\n request_data: R1,\n access_token: Option,\n ) -> types::RouterData {\n let attempt_id =\n common_utils::generate_id_with_default_len(consts::VERIFY_CONNECTOR_ID_PREFIX);\n types::RouterData {\n flow: std::marker::PhantomData,\n status: storage_enums::AttemptStatus::Started,\n request: request_data,\n response: Err(errors::ApiErrorResponse::InternalServerError.into()),\n connector: self.connector.id().to_string(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n test_mode: None,\n attempt_id: attempt_id.clone(),\n description: None,\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n merchant_id: common_utils::id_type::MerchantId::default(),\n reference_id: None,\n access_token,\n session_token: None,\n payment_method: storage_enums::PaymentMethod::Card,\n payment_method_type: None,\n amount_captured: None,\n minor_amount_captured: None,\n preprocessing_id: None,\n connector_customer: None,\n connector_auth_type: self.connector_auth.clone(),\n connector_meta_data: None,\n connector_wallets_details: None,\n payment_method_token: None,\n connector_api_version: None,\n recurring_mandate_payment_data: None,\n payment_method_status: None,\n connector_request_reference_id: attempt_id,\n address: types::PaymentAddress::new(None, None, None, None),\n payment_id: common_utils::id_type::PaymentId::default()\n .get_string_repr()\n .to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_router_data_to_update_calculated_tax", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_router_data_to_update_calculated_tax<'a, F, T>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n) -> RouterResult>\nwhere\n T: TryFrom>,\n types::RouterData: Feature,\n F: Clone,\n error_stack::Report:\n From<>>::Error>,\n{\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: None,\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_data.payment_attempt.get_id().to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: payment_data.address.clone(),\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n request: T::try_from(additional_data)?,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_router_data_to_update_calculated_tax<'a, F, T>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n) -> RouterResult>\nwhere\n T: TryFrom>,\n types::RouterData: Feature,\n F: Clone,\n error_stack::Report:\n From<>>::Error>,\n{\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: None,\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_data.payment_attempt.get_id().to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: payment_data.address.clone(),\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n request: T::try_from(additional_data)?,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/tests/connectors/utils.rs::trait::ConnectorActions", + "file": "crates/router/tests/connectors/utils.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub trait ConnectorActions: Connector {\n /// For initiating payments when `CaptureMethod` is set to `Manual`\n /// This doesn't complete the transaction, `PaymentsCapture` needs to be done manually\n async fn authorize_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsAuthorizeData {\n confirm: true,\n capture_method: Some(diesel_models::enums::CaptureMethod::Manual),\n ..(payment_data.unwrap_or(PaymentAuthorizeType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn create_connector_customer(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration: BoxedConnectorIntegrationInterface<_, PaymentFlowData, _, _> =\n self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::ConnectorCustomerData {\n ..(payment_data.unwrap_or(CustomerType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn create_connector_pm_token(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentMethodTokenizationData {\n ..(payment_data.unwrap_or(TokenType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// For initiating payments when `CaptureMethod` is set to `Automatic`\n /// This does complete the transaction without user intervention to Capture the payment\n async fn make_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsAuthorizeData {\n confirm: true,\n capture_method: Some(diesel_models::enums::CaptureMethod::Automatic),\n ..(payment_data.unwrap_or(PaymentAuthorizeType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn sync_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n payment_data.unwrap_or_else(|| PaymentSyncType::default().0),\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// will retry the psync till the given status matches or retry max 3 times\n async fn psync_retry_till_status_matches(\n &self,\n status: enums::AttemptStatus,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let max_tries = 3;\n for curr_try in 0..max_tries {\n let sync_res = self\n .sync_payment(payment_data.clone(), payment_info.clone())\n .await\n .unwrap();\n if (sync_res.status == status) || (curr_try == max_tries - 1) {\n return Ok(sync_res);\n }\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await;\n }\n Err(ConnectorError::ProcessingStepFailed(None).into())\n }\n\n async fn capture_payment(\n &self,\n transaction_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsCaptureData {\n connector_transaction_id: transaction_id,\n ..payment_data.unwrap_or(PaymentCaptureType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn authorize_and_capture_payment(\n &self,\n authorize_data: Option,\n capture_data: Option,\n payment_info: Option,\n ) -> Result> {\n let authorize_response = self\n .authorize_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Authorized);\n let txn_id = get_connector_transaction_id(authorize_response.response);\n let response = self\n .capture_payment(txn_id.unwrap(), capture_data, payment_info)\n .await\n .unwrap();\n return Ok(response);\n }\n\n async fn void_payment(\n &self,\n transaction_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsCancelData {\n connector_transaction_id: transaction_id,\n ..payment_data.unwrap_or(PaymentCancelType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn authorize_and_void_payment(\n &self,\n authorize_data: Option,\n void_data: Option,\n payment_info: Option,\n ) -> Result> {\n let authorize_response = self\n .authorize_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Authorized);\n let txn_id = get_connector_transaction_id(authorize_response.response);\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n let response = self\n .void_payment(txn_id.unwrap(), void_data, payment_info)\n .await\n .unwrap();\n return Ok(response);\n }\n\n async fn refund_payment(\n &self,\n transaction_id: String,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::RefundsData {\n connector_transaction_id: transaction_id,\n ..refund_data.unwrap_or(PaymentRefundType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn capture_payment_and_refund(\n &self,\n authorize_data: Option,\n capture_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .authorize_and_capture_payment(authorize_data, capture_data, payment_info.clone())\n .await\n .unwrap();\n let txn_id = self.get_connector_transaction_id_from_capture_data(response);\n\n //try refund for previous payment\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(txn_id.unwrap(), refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn make_payment_and_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .make_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(transaction_id, refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn auth_capture_and_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .authorize_and_capture_payment(authorize_data, None, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(transaction_id, refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn make_payment_and_multiple_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) {\n //make a successful payment\n let response = self\n .make_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n for _x in 0..2 {\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n let refund_response = self\n .refund_payment(\n transaction_id.clone(),\n refund_data.clone(),\n payment_info.clone(),\n )\n .await\n .unwrap();\n assert_eq!(\n refund_response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n }\n }\n\n async fn sync_refund(\n &self,\n refund_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n payment_data.unwrap_or_else(|| types::RefundsData {\n payment_amount: 1000,\n minor_payment_amount: MinorUnit::new(1000),\n currency: enums::Currency::USD,\n refund_id: uuid::Uuid::new_v4().to_string(),\n connector_transaction_id: \"\".to_string(),\n webhook_url: None,\n refund_amount: 100,\n minor_refund_amount: MinorUnit::new(100),\n connector_metadata: None,\n refund_connector_metadata: None,\n reason: None,\n connector_refund_id: Some(refund_id),\n browser_info: None,\n split_refunds: None,\n integrity_object: None,\n refund_status: enums::RefundStatus::Pending,\n merchant_account_id: None,\n merchant_config_currency: None,\n capture_method: None,\n additional_payment_method_data: None,\n }),\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// will retry the rsync till the given status matches or retry max 3 times\n async fn rsync_retry_till_status_matches(\n &self,\n status: enums::RefundStatus,\n refund_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let max_tries = 3;\n for curr_try in 0..max_tries {\n let sync_res = self\n .sync_refund(\n refund_id.clone(),\n payment_data.clone(),\n payment_info.clone(),\n )\n .await\n .unwrap();\n if (sync_res.clone().response.unwrap().refund_status == status)\n || (curr_try == max_tries - 1)\n {\n return Ok(sync_res);\n }\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await;\n }\n Err(ConnectorError::ProcessingStepFailed(None).into())\n }\n\n #[cfg(feature = \"payouts\")]\n fn get_payout_request(\n &self,\n connector_payout_id: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> RouterData {\n self.generate_data(\n types::PayoutsData {\n payout_id: common_utils::id_type::PayoutId::generate(),\n amount: 1,\n minor_amount: MinorUnit::new(1),\n connector_payout_id,\n destination_currency: payment_info.to_owned().map_or(enums::Currency::EUR, |pi| {\n pi.currency.map_or(enums::Currency::EUR, |c| c)\n }),\n source_currency: payment_info.to_owned().map_or(enums::Currency::EUR, |pi| {\n pi.currency.map_or(enums::Currency::EUR, |c| c)\n }),\n entity_type: enums::PayoutEntityType::Individual,\n payout_type: Some(payout_type),\n customer_details: Some(payments::CustomerDetails {\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n name: Some(Secret::new(\"John Doe\".to_string())),\n email: Email::from_str(\"john.doe@example\").ok(),\n phone: Some(Secret::new(\"620874518\".to_string())),\n phone_country_code: Some(\"+31\".to_string()),\n tax_registration_id: Some(\"1232343243\".to_string().into()),\n }),\n vendor_details: None,\n priority: None,\n connector_transfer_method_id: None,\n webhook_url: None,\n browser_info: None,\n payout_connector_metadata: None,\n },\n payment_info,\n )\n }\n\n fn generate_data, Res>(\n &self,\n req: Req,\n info: Option,\n ) -> RouterData {\n let merchant_id =\n common_utils::id_type::MerchantId::try_from(std::borrow::Cow::from(self.get_name()))\n .unwrap();\n\n RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n connector: self.get_name(),\n tenant_id: common_utils::id_type::TenantId::try_from_string(\"public\".to_string())\n .unwrap(),\n payment_id: uuid::Uuid::new_v4().to_string(),\n attempt_id: uuid::Uuid::new_v4().to_string(),\n status: enums::AttemptStatus::default(),\n auth_type: info\n .clone()\n .map_or(enums::AuthenticationType::NoThreeDs, |a| {\n a.auth_type\n .map_or(enums::AuthenticationType::NoThreeDs, |a| a)\n }),\n payment_method: enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: self.get_auth_token(),\n description: Some(\"This is a test\".to_string()),\n payment_method_status: None,\n request: req,\n response: Err(types::ErrorResponse::default()),\n address: info\n .clone()\n .and_then(|a| a.address)\n .or_else(|| Some(PaymentAddress::default()))\n .unwrap(),\n connector_meta_data: info\n .clone()\n .and_then(|a| a.connector_meta_data.map(Secret::new)),\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: info.clone().and_then(|a| a.access_token),\n session_token: None,\n reference_id: None,\n payment_method_token: info.clone().and_then(|a| {\n a.payment_method_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token)))\n }),\n connector_customer: info.clone().and_then(|a| a.connector_customer),\n recurring_mandate_payment_data: None,\n\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: info.and_then(|p| p.payout_method_data),\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n apple_pay_flow: None,\n external_latency: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }\n\n fn get_connector_transaction_id_from_capture_data(\n &self,\n response: types::PaymentsCaptureRouterData,\n ) -> Option {\n match response.response {\n Ok(types::PaymentsResponseData::TransactionResponse { resource_id, .. }) => {\n resource_id.get_connector_transaction_id().ok()\n }\n Ok(types::PaymentsResponseData::SessionResponse { .. }) => None,\n Ok(types::PaymentsResponseData::SessionTokenResponse { .. }) => None,\n Ok(types::PaymentsResponseData::TokenizationResponse { .. }) => None,\n Ok(types::PaymentsResponseData::TransactionUnresolvedResponse { .. }) => None,\n Ok(types::PaymentsResponseData::ConnectorCustomerResponse(..)) => None,\n Ok(types::PaymentsResponseData::PreProcessingResponse { .. }) => None,\n Ok(types::PaymentsResponseData::ThreeDSEnrollmentResponse { .. }) => None,\n Ok(types::PaymentsResponseData::MultipleCaptureResponse { .. }) => None,\n Ok(types::PaymentsResponseData::IncrementalAuthorizationResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PostProcessingResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PaymentResourceUpdateResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PaymentsCreateOrderResponse { .. }) => None,\n Err(_) => None,\n }\n }\n\n #[cfg(feature = \"payouts\")]\n async fn verify_payout_eligibility(\n &self,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoEligibility,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(None, payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn fulfill_payout(\n &self,\n connector_payout_id: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoFulfill,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(connector_payout_id, payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoCreate,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let mut request = self.get_payout_request(None, payout_type, payment_info);\n request.connector_customer = connector_customer;\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn cancel_payout(\n &self,\n connector_payout_id: String,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoCancel,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(Some(connector_payout_id), payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_and_fulfill_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let create_res = self\n .create_payout(connector_customer, payout_type, payment_info.to_owned())\n .await?;\n assert_eq!(\n create_res.status.unwrap(),\n enums::PayoutStatus::RequiresFulfillment\n );\n let fulfill_res = self\n .fulfill_payout(\n create_res.connector_payout_id,\n payout_type,\n payment_info.to_owned(),\n )\n .await?;\n Ok(fulfill_res)\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_and_cancel_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let create_res = self\n .create_payout(connector_customer, payout_type, payment_info.to_owned())\n .await?;\n assert_eq!(\n create_res.status.unwrap(),\n enums::PayoutStatus::RequiresFulfillment\n );\n let cancel_res = self\n .cancel_payout(\n create_res\n .connector_payout_id\n .ok_or(ConnectorError::MissingRequiredField {\n field_name: \"connector_payout_id\",\n })?,\n payout_type,\n payment_info.to_owned(),\n )\n .await?;\n Ok(cancel_res)\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_payout_recipient(\n &self,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoRecipient,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(None, payout_type, payment_info);\n let tx = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n}", + "after_code": "pub trait ConnectorActions: Connector {\n /// For initiating payments when `CaptureMethod` is set to `Manual`\n /// This doesn't complete the transaction, `PaymentsCapture` needs to be done manually\n async fn authorize_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsAuthorizeData {\n confirm: true,\n capture_method: Some(diesel_models::enums::CaptureMethod::Manual),\n ..(payment_data.unwrap_or(PaymentAuthorizeType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn create_connector_customer(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration: BoxedConnectorIntegrationInterface<_, PaymentFlowData, _, _> =\n self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::ConnectorCustomerData {\n ..(payment_data.unwrap_or(CustomerType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn create_connector_pm_token(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentMethodTokenizationData {\n ..(payment_data.unwrap_or(TokenType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// For initiating payments when `CaptureMethod` is set to `Automatic`\n /// This does complete the transaction without user intervention to Capture the payment\n async fn make_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsAuthorizeData {\n confirm: true,\n capture_method: Some(diesel_models::enums::CaptureMethod::Automatic),\n ..(payment_data.unwrap_or(PaymentAuthorizeType::default().0))\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn sync_payment(\n &self,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n payment_data.unwrap_or_else(|| PaymentSyncType::default().0),\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// will retry the psync till the given status matches or retry max 3 times\n async fn psync_retry_till_status_matches(\n &self,\n status: enums::AttemptStatus,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let max_tries = 3;\n for curr_try in 0..max_tries {\n let sync_res = self\n .sync_payment(payment_data.clone(), payment_info.clone())\n .await\n .unwrap();\n if (sync_res.status == status) || (curr_try == max_tries - 1) {\n return Ok(sync_res);\n }\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await;\n }\n Err(ConnectorError::ProcessingStepFailed(None).into())\n }\n\n async fn capture_payment(\n &self,\n transaction_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsCaptureData {\n connector_transaction_id: transaction_id,\n ..payment_data.unwrap_or(PaymentCaptureType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn authorize_and_capture_payment(\n &self,\n authorize_data: Option,\n capture_data: Option,\n payment_info: Option,\n ) -> Result> {\n let authorize_response = self\n .authorize_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Authorized);\n let txn_id = get_connector_transaction_id(authorize_response.response);\n let response = self\n .capture_payment(txn_id.unwrap(), capture_data, payment_info)\n .await\n .unwrap();\n return Ok(response);\n }\n\n async fn void_payment(\n &self,\n transaction_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::PaymentsCancelData {\n connector_transaction_id: transaction_id,\n ..payment_data.unwrap_or(PaymentCancelType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn authorize_and_void_payment(\n &self,\n authorize_data: Option,\n void_data: Option,\n payment_info: Option,\n ) -> Result> {\n let authorize_response = self\n .authorize_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n assert_eq!(authorize_response.status, enums::AttemptStatus::Authorized);\n let txn_id = get_connector_transaction_id(authorize_response.response);\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n let response = self\n .void_payment(txn_id.unwrap(), void_data, payment_info)\n .await\n .unwrap();\n return Ok(response);\n }\n\n async fn refund_payment(\n &self,\n transaction_id: String,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n types::RefundsData {\n connector_transaction_id: transaction_id,\n ..refund_data.unwrap_or(PaymentRefundType::default().0)\n },\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n async fn capture_payment_and_refund(\n &self,\n authorize_data: Option,\n capture_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .authorize_and_capture_payment(authorize_data, capture_data, payment_info.clone())\n .await\n .unwrap();\n let txn_id = self.get_connector_transaction_id_from_capture_data(response);\n\n //try refund for previous payment\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(txn_id.unwrap(), refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn make_payment_and_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .make_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(transaction_id, refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn auth_capture_and_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) -> Result> {\n //make a successful payment\n let response = self\n .authorize_and_capture_payment(authorize_data, None, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n Ok(self\n .refund_payment(transaction_id, refund_data, payment_info)\n .await\n .unwrap())\n }\n\n async fn make_payment_and_multiple_refund(\n &self,\n authorize_data: Option,\n refund_data: Option,\n payment_info: Option,\n ) {\n //make a successful payment\n let response = self\n .make_payment(authorize_data, payment_info.clone())\n .await\n .unwrap();\n\n //try refund for previous payment\n let transaction_id = get_connector_transaction_id(response.response).unwrap();\n for _x in 0..2 {\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await; // to avoid 404 error\n let refund_response = self\n .refund_payment(\n transaction_id.clone(),\n refund_data.clone(),\n payment_info.clone(),\n )\n .await\n .unwrap();\n assert_eq!(\n refund_response.response.unwrap().refund_status,\n enums::RefundStatus::Success,\n );\n }\n }\n\n async fn sync_refund(\n &self,\n refund_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let integration = self.get_data().connector.get_connector_integration();\n let request = self.generate_data(\n payment_data.unwrap_or_else(|| types::RefundsData {\n payment_amount: 1000,\n minor_payment_amount: MinorUnit::new(1000),\n currency: enums::Currency::USD,\n refund_id: uuid::Uuid::new_v4().to_string(),\n connector_transaction_id: \"\".to_string(),\n webhook_url: None,\n refund_amount: 100,\n minor_refund_amount: MinorUnit::new(100),\n connector_metadata: None,\n refund_connector_metadata: None,\n reason: None,\n connector_refund_id: Some(refund_id),\n browser_info: None,\n split_refunds: None,\n integrity_object: None,\n refund_status: enums::RefundStatus::Pending,\n merchant_account_id: None,\n merchant_config_currency: None,\n capture_method: None,\n additional_payment_method_data: None,\n }),\n payment_info,\n );\n Box::pin(call_connector(request, integration)).await\n }\n\n /// will retry the rsync till the given status matches or retry max 3 times\n async fn rsync_retry_till_status_matches(\n &self,\n status: enums::RefundStatus,\n refund_id: String,\n payment_data: Option,\n payment_info: Option,\n ) -> Result> {\n let max_tries = 3;\n for curr_try in 0..max_tries {\n let sync_res = self\n .sync_refund(\n refund_id.clone(),\n payment_data.clone(),\n payment_info.clone(),\n )\n .await\n .unwrap();\n if (sync_res.clone().response.unwrap().refund_status == status)\n || (curr_try == max_tries - 1)\n {\n return Ok(sync_res);\n }\n tokio::time::sleep(Duration::from_secs(self.get_request_interval())).await;\n }\n Err(ConnectorError::ProcessingStepFailed(None).into())\n }\n\n #[cfg(feature = \"payouts\")]\n fn get_payout_request(\n &self,\n connector_payout_id: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> RouterData {\n self.generate_data(\n types::PayoutsData {\n payout_id: common_utils::id_type::PayoutId::generate(),\n amount: 1,\n minor_amount: MinorUnit::new(1),\n connector_payout_id,\n destination_currency: payment_info.to_owned().map_or(enums::Currency::EUR, |pi| {\n pi.currency.map_or(enums::Currency::EUR, |c| c)\n }),\n source_currency: payment_info.to_owned().map_or(enums::Currency::EUR, |pi| {\n pi.currency.map_or(enums::Currency::EUR, |c| c)\n }),\n entity_type: enums::PayoutEntityType::Individual,\n payout_type: Some(payout_type),\n customer_details: Some(payments::CustomerDetails {\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n name: Some(Secret::new(\"John Doe\".to_string())),\n email: Email::from_str(\"john.doe@example\").ok(),\n phone: Some(Secret::new(\"620874518\".to_string())),\n phone_country_code: Some(\"+31\".to_string()),\n tax_registration_id: Some(\"1232343243\".to_string().into()),\n }),\n vendor_details: None,\n priority: None,\n connector_transfer_method_id: None,\n webhook_url: None,\n browser_info: None,\n payout_connector_metadata: None,\n },\n payment_info,\n )\n }\n\n fn generate_data, Res>(\n &self,\n req: Req,\n info: Option,\n ) -> RouterData {\n let merchant_id =\n common_utils::id_type::MerchantId::try_from(std::borrow::Cow::from(self.get_name()))\n .unwrap();\n\n RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n connector: self.get_name(),\n tenant_id: common_utils::id_type::TenantId::try_from_string(\"public\".to_string())\n .unwrap(),\n payment_id: uuid::Uuid::new_v4().to_string(),\n attempt_id: uuid::Uuid::new_v4().to_string(),\n status: enums::AttemptStatus::default(),\n auth_type: info\n .clone()\n .map_or(enums::AuthenticationType::NoThreeDs, |a| {\n a.auth_type\n .map_or(enums::AuthenticationType::NoThreeDs, |a| a)\n }),\n payment_method: enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: self.get_auth_token(),\n description: Some(\"This is a test\".to_string()),\n payment_method_status: None,\n request: req,\n response: Err(types::ErrorResponse::default()),\n address: info\n .clone()\n .and_then(|a| a.address)\n .or_else(|| Some(PaymentAddress::default()))\n .unwrap(),\n connector_meta_data: info\n .clone()\n .and_then(|a| a.connector_meta_data.map(Secret::new)),\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: info.clone().and_then(|a| a.access_token),\n session_token: None,\n reference_id: None,\n payment_method_token: info.clone().and_then(|a| {\n a.payment_method_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token)))\n }),\n connector_customer: info.clone().and_then(|a| a.connector_customer),\n recurring_mandate_payment_data: None,\n\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: info.and_then(|p| p.payout_method_data),\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n apple_pay_flow: None,\n external_latency: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }\n\n fn get_connector_transaction_id_from_capture_data(\n &self,\n response: types::PaymentsCaptureRouterData,\n ) -> Option {\n match response.response {\n Ok(types::PaymentsResponseData::TransactionResponse { resource_id, .. }) => {\n resource_id.get_connector_transaction_id().ok()\n }\n Ok(types::PaymentsResponseData::SessionResponse { .. }) => None,\n Ok(types::PaymentsResponseData::SessionTokenResponse { .. }) => None,\n Ok(types::PaymentsResponseData::TokenizationResponse { .. }) => None,\n Ok(types::PaymentsResponseData::TransactionUnresolvedResponse { .. }) => None,\n Ok(types::PaymentsResponseData::ConnectorCustomerResponse(..)) => None,\n Ok(types::PaymentsResponseData::PreProcessingResponse { .. }) => None,\n Ok(types::PaymentsResponseData::ThreeDSEnrollmentResponse { .. }) => None,\n Ok(types::PaymentsResponseData::MultipleCaptureResponse { .. }) => None,\n Ok(types::PaymentsResponseData::IncrementalAuthorizationResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PostProcessingResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PaymentResourceUpdateResponse { .. }) => None,\n Ok(types::PaymentsResponseData::PaymentsCreateOrderResponse { .. }) => None,\n Err(_) => None,\n }\n }\n\n #[cfg(feature = \"payouts\")]\n async fn verify_payout_eligibility(\n &self,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoEligibility,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(None, payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn fulfill_payout(\n &self,\n connector_payout_id: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoFulfill,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(connector_payout_id, payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoCreate,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let mut request = self.get_payout_request(None, payout_type, payment_info);\n request.connector_customer = connector_customer;\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn cancel_payout(\n &self,\n connector_payout_id: String,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoCancel,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(Some(connector_payout_id), payout_type, payment_info);\n let tx: oneshot::Sender<()> = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_and_fulfill_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let create_res = self\n .create_payout(connector_customer, payout_type, payment_info.to_owned())\n .await?;\n assert_eq!(\n create_res.status.unwrap(),\n enums::PayoutStatus::RequiresFulfillment\n );\n let fulfill_res = self\n .fulfill_payout(\n create_res.connector_payout_id,\n payout_type,\n payment_info.to_owned(),\n )\n .await?;\n Ok(fulfill_res)\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_and_cancel_payout(\n &self,\n connector_customer: Option,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let create_res = self\n .create_payout(connector_customer, payout_type, payment_info.to_owned())\n .await?;\n assert_eq!(\n create_res.status.unwrap(),\n enums::PayoutStatus::RequiresFulfillment\n );\n let cancel_res = self\n .cancel_payout(\n create_res\n .connector_payout_id\n .ok_or(ConnectorError::MissingRequiredField {\n field_name: \"connector_payout_id\",\n })?,\n payout_type,\n payment_info.to_owned(),\n )\n .await?;\n Ok(cancel_res)\n }\n\n #[cfg(feature = \"payouts\")]\n async fn create_payout_recipient(\n &self,\n payout_type: enums::PayoutType,\n payment_info: Option,\n ) -> Result> {\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n types::api::PoRecipient,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = self\n .get_payout_data()\n .ok_or(ConnectorError::FailedToObtainPreferredConnector)?\n .connector\n .get_connector_integration();\n let request = self.get_payout_request(None, payout_type, payment_info);\n let tx = oneshot::channel().0;\n\n let app_state = Box::pin(routes::AppState::with_storage(\n Settings::new().unwrap(),\n StorageImpl::PostgresqlTest,\n tx,\n Box::new(services::MockApiClient),\n ))\n .await;\n let state = Arc::new(app_state)\n .get_session_state(\n &common_utils::id_type::TenantId::try_from_string(\"public\".to_string()).unwrap(),\n None,\n || {},\n )\n .unwrap();\n let res = services::api::execute_connector_processing_step(\n &state,\n connector_integration,\n &request,\n payments::CallConnectorAction::Trigger,\n None,\n None,\n )\n .await?;\n Ok(res.response.unwrap())\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_defend_dispute_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_defend_dispute_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let _db = &*state.store;\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::DefendDisputeRequestData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::get_not_implemented()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n customer_id: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_defend_dispute_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let _db = &*state.store;\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::DefendDisputeRequestData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::get_not_implemented()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n customer_id: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types.rs::RouterData::function::foreign_from", + "file": "crates/router/src/types.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_from(\n item: (\n &RouterData,\n PayoutsData,\n ),\n ) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n payout_method_data: data.payout_method_data.clone(),\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n header_payload: data.header_payload.clone(),\n authentication_id: None,\n psd2_sca_exemption_type: None,\n additional_merchant_data: data.additional_merchant_data.clone(),\n connector_mandate_request_reference_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after_code": "fn foreign_from(\n item: (\n &RouterData,\n PayoutsData,\n ),\n ) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n payout_method_data: data.payout_method_data.clone(),\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n header_payload: data.header_payload.clone(),\n authentication_id: None,\n psd2_sca_exemption_type: None,\n additional_merchant_data: data.additional_merchant_data.clone(),\n connector_mandate_request_reference_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/webhooks/utils.rs::function::construct_webhook_router_data", + "file": "crates/router/src/core/webhooks/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_webhook_router_data(\n state: &SessionState,\n connector_name: &str,\n merchant_connector_account: domain::MerchantConnectorAccount,\n merchant_context: &domain::MerchantContext,\n connector_wh_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n request_details: &api::IncomingWebhookRequestDetails<'_>,\n) -> CustomResult {\n let auth_type: types::ConnectorAuthType =\n helpers::MerchantConnectorAccountType::DbVal(Box::new(merchant_connector_account.clone()))\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_name.to_string(),\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"source_verification_flow\")\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_SOURCE_VERIFICATION_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: types::VerifyWebhookSourceRequestData {\n webhook_headers: request_details.headers.clone(),\n webhook_body: request_details.body.to_vec().clone(),\n merchant_secret: connector_wh_secrets.to_owned(),\n },\n response: Err(types::ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_SOURCE_VERIFICATION_FLOW.to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_webhook_router_data(\n state: &SessionState,\n connector_name: &str,\n merchant_connector_account: domain::MerchantConnectorAccount,\n merchant_context: &domain::MerchantContext,\n connector_wh_secrets: &api_models::webhooks::ConnectorWebhookSecrets,\n request_details: &api::IncomingWebhookRequestDetails<'_>,\n) -> CustomResult {\n let auth_type: types::ConnectorAuthType =\n helpers::MerchantConnectorAccountType::DbVal(Box::new(merchant_connector_account.clone()))\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_name.to_string(),\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"source_verification_flow\")\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_SOURCE_VERIFICATION_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: types::VerifyWebhookSourceRequestData {\n webhook_headers: request_details.headers.clone(),\n webhook_body: request_details.body.to_vec().clone(),\n merchant_secret: connector_wh_secrets.to_owned(),\n },\n response: Err(types::ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_SOURCE_VERIFICATION_FLOW.to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n payment_method_status: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/tests/connectors/utils.rs::ConnectorActions::function::generate_data", + "file": "crates/router/tests/connectors/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn generate_data, Res>(\n &self,\n req: Req,\n info: Option,\n ) -> RouterData {\n let merchant_id =\n common_utils::id_type::MerchantId::try_from(std::borrow::Cow::from(self.get_name()))\n .unwrap();\n\n RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n connector: self.get_name(),\n tenant_id: common_utils::id_type::TenantId::try_from_string(\"public\".to_string())\n .unwrap(),\n payment_id: uuid::Uuid::new_v4().to_string(),\n attempt_id: uuid::Uuid::new_v4().to_string(),\n status: enums::AttemptStatus::default(),\n auth_type: info\n .clone()\n .map_or(enums::AuthenticationType::NoThreeDs, |a| {\n a.auth_type\n .map_or(enums::AuthenticationType::NoThreeDs, |a| a)\n }),\n payment_method: enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: self.get_auth_token(),\n description: Some(\"This is a test\".to_string()),\n payment_method_status: None,\n request: req,\n response: Err(types::ErrorResponse::default()),\n address: info\n .clone()\n .and_then(|a| a.address)\n .or_else(|| Some(PaymentAddress::default()))\n .unwrap(),\n connector_meta_data: info\n .clone()\n .and_then(|a| a.connector_meta_data.map(Secret::new)),\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: info.clone().and_then(|a| a.access_token),\n session_token: None,\n reference_id: None,\n payment_method_token: info.clone().and_then(|a| {\n a.payment_method_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token)))\n }),\n connector_customer: info.clone().and_then(|a| a.connector_customer),\n recurring_mandate_payment_data: None,\n\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: info.and_then(|p| p.payout_method_data),\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n apple_pay_flow: None,\n external_latency: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after_code": "fn generate_data, Res>(\n &self,\n req: Req,\n info: Option,\n ) -> RouterData {\n let merchant_id =\n common_utils::id_type::MerchantId::try_from(std::borrow::Cow::from(self.get_name()))\n .unwrap();\n\n RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: Some(common_utils::generate_customer_id_of_default_length()),\n connector: self.get_name(),\n tenant_id: common_utils::id_type::TenantId::try_from_string(\"public\".to_string())\n .unwrap(),\n payment_id: uuid::Uuid::new_v4().to_string(),\n attempt_id: uuid::Uuid::new_v4().to_string(),\n status: enums::AttemptStatus::default(),\n auth_type: info\n .clone()\n .map_or(enums::AuthenticationType::NoThreeDs, |a| {\n a.auth_type\n .map_or(enums::AuthenticationType::NoThreeDs, |a| a)\n }),\n payment_method: enums::PaymentMethod::Card,\n payment_method_type: None,\n connector_auth_type: self.get_auth_token(),\n description: Some(\"This is a test\".to_string()),\n payment_method_status: None,\n request: req,\n response: Err(types::ErrorResponse::default()),\n address: info\n .clone()\n .and_then(|a| a.address)\n .or_else(|| Some(PaymentAddress::default()))\n .unwrap(),\n connector_meta_data: info\n .clone()\n .and_then(|a| a.connector_meta_data.map(Secret::new)),\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: info.clone().and_then(|a| a.access_token),\n session_token: None,\n reference_id: None,\n payment_method_token: info.clone().and_then(|a| {\n a.payment_method_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token)))\n }),\n connector_customer: info.clone().and_then(|a| a.connector_customer),\n recurring_mandate_payment_data: None,\n\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: info.and_then(|p| p.payout_method_data),\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n apple_pay_flow: None,\n external_latency: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n psd2_sca_exemption_type: None,\n authentication_id: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n }\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/relay/utils.rs::function::construct_relay_refund_router_data", + "file": "crates/router/src/core/relay/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_relay_refund_router_data(\n state: &SessionState,\n merchant_id: &id_type::MerchantId,\n connector_account: &domain::MerchantConnectorAccount,\n relay_record: &hyperswitch_domain_models::relay::Relay,\n) -> RouterResult> {\n let connector_auth_type = connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n #[cfg(feature = \"v2\")]\n let connector_name = &connector_account.connector_name.to_string();\n\n #[cfg(feature = \"v1\")]\n let connector_name = &connector_account.connector_name;\n\n let webhook_url = Some(payments::helpers::create_webhook_url(\n &state.base_url.clone(),\n merchant_id,\n connector_account.get_id().get_string_repr(),\n ));\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n\n let connector_enum = api_models::enums::Connector::from_str(connector_name)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_name}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let hyperswitch_domain_models::relay::RelayData::Refund(relay_refund_data) = relay_record\n .request_data\n .clone()\n .get_required_value(\"refund relay data\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to obtain relay data to construct relay refund data\")?;\n\n let relay_id_string = relay_record.id.get_string_repr().to_string();\n\n let router_data = hyperswitch_domain_models::router_data::RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_id.clone(),\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_name.to_string(),\n payment_id: IRRELEVANT_PAYMENT_INTENT_ID.to_string(),\n attempt_id: IRRELEVANT_PAYMENT_ATTEMPT_ID.to_string(),\n status: common_enums::AttemptStatus::Charged,\n payment_method: common_enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type,\n description: None,\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: connector_account.metadata.clone(),\n connector_wallets_details: None,\n amount_captured: None,\n payment_method_status: None,\n minor_amount_captured: None,\n request: hyperswitch_domain_models::router_request_types::RefundsData {\n refund_id: relay_id_string.clone(),\n connector_transaction_id: relay_record.connector_resource_id.clone(),\n refund_amount: relay_refund_data.amount.get_amount_as_i64(),\n minor_refund_amount: relay_refund_data.amount,\n currency: relay_refund_data.currency,\n payment_amount: relay_refund_data.amount.get_amount_as_i64(),\n minor_payment_amount: relay_refund_data.amount,\n webhook_url,\n connector_metadata: None,\n refund_connector_metadata: None,\n reason: relay_refund_data.reason,\n connector_refund_id: relay_record.connector_reference_id.clone(),\n browser_info: None,\n split_refunds: None,\n integrity_object: None,\n refund_status: common_enums::RefundStatus::from(relay_record.status),\n merchant_account_id: None,\n merchant_config_currency: None,\n capture_method: None,\n additional_payment_method_data: None,\n },\n\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: relay_id_string.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: connector_account.get_connector_test_mode(),\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: Some(relay_id_string),\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_relay_refund_router_data(\n state: &SessionState,\n merchant_id: &id_type::MerchantId,\n connector_account: &domain::MerchantConnectorAccount,\n relay_record: &hyperswitch_domain_models::relay::Relay,\n) -> RouterResult> {\n let connector_auth_type = connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n #[cfg(feature = \"v2\")]\n let connector_name = &connector_account.connector_name.to_string();\n\n #[cfg(feature = \"v1\")]\n let connector_name = &connector_account.connector_name;\n\n let webhook_url = Some(payments::helpers::create_webhook_url(\n &state.base_url.clone(),\n merchant_id,\n connector_account.get_id().get_string_repr(),\n ));\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n\n let connector_enum = api_models::enums::Connector::from_str(connector_name)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_name:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_name}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let hyperswitch_domain_models::relay::RelayData::Refund(relay_refund_data) = relay_record\n .request_data\n .clone()\n .get_required_value(\"refund relay data\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to obtain relay data to construct relay refund data\")?;\n\n let relay_id_string = relay_record.id.get_string_repr().to_string();\n\n let router_data = hyperswitch_domain_models::router_data::RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_id.clone(),\n customer_id: None,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_name.to_string(),\n payment_id: IRRELEVANT_PAYMENT_INTENT_ID.to_string(),\n attempt_id: IRRELEVANT_PAYMENT_ATTEMPT_ID.to_string(),\n status: common_enums::AttemptStatus::Charged,\n payment_method: common_enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type,\n description: None,\n address: hyperswitch_domain_models::payment_address::PaymentAddress::default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: connector_account.metadata.clone(),\n connector_wallets_details: None,\n amount_captured: None,\n payment_method_status: None,\n minor_amount_captured: None,\n request: hyperswitch_domain_models::router_request_types::RefundsData {\n refund_id: relay_id_string.clone(),\n connector_transaction_id: relay_record.connector_resource_id.clone(),\n refund_amount: relay_refund_data.amount.get_amount_as_i64(),\n minor_refund_amount: relay_refund_data.amount,\n currency: relay_refund_data.currency,\n payment_amount: relay_refund_data.amount.get_amount_as_i64(),\n minor_payment_amount: relay_refund_data.amount,\n webhook_url,\n connector_metadata: None,\n refund_connector_metadata: None,\n reason: relay_refund_data.reason,\n connector_refund_id: relay_record.connector_reference_id.clone(),\n browser_info: None,\n split_refunds: None,\n integrity_object: None,\n refund_status: common_enums::RefundStatus::from(relay_record.status),\n merchant_account_id: None,\n merchant_config_currency: None,\n capture_method: None,\n additional_payment_method_data: None,\n },\n\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n connector_request_reference_id: relay_id_string.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: connector_account.get_connector_test_mode(),\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: Some(relay_id_string),\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_dispute_sync_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_dispute_sync_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let _db = &*state.store;\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::DisputeSyncData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::get_not_implemented()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n customer_id: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_dispute_sync_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n dispute: &storage::Dispute,\n) -> RouterResult {\n let _db = &*state.store;\n let connector_id = &dispute.connector;\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::DisputeSyncData {\n dispute_id: dispute.dispute_id.clone(),\n connector_dispute_id: dispute.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::get_not_implemented()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n customer_id: None,\n connector_customer: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: Some(dispute.dispute_id.clone()),\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/checkout_flow.rs::impl::FrmData", + "file": "crates/router/src/core/fraud_check/flows/checkout_flow.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult>\n {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n use crate::connector::utils::PaymentsAttemptData;\n\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let browser_info: Option = self.payment_attempt.get_browser_info().ok();\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n payment_method_status: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckCheckoutData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n browser_info,\n payment_method_data: self\n .payment_attempt\n .payment_method_data\n .as_ref()\n .map(|pm_data| {\n pm_data\n .clone()\n .parse_value::(\n \"AdditionalPaymentData\",\n )\n })\n .transpose()\n .unwrap_or_default(),\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n gateway: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }\n}", + "after_code": "impl ConstructFlowSpecificData\n for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult>\n {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult>\n {\n use crate::connector::utils::PaymentsAttemptData;\n\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let browser_info: Option = self.payment_attempt.get_browser_info().ok();\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n payment_method_status: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckCheckoutData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n browser_info,\n payment_method_data: self\n .payment_attempt\n .payment_method_data\n .as_ref()\n .map(|pm_data| {\n pm_data\n .clone()\n .parse_value::(\n \"AdditionalPaymentData\",\n )\n })\n .transpose()\n .unwrap_or_default(),\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n gateway: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/sale_flow.rs::FrmData::function::construct_router_data", + "file": "crates/router/src/core/fraud_check/flows/sale_flow.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult> {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckSaleData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n },\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }", + "after_code": "async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult> {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckSaleData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency: self.payment_attempt.currency,\n email: customer\n .clone()\n .and_then(|customer_data| {\n customer_data\n .email\n .map(|email| Email::try_from(email.into_inner().expose()))\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"customer.customer_data.email\",\n })?,\n },\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n payment_method_status: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/types.rs::impl::RouterData", + "file": "crates/router/src/types.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ForeignFrom<(&RouterData, T2)>\n for RouterData\n{\n fn foreign_from(item: (&RouterData, T2)) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data\n .connector_mandate_request_reference_id\n .clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n }\n}", + "after_code": "impl ForeignFrom<(&RouterData, T2)>\n for RouterData\n{\n fn foreign_from(item: (&RouterData, T2)) -> Self {\n let data = item.0;\n let request = item.1;\n Self {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data\n .connector_mandate_request_reference_id\n .clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n }\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n }", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_authorize", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data_for_authorize<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentConfirmData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let connector_customer_id =\n payment_data.get_connector_customer_id(customer.as_ref(), merchant_connector_account);\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let router_base_url = &state.base_url;\n let attempt = &payment_data.payment_attempt;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_id,\n None,\n ));\n\n let webhook_url = match merchant_connector_account {\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n merchant_connector_account,\n ) => Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n merchant_connector_account.get_id().get_string_repr(),\n )),\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n payment_data.webhook_url\n }\n };\n\n let router_return_url = payment_data\n .payment_intent\n .create_finish_redirection_url(\n router_base_url,\n merchant_context\n .get_merchant_account()\n .publishable_key\n .as_ref(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to construct finish redirection url\")?\n .to_string();\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from);\n\n let browser_info = payment_data\n .payment_attempt\n .browser_info\n .clone()\n .map(types::BrowserInformation::from);\n let additional_payment_method_data: Option =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n\n let connector_metadata = payment_data.payment_intent.connector_metadata.clone();\n\n let order_category = connector_metadata.as_ref().and_then(|cm| {\n cm.noon\n .as_ref()\n .and_then(|noon| noon.order_category.clone())\n });\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::PaymentsAuthorizeData {\n payment_method_data: payment_data\n .payment_method_data\n .get_required_value(\"payment_method_data\")?,\n setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n mandate_id: payment_data.mandate_data.clone(),\n off_session: None,\n setup_mandate_details: None,\n confirm: true,\n statement_descriptor_suffix: None,\n statement_descriptor: None,\n capture_method: Some(payment_data.payment_intent.capture_method),\n amount: payment_data\n .payment_attempt\n .amount_details\n .get_net_amount()\n .get_amount_as_i64(),\n minor_amount: payment_data.payment_attempt.amount_details.get_net_amount(),\n order_tax_amount: None,\n currency: payment_data.payment_intent.amount_details.currency,\n browser_info,\n email,\n customer_name: None,\n payment_experience: None,\n order_details: None,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n router_return_url: Some(router_return_url),\n webhook_url,\n complete_authorize_url,\n customer_id: customer_id.clone(),\n surcharge_details: None,\n request_extended_authorization: None,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n RequestIncrementalAuthorization::True\n ),\n metadata: payment_data.payment_intent.metadata.expose_option(),\n authentication_data: None,\n customer_acceptance: None,\n split_payments: None,\n merchant_order_reference_id: payment_data\n .payment_intent\n .merchant_reference_id\n .map(|reference_id| reference_id.get_string_repr().to_owned()),\n integrity_object: None,\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n additional_payment_method_data,\n merchant_account_id: None,\n merchant_config_currency: None,\n connector_testing_data: None,\n order_id: None,\n locale: None,\n mit_category: None,\n payment_channel: None,\n enable_partial_authorization: payment_data.payment_intent.enable_partial_authorization,\n enable_overcapture: None,\n is_stored_credential: None,\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: payment_data.payment_address.clone(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: connector_customer_id,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data_for_authorize<'a>(\n state: &'a SessionState,\n payment_data: hyperswitch_domain_models::payments::PaymentConfirmData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult {\n use masking::ExposeOptionInterface;\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let auth_type = merchant_connector_account\n .get_connector_account_details()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n // TODO: Take Globalid and convert to connector reference id\n let customer_id = customer\n .to_owned()\n .map(|customer| common_utils::id_type::CustomerId::try_from(customer.id.clone()))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\n \"Invalid global customer generated, not able to convert to reference id\",\n )?;\n\n let connector_customer_id =\n payment_data.get_connector_customer_id(customer.as_ref(), merchant_connector_account);\n\n let payment_method = payment_data.payment_attempt.payment_method_type;\n\n let router_base_url = &state.base_url;\n let attempt = &payment_data.payment_attempt;\n\n let complete_authorize_url = Some(helpers::create_complete_authorize_url(\n router_base_url,\n attempt,\n connector_id,\n None,\n ));\n\n let webhook_url = match merchant_connector_account {\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorAccount(\n merchant_connector_account,\n ) => Some(helpers::create_webhook_url(\n router_base_url,\n &attempt.merchant_id,\n merchant_connector_account.get_id().get_string_repr(),\n )),\n domain::MerchantConnectorAccountTypeDetails::MerchantConnectorDetails(_) => {\n payment_data.webhook_url\n }\n };\n\n let router_return_url = payment_data\n .payment_intent\n .create_finish_redirection_url(\n router_base_url,\n merchant_context\n .get_merchant_account()\n .publishable_key\n .as_ref(),\n )\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Unable to construct finish redirection url\")?\n .to_string();\n\n let connector_request_reference_id = payment_data\n .payment_attempt\n .connector_request_reference_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"connector_request_reference_id not found in payment_attempt\")?;\n\n let email = customer\n .as_ref()\n .and_then(|customer| customer.email.clone())\n .map(pii::Email::from);\n\n let browser_info = payment_data\n .payment_attempt\n .browser_info\n .clone()\n .map(types::BrowserInformation::from);\n let additional_payment_method_data: Option =\n payment_data.payment_attempt\n .payment_method_data\n .as_ref().map(|data| data.clone().parse_value(\"AdditionalPaymentData\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse AdditionalPaymentData from payment_data.payment_attempt.payment_method_data\")?;\n\n let connector_metadata = payment_data.payment_intent.connector_metadata.clone();\n\n let order_category = connector_metadata.as_ref().and_then(|cm| {\n cm.noon\n .as_ref()\n .and_then(|noon| noon.order_category.clone())\n });\n\n // TODO: few fields are repeated in both routerdata and request\n let request = types::PaymentsAuthorizeData {\n payment_method_data: payment_data\n .payment_method_data\n .get_required_value(\"payment_method_data\")?,\n setup_future_usage: Some(payment_data.payment_intent.setup_future_usage),\n mandate_id: payment_data.mandate_data.clone(),\n off_session: None,\n setup_mandate_details: None,\n confirm: true,\n statement_descriptor_suffix: None,\n statement_descriptor: None,\n capture_method: Some(payment_data.payment_intent.capture_method),\n amount: payment_data\n .payment_attempt\n .amount_details\n .get_net_amount()\n .get_amount_as_i64(),\n minor_amount: payment_data.payment_attempt.amount_details.get_net_amount(),\n order_tax_amount: None,\n currency: payment_data.payment_intent.amount_details.currency,\n browser_info,\n email,\n customer_name: None,\n payment_experience: None,\n order_details: None,\n order_category,\n session_token: None,\n enrolled_for_3ds: true,\n related_transaction_id: None,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n router_return_url: Some(router_return_url),\n webhook_url,\n complete_authorize_url,\n customer_id: customer_id.clone(),\n surcharge_details: None,\n request_extended_authorization: None,\n request_incremental_authorization: matches!(\n payment_data\n .payment_intent\n .request_incremental_authorization,\n RequestIncrementalAuthorization::True\n ),\n metadata: payment_data.payment_intent.metadata.expose_option(),\n authentication_data: None,\n customer_acceptance: None,\n split_payments: None,\n merchant_order_reference_id: payment_data\n .payment_intent\n .merchant_reference_id\n .map(|reference_id| reference_id.get_string_repr().to_owned()),\n integrity_object: None,\n shipping_cost: payment_data.payment_intent.amount_details.shipping_cost,\n additional_payment_method_data,\n merchant_account_id: None,\n merchant_config_currency: None,\n connector_testing_data: None,\n order_id: None,\n locale: None,\n mit_category: None,\n payment_channel: None,\n enable_partial_authorization: payment_data.payment_intent.enable_partial_authorization,\n enable_overcapture: None,\n is_stored_credential: None,\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_token_details\n .as_ref()\n .and_then(|detail| detail.get_connector_token_request_reference_id());\n\n // TODO: evaluate the fields in router data, if they are required or not\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n // TODO: evaluate why we need customer id at the connector level. We already have connector customer id.\n customer_id,\n connector: connector_id.to_owned(),\n // TODO: evaluate why we need payment id at the connector level. We already have connector reference id\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n // TODO: evaluate why we need attempt id at the connector level. We already have connector reference id\n attempt_id: payment_data\n .payment_attempt\n .get_id()\n .get_string_repr()\n .to_owned(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: Some(payment_data.payment_attempt.payment_method_subtype),\n connector_auth_type: auth_type,\n description: payment_data\n .payment_intent\n .description\n .as_ref()\n .map(|description| description.get_string_repr())\n .map(ToOwned::to_owned),\n // TODO: Create unified address\n address: payment_data.payment_address.clone(),\n auth_type: payment_data.payment_attempt.authentication_type,\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: None,\n request,\n response: Err(hyperswitch_domain_models::router_data::ErrorResponse::default()),\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: None,\n payment_method_token: None,\n connector_customer: connector_customer_id,\n recurring_mandate_payment_data: None,\n // TODO: This has to be generated as the reference id based on the connector configuration\n // Some connectros might not accept accept the global id. This has to be done when generating the reference id\n connector_request_reference_id,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n // TODO: take this based on the env\n test_mode: Some(true),\n payment_method_balance: None,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/payments/transformers.rs::function::construct_payment_router_data_for_update_metadata", + "file": "crates/router/src/core/payments/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_payment_router_data_for_update_metadata<'a>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult<\n types::RouterData<\n api::UpdateMetadata,\n types::PaymentsUpdateMetadataData,\n types::PaymentsResponseData,\n >,\n> {\n let (payment_method, router_data);\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n payment_method = payment_data\n .payment_attempt\n .payment_method\n .or(payment_data.payment_attempt.payment_method)\n .get_required_value(\"payment_method_type\")?;\n\n // [#44]: why should response be filled during request\n let response = Err(hyperswitch_domain_models::router_data::ErrorResponse {\n code: \"IR_20\".to_string(),\n message: \"Update metadata is not implemented for this connector\".to_string(),\n reason: None,\n status_code: http::StatusCode::BAD_REQUEST.as_u16(),\n attempt_status: None,\n connector_transaction_id: None,\n network_decline_code: None,\n network_advice_code: None,\n network_error_message: None,\n connector_metadata: None,\n });\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = api_models::enums::Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let apple_pay_flow = payments::decide_apple_pay_flow(\n state,\n payment_data.payment_attempt.payment_method_type,\n Some(merchant_connector_account),\n );\n\n let unified_address = if let Some(payment_method_info) =\n payment_data.payment_method_info.clone()\n {\n let payment_method_billing = payment_method_info\n .payment_method_billing_address\n .map(|decrypted_data| decrypted_data.into_inner().expose())\n .map(|decrypted_value| decrypted_value.parse_value(\"payment_method_billing_address\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to parse payment_method_billing_address\")?;\n payment_data\n .address\n .clone()\n .unify_with_payment_data_billing(payment_method_billing)\n } else {\n payment_data.address\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n\n crate::logger::debug!(\"unified address details {:?}\", unified_address);\n\n router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n attempt_id: payment_data.payment_attempt.attempt_id.clone(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data.payment_intent.description.clone(),\n address: unified_address,\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n request: types::PaymentsUpdateMetadataData::try_from(additional_data)?,\n response,\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.status),\n is_migrated_card: None,\n payment_method_token: payment_data\n .pm_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token))),\n connector_customer: payment_data.connector_customer_id,\n recurring_mandate_payment_data: payment_data.recurring_mandate_payment_data,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: merchant_recipient_data.map(|data| {\n api_models::admin::AdditionalMerchantData::foreign_from(\n types::AdditionalMerchantData::OpenBankingRecipientData(data),\n )\n }),\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: payment_data.payment_intent.psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_payment_router_data_for_update_metadata<'a>(\n state: &'a SessionState,\n payment_data: PaymentData,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &'a Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n merchant_recipient_data: Option,\n header_payload: Option,\n) -> RouterResult<\n types::RouterData<\n api::UpdateMetadata,\n types::PaymentsUpdateMetadataData,\n types::PaymentsResponseData,\n >,\n> {\n let (payment_method, router_data);\n\n fp_utils::when(merchant_connector_account.is_disabled(), || {\n Err(errors::ApiErrorResponse::MerchantConnectorAccountDisabled)\n })?;\n\n let test_mode = merchant_connector_account.is_test_mode_on();\n\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed while parsing value for ConnectorAuthType\")?;\n\n payment_method = payment_data\n .payment_attempt\n .payment_method\n .or(payment_data.payment_attempt.payment_method)\n .get_required_value(\"payment_method_type\")?;\n\n // [#44]: why should response be filled during request\n let response = Err(hyperswitch_domain_models::router_data::ErrorResponse {\n code: \"IR_20\".to_string(),\n message: \"Update metadata is not implemented for this connector\".to_string(),\n reason: None,\n status_code: http::StatusCode::BAD_REQUEST.as_u16(),\n attempt_status: None,\n connector_transaction_id: None,\n network_decline_code: None,\n network_advice_code: None,\n network_error_message: None,\n connector_metadata: None,\n });\n\n let additional_data = PaymentAdditionalData {\n router_base_url: state.base_url.clone(),\n connector_name: connector_id.to_string(),\n payment_data: payment_data.clone(),\n state,\n customer_data: customer,\n };\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let supported_connector = &state\n .conf\n .multiple_api_version_supported_connectors\n .supported_connectors;\n let connector_enum = api_models::enums::Connector::from_str(connector_id)\n .change_context(errors::ConnectorError::InvalidConnectorName)\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"connector\",\n })\n .attach_printable_lazy(|| format!(\"unable to parse connector name {connector_id:?}\"))?;\n\n let connector_api_version = if supported_connector.contains(&connector_enum) {\n state\n .store\n .find_config_by_key(&format!(\"connector_api_version_{connector_id}\"))\n .await\n .map(|value| value.config)\n .ok()\n } else {\n None\n };\n\n let apple_pay_flow = payments::decide_apple_pay_flow(\n state,\n payment_data.payment_attempt.payment_method_type,\n Some(merchant_connector_account),\n );\n\n let unified_address = if let Some(payment_method_info) =\n payment_data.payment_method_info.clone()\n {\n let payment_method_billing = payment_method_info\n .payment_method_billing_address\n .map(|decrypted_data| decrypted_data.into_inner().expose())\n .map(|decrypted_value| decrypted_value.parse_value(\"payment_method_billing_address\"))\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to parse payment_method_billing_address\")?;\n payment_data\n .address\n .clone()\n .unify_with_payment_data_billing(payment_method_billing)\n } else {\n payment_data.address\n };\n let connector_mandate_request_reference_id = payment_data\n .payment_attempt\n .connector_mandate_detail\n .as_ref()\n .and_then(|detail| detail.get_connector_mandate_request_reference_id());\n\n crate::logger::debug!(\"unified address details {:?}\", unified_address);\n\n router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id,\n tenant_id: state.tenant.tenant_id.clone(),\n connector: connector_id.to_owned(),\n payment_id: payment_data\n .payment_attempt\n .payment_id\n .get_string_repr()\n .to_owned(),\n attempt_id: payment_data.payment_attempt.attempt_id.clone(),\n status: payment_data.payment_attempt.status,\n payment_method,\n payment_method_type: payment_data.payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: payment_data.payment_intent.description.clone(),\n address: unified_address,\n auth_type: payment_data\n .payment_attempt\n .authentication_type\n .unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n request: types::PaymentsUpdateMetadataData::try_from(additional_data)?,\n response,\n amount_captured: payment_data\n .payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_data.payment_intent.amount_captured,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_status: payment_data.payment_method_info.map(|info| info.status),\n payment_method_token: payment_data\n .pm_token\n .map(|token| types::PaymentMethodToken::Token(Secret::new(token))),\n connector_customer: payment_data.connector_customer_id,\n recurring_mandate_payment_data: payment_data.recurring_mandate_payment_data,\n connector_request_reference_id: core_utils::get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n &payment_data.payment_intent,\n &payment_data.payment_attempt,\n connector_id,\n )?,\n preprocessing_id: payment_data.payment_attempt.preprocessing_step_id,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n payment_method_balance: None,\n connector_api_version,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: merchant_recipient_data.map(|data| {\n api_models::admin::AdditionalMerchantData::foreign_from(\n types::AdditionalMerchantData::OpenBankingRecipientData(data),\n )\n }),\n header_payload,\n connector_mandate_request_reference_id,\n authentication_id: None,\n psd2_sca_exemption_type: payment_data.payment_intent.psd2_sca_exemption_type,\n raw_connector_response: None,\n is_payment_id_from_merchant: payment_data.payment_intent.is_payment_id_from_merchant,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " session_token: None,\n reference_id: None,\n payment_method_status: payment_data\n .payment_method_info\n .as_ref()\n .map(|info| info.status),\n is_migrated_card: None,\n payment_method_token: payment_data\n .pm_token", + "after": " session_token: None,\n reference_id: None,\n payment_method_status: payment_data.payment_method_info.map(|info| info.status),\n payment_method_token: payment_data\n .pm_token" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_retrieve_file_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_retrieve_file_router_data<'a>(\n state: &'a SessionState,\n merchant_context: &domain::MerchantContext,\n file_metadata: &diesel_models::file::FileMetadata,\n dispute: Option,\n connector_id: &str,\n) -> RouterResult {\n let profile_id = file_metadata\n .profile_id\n .as_ref()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"profile_id\",\n })\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in file_metadata\")?;\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n profile_id,\n connector_id,\n file_metadata.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id: None,\n connector_customer: None,\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"dispute\")\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_DISPUTE_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n payment_method_status: None,\n request: types::RetrieveFileRequestData {\n provider_file_id: file_metadata\n .provider_file_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Missing provider file id\")?,\n connector_dispute_id: dispute.map(|dispute_data| dispute_data.connector_dispute_id),\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_DISPUTE_FLOW\n .to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_retrieve_file_router_data<'a>(\n state: &'a SessionState,\n merchant_context: &domain::MerchantContext,\n file_metadata: &diesel_models::file::FileMetadata,\n dispute: Option,\n connector_id: &str,\n) -> RouterResult {\n let profile_id = file_metadata\n .profile_id\n .as_ref()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"profile_id\",\n })\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in file_metadata\")?;\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n profile_id,\n connector_id,\n file_metadata.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id: None,\n connector_customer: None,\n payment_id: common_utils::id_type::PaymentId::get_irrelevant_id(\"dispute\")\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_DISPUTE_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n payment_method_status: None,\n request: types::RetrieveFileRequestData {\n provider_file_id: file_metadata\n .provider_file_id\n .clone()\n .ok_or(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Missing provider file id\")?,\n connector_dispute_id: dispute.map(|dispute_data| dispute_data.connector_dispute_id),\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_DISPUTE_FLOW\n .to_string(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_connectors/src/utils.rs::function::convert_payment_authorize_router_response", + "file": "crates/hyperswitch_connectors/src/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub(crate) fn convert_payment_authorize_router_response(\n item: (&ConnectorRouterData, T2),\n) -> ConnectorRouterData {\n let data = item.0;\n let request = item.1;\n ConnectorRouterData {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data.connector_mandate_request_reference_id.clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n}", + "after_code": "pub(crate) fn convert_payment_authorize_router_response(\n item: (&ConnectorRouterData, T2),\n) -> ConnectorRouterData {\n let data = item.0;\n let request = item.1;\n ConnectorRouterData {\n flow: PhantomData,\n request,\n merchant_id: data.merchant_id.clone(),\n connector: data.connector.clone(),\n attempt_id: data.attempt_id.clone(),\n tenant_id: data.tenant_id.clone(),\n status: data.status,\n payment_method: data.payment_method,\n payment_method_type: data.payment_method_type,\n connector_auth_type: data.connector_auth_type.clone(),\n description: data.description.clone(),\n address: data.address.clone(),\n auth_type: data.auth_type,\n connector_meta_data: data.connector_meta_data.clone(),\n connector_wallets_details: data.connector_wallets_details.clone(),\n amount_captured: data.amount_captured,\n minor_amount_captured: data.minor_amount_captured,\n access_token: data.access_token.clone(),\n response: data.response.clone(),\n payment_id: data.payment_id.clone(),\n session_token: data.session_token.clone(),\n reference_id: data.reference_id.clone(),\n customer_id: data.customer_id.clone(),\n payment_method_token: None,\n preprocessing_id: None,\n connector_customer: data.connector_customer.clone(),\n recurring_mandate_payment_data: data.recurring_mandate_payment_data.clone(),\n connector_request_reference_id: data.connector_request_reference_id.clone(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: data.payout_method_data.clone(),\n #[cfg(feature = \"payouts\")]\n quote_id: data.quote_id.clone(),\n test_mode: data.test_mode,\n payment_method_status: None,\n payment_method_balance: data.payment_method_balance.clone(),\n connector_api_version: data.connector_api_version.clone(),\n connector_http_status_code: data.connector_http_status_code,\n external_latency: data.external_latency,\n apple_pay_flow: data.apple_pay_flow.clone(),\n frm_metadata: data.frm_metadata.clone(),\n dispute_id: data.dispute_id.clone(),\n refund_id: data.refund_id.clone(),\n connector_response: data.connector_response.clone(),\n integrity_check: Ok(()),\n additional_merchant_data: data.additional_merchant_data.clone(),\n header_payload: data.header_payload.clone(),\n connector_mandate_request_reference_id: data.connector_mandate_request_reference_id.clone(),\n authentication_id: data.authentication_id.clone(),\n psd2_sca_exemption_type: data.psd2_sca_exemption_type,\n raw_connector_response: data.raw_connector_response.clone(),\n is_payment_id_from_merchant: data.is_payment_id_from_merchant,\n l2_l3_data: data.l2_l3_data.clone(),\n minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: data.minor_amount_capturable,\n authorized_amount: data.authorized_amount,\n is_migrated_card: data.is_migrated_card,\n }\n}", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::impl::AdyenPaymentRequest<'_>", + "file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}", + "after_code": "impl\n TryFrom<(\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n )> for AdyenPaymentRequest<'_>\n{\n type Error = Error;\n fn try_from(\n value: (\n &AdyenRouterData<&PaymentsAuthorizeRouterData>,\n &NetworkTokenData,\n ),\n ) -> Result {\n let (item, token_data) = value;\n let amount = get_amount_data(item);\n let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;\n let billing_address =\n get_address_info(item.router_data.get_optional_billing()).transpose()?;\n let country_code = get_country_code(item.router_data.get_optional_billing());\n let additional_data = get_additional_data(item.router_data);\n let return_url = item.router_data.request.get_router_return_url()?;\n let testing_data = item\n .router_data\n .request\n .get_connector_testing_data()\n .map(AdyenTestingData::try_from)\n .transpose()?;\n let test_holder_name = testing_data.and_then(|test_data| test_data.holder_name);\n let card_holder_name =\n test_holder_name.or(item.router_data.get_optional_billing_full_name());\n let payment_method = PaymentMethod::AdyenPaymentMethod(Box::new(\n AdyenPaymentMethod::try_from((token_data, card_holder_name))?,\n ));\n\n let shopper_email = item.router_data.request.email.clone();\n let shopper_name = get_shopper_name(item.router_data.get_optional_billing());\n let mpi_data = AdyenMpiData {\n directory_response: \"Y\".to_string(),\n authentication_response: \"Y\".to_string(),\n cavv: None,\n token_authentication_verification_value: Some(\n token_data.get_cryptogram().clone().unwrap_or_default(),\n ),\n eci: Some(\"02\".to_string()),\n };\n let (store, splits) = match item.router_data.request.split_payments.as_ref() {\n Some(common_types::payments::SplitPaymentsRequest::AdyenSplitPayment(\n adyen_split_payment,\n )) => get_adyen_split_request(adyen_split_payment, item.router_data.request.currency),\n _ => (None, None),\n };\n let device_fingerprint = item\n .router_data\n .request\n .metadata\n .clone()\n .and_then(get_device_fingerprint);\n\n let delivery_address =\n get_address_info(item.router_data.get_optional_shipping()).and_then(Result::ok);\n let telephone_number = item.router_data.get_optional_billing_phone_number();\n\n Ok(AdyenPaymentRequest {\n amount,\n merchant_account: auth_type.merchant_account,\n payment_method,\n reference: item.router_data.connector_request_reference_id.clone(),\n return_url,\n shopper_interaction,\n recurring_processing_model,\n browser_info,\n additional_data,\n telephone_number,\n shopper_name,\n shopper_email,\n shopper_locale: item.router_data.request.locale.clone(),\n social_security_number: None,\n billing_address,\n delivery_address,\n country_code,\n line_items: None,\n shopper_reference,\n store_payment_method,\n channel: None,\n shopper_statement: item.router_data.request.statement_descriptor.clone(),\n shopper_ip: item.router_data.request.get_ip_address_as_optional(),\n merchant_order_reference: item.router_data.request.merchant_order_reference_id.clone(),\n mpi_data: Some(mpi_data),\n store,\n splits,\n device_fingerprint,\n session_validity: None,\n metadata: item.router_data.request.metadata.clone(),\n })\n }\n}", + "diff_span": { + "before": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let (recurring_processing_model, store_payment_method, shopper_reference) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;", + "after": " let auth_type = AdyenAuthType::try_from(&item.router_data.connector_auth_type)?;\n let shopper_interaction = AdyenShopperInteraction::from(item.router_data);\n let shopper_reference = build_shopper_reference(item.router_data);\n let (recurring_processing_model, store_payment_method, _) =\n get_recurring_processing_model(item.router_data)?;\n let browser_info = get_browser_info(item.router_data)?;" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/unified_authentication_service/utils.rs::function::construct_uas_router_data", + "file": "crates/router/src/core/unified_authentication_service/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn construct_uas_router_data(\n state: &SessionState,\n authentication_connector_name: String,\n payment_method: PaymentMethod,\n merchant_id: common_utils::id_type::MerchantId,\n address: Option,\n request_data: Req,\n merchant_connector_account: &payments::helpers::MerchantConnectorAccountType,\n authentication_id: Option,\n payment_id: Option,\n) -> RouterResult> {\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while parsing ConnectorAuthType\")?;\n Ok(RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n connector_customer: None,\n connector: authentication_connector_name,\n payment_id: payment_id\n .map(|id| id.get_string_repr().to_owned())\n .unwrap_or_default(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: address.unwrap_or_default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata().clone(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: request_data,\n response: Err(ErrorResponse::default()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after_code": "pub fn construct_uas_router_data(\n state: &SessionState,\n authentication_connector_name: String,\n payment_method: PaymentMethod,\n merchant_id: common_utils::id_type::MerchantId,\n address: Option,\n request_data: Req,\n merchant_connector_account: &payments::helpers::MerchantConnectorAccountType,\n authentication_id: Option,\n payment_id: Option,\n) -> RouterResult> {\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error while parsing ConnectorAuthType\")?;\n Ok(RouterData {\n flow: PhantomData,\n merchant_id,\n customer_id: None,\n connector_customer: None,\n connector: authentication_connector_name,\n payment_id: payment_id\n .map(|id| id.get_string_repr().to_owned())\n .unwrap_or_default(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n status: common_enums::AttemptStatus::default(),\n payment_method,\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: address.unwrap_or_default(),\n auth_type: common_enums::AuthenticationType::default(),\n connector_meta_data: merchant_connector_account.get_metadata().clone(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n request: request_data,\n response: Err(ErrorResponse::default()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_AUTHENTICATION_FLOW.to_owned(),\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n dispute_id: None,\n refund_id: None,\n payment_method_status: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n })\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n })\n}", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/mandate/utils.rs::function::construct_mandate_revoke_router_data", + "file": "crates/router/src/core/mandate/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_mandate_revoke_router_data(\n state: &SessionState,\n merchant_connector_account: helpers::MerchantConnectorAccountType,\n merchant_context: &domain::MerchantContext,\n mandate: Mandate,\n) -> CustomResult {\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: Some(mandate.customer_id),\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: None,\n connector: mandate.connector,\n payment_id: mandate\n .original_payment_id\n .unwrap_or_else(|| {\n common_utils::id_type::PaymentId::get_irrelevant_id(\"mandate_revoke\")\n })\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_MANDATE_REVOKE_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n payment_method_status: None,\n request: types::MandateRevokeRequestData {\n mandate_id: mandate.mandate_id,\n connector_mandate_id: mandate.connector_mandate_id,\n },\n response: Err(types::ErrorResponse::get_not_implemented()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_MANDATE_REVOKE_FLOW.to_string(),\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n}", + "after_code": "pub async fn construct_mandate_revoke_router_data(\n state: &SessionState,\n merchant_connector_account: helpers::MerchantConnectorAccountType,\n merchant_context: &domain::MerchantContext,\n mandate: Mandate,\n) -> CustomResult {\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n customer_id: Some(mandate.customer_id),\n tenant_id: state.tenant.tenant_id.clone(),\n connector_customer: None,\n connector: mandate.connector,\n payment_id: mandate\n .original_payment_id\n .unwrap_or_else(|| {\n common_utils::id_type::PaymentId::get_irrelevant_id(\"mandate_revoke\")\n })\n .get_string_repr()\n .to_owned(),\n attempt_id: IRRELEVANT_ATTEMPT_ID_IN_MANDATE_REVOKE_FLOW.to_string(),\n status: diesel_models::enums::AttemptStatus::default(),\n payment_method: diesel_models::enums::PaymentMethod::default(),\n payment_method_type: None,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: diesel_models::enums::AuthenticationType::default(),\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_api_version: None,\n payment_method_status: None,\n request: types::MandateRevokeRequestData {\n mandate_id: mandate.mandate_id,\n connector_mandate_id: mandate.connector_mandate_id,\n },\n response: Err(types::ErrorResponse::get_not_implemented()),\n connector_request_reference_id:\n IRRELEVANT_CONNECTOR_REQUEST_REFERENCE_ID_IN_MANDATE_REVOKE_FLOW.to_string(),\n test_mode: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/fraud_check/flows/transaction_flow.rs::impl::FrmData", + "file": "crates/router/src/core/fraud_check/flows/transaction_flow.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl\n ConstructFlowSpecificData<\n frm_api::Transaction,\n FraudCheckTransactionData,\n FraudCheckResponseData,\n > for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult<\n RouterData,\n > {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult<\n RouterData,\n > {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let payment_method = self.payment_attempt.payment_method;\n let currency = self.payment_attempt.currency;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckTransactionData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency,\n payment_method,\n error_code: self.payment_attempt.error_code.clone(),\n error_message: self.payment_attempt.error_message.clone(),\n connector_transaction_id: self\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string),\n connector: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n payment_method_status: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n\n Ok(router_data)\n }\n}", + "after_code": "impl\n ConstructFlowSpecificData<\n frm_api::Transaction,\n FraudCheckTransactionData,\n FraudCheckResponseData,\n > for FrmData\n{\n #[cfg(feature = \"v2\")]\n async fn construct_router_data<'a>(\n &self,\n _state: &SessionState,\n _connector_id: &str,\n _merchant_context: &domain::MerchantContext,\n _customer: &Option,\n _merchant_connector_account: &domain::MerchantConnectorAccountTypeDetails,\n _merchant_recipient_data: Option,\n _header_payload: Option,\n ) -> RouterResult<\n RouterData,\n > {\n todo!()\n }\n\n #[cfg(feature = \"v1\")]\n async fn construct_router_data<'a>(\n &self,\n state: &SessionState,\n connector_id: &str,\n merchant_context: &domain::MerchantContext,\n customer: &Option,\n merchant_connector_account: &helpers::MerchantConnectorAccountType,\n _merchant_recipient_data: Option,\n header_payload: Option,\n _payment_method: Option,\n _payment_method_type: Option,\n ) -> RouterResult<\n RouterData,\n > {\n let status = storage_enums::AttemptStatus::Pending;\n\n let auth_type: ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::MerchantConnectorAccountNotFound {\n id: \"ConnectorAuthType\".to_string(),\n })?;\n\n let customer_id = customer.to_owned().map(|customer| customer.customer_id);\n\n let payment_method = self.payment_attempt.payment_method;\n let currency = self.payment_attempt.currency;\n\n let router_data = RouterData {\n flow: std::marker::PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n tenant_id: state.tenant.tenant_id.clone(),\n customer_id,\n connector: connector_id.to_string(),\n payment_id: self.payment_intent.payment_id.get_string_repr().to_owned(),\n attempt_id: self.payment_attempt.attempt_id.clone(),\n status,\n payment_method: self\n .payment_attempt\n .payment_method\n .ok_or(errors::ApiErrorResponse::PaymentMethodNotFound)?,\n payment_method_type: self.payment_attempt.payment_method_type,\n\n connector_auth_type: auth_type,\n description: None,\n address: self.address.clone(),\n auth_type: storage_enums::AuthenticationType::NoThreeDs,\n connector_meta_data: None,\n connector_wallets_details: None,\n amount_captured: None,\n minor_amount_captured: None,\n request: FraudCheckTransactionData {\n amount: self\n .payment_attempt\n .net_amount\n .get_total_amount()\n .get_amount_as_i64(),\n order_details: self.order_details.clone(),\n currency,\n payment_method,\n error_code: self.payment_attempt.error_code.clone(),\n error_message: self.payment_attempt.error_message.clone(),\n connector_transaction_id: self\n .payment_attempt\n .get_connector_payment_id()\n .map(ToString::to_string),\n connector: self.payment_attempt.connector.clone(),\n }, // self.order_details\n response: Ok(FraudCheckResponseData::TransactionResponse {\n resource_id: ResponseId::ConnectorTransactionId(\"\".to_string()),\n connector_metadata: None,\n status: storage_enums::FraudCheckStatus::Pending,\n score: None,\n reason: None,\n }),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n preprocessing_id: None,\n connector_request_reference_id: uuid::Uuid::new_v4().to_string(),\n test_mode: None,\n recurring_mandate_payment_data: None,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n payment_method_balance: None,\n connector_http_status_code: None,\n external_latency: None,\n connector_api_version: None,\n payment_method_status: None,\n apple_pay_flow: None,\n frm_metadata: self.frm_metadata.clone(),\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n\n Ok(router_data)\n }\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/router/src/core/utils.rs::function::construct_upload_file_router_data", + "file": "crates/router/src/core/utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn construct_upload_file_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n create_file_request: &api::CreateFileRequest,\n dispute_data: storage::Dispute,\n connector_id: &str,\n file_key: String,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::UploadFileRequestData {\n file_key,\n file: create_file_request.file.clone(),\n file_type: create_file_request.file_type.clone(),\n file_size: create_file_request.file_size,\n dispute_id: dispute_data.dispute_id.clone(),\n connector_dispute_id: dispute_data.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)\n}", + "after_code": "pub async fn construct_upload_file_router_data<'a>(\n state: &'a SessionState,\n payment_intent: &'a storage::PaymentIntent,\n payment_attempt: &storage::PaymentAttempt,\n merchant_context: &domain::MerchantContext,\n create_file_request: &api::CreateFileRequest,\n dispute_data: storage::Dispute,\n connector_id: &str,\n file_key: String,\n) -> RouterResult {\n let profile_id = payment_intent\n .profile_id\n .as_ref()\n .get_required_value(\"profile_id\")\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"profile_id is not set in payment_intent\")?\n .clone();\n\n let merchant_connector_account = helpers::get_merchant_connector_account(\n state,\n merchant_context.get_merchant_account().get_id(),\n None,\n merchant_context.get_merchant_key_store(),\n &profile_id,\n connector_id,\n payment_attempt.merchant_connector_id.as_ref(),\n )\n .await?;\n\n let test_mode: Option = merchant_connector_account.is_test_mode_on();\n let auth_type: types::ConnectorAuthType = merchant_connector_account\n .get_connector_account_details()\n .parse_value(\"ConnectorAuthType\")\n .change_context(errors::ApiErrorResponse::InternalServerError)?;\n let payment_method = payment_attempt\n .payment_method\n .get_required_value(\"payment_method_type\")?;\n\n let router_data = types::RouterData {\n flow: PhantomData,\n merchant_id: merchant_context.get_merchant_account().get_id().clone(),\n connector: connector_id.to_string(),\n payment_id: payment_attempt.payment_id.get_string_repr().to_owned(),\n tenant_id: state.tenant.tenant_id.clone(),\n attempt_id: payment_attempt.attempt_id.clone(),\n status: payment_attempt.status,\n payment_method,\n payment_method_type: payment_attempt.payment_method_type,\n connector_auth_type: auth_type,\n description: None,\n address: PaymentAddress::default(),\n auth_type: payment_attempt.authentication_type.unwrap_or_default(),\n connector_meta_data: merchant_connector_account.get_metadata(),\n connector_wallets_details: merchant_connector_account.get_connector_wallets_details(),\n amount_captured: payment_intent\n .amount_captured\n .map(|amt| amt.get_amount_as_i64()),\n minor_amount_captured: payment_intent.amount_captured,\n payment_method_status: None,\n request: types::UploadFileRequestData {\n file_key,\n file: create_file_request.file.clone(),\n file_type: create_file_request.file_type.clone(),\n file_size: create_file_request.file_size,\n dispute_id: dispute_data.dispute_id.clone(),\n connector_dispute_id: dispute_data.connector_dispute_id.clone(),\n },\n response: Err(ErrorResponse::default()),\n access_token: None,\n session_token: None,\n reference_id: None,\n payment_method_token: None,\n connector_customer: None,\n customer_id: None,\n recurring_mandate_payment_data: None,\n preprocessing_id: None,\n payment_method_balance: None,\n connector_request_reference_id: get_connector_request_reference_id(\n &state.conf,\n merchant_context.get_merchant_account().get_id(),\n payment_intent,\n payment_attempt,\n connector_id,\n )?,\n #[cfg(feature = \"payouts\")]\n payout_method_data: None,\n #[cfg(feature = \"payouts\")]\n quote_id: None,\n test_mode,\n connector_api_version: None,\n connector_http_status_code: None,\n external_latency: None,\n apple_pay_flow: None,\n frm_metadata: None,\n refund_id: None,\n dispute_id: None,\n connector_response: None,\n integrity_check: Ok(()),\n additional_merchant_data: None,\n header_payload: None,\n connector_mandate_request_reference_id: None,\n authentication_id: None,\n psd2_sca_exemption_type: None,\n raw_connector_response: None,\n is_payment_id_from_merchant: None,\n l2_l3_data: None,\n minor_amount_capturable: None,\n authorized_amount: None,\n };\n Ok(router_data)\n}", + "diff_span": { + "before": " minor_amount_capturable: None,\n authorized_amount: None,\n is_migrated_card: None,\n };\n Ok(router_data)", + "after": "" + }, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs::function::build_shopper_reference", + "file": "crates/hyperswitch_connectors/src/connectors/adyen/transformers.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "fn build_shopper_reference(item: &PaymentsAuthorizeRouterData) -> Option {\n match item.get_connector_customer_id() {\n Ok(connector_customer_id) => Some(connector_customer_id),\n Err(_) => match item.get_customer_id() {\n Ok(customer_id) => Some(format!(\n \"{}_{}\",\n item.merchant_id.get_string_repr(),\n customer_id.get_string_repr()\n )),\n Err(_) => None,\n },\n }\n}", + "diff_span": null, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::is_migrated_card", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub fn is_migrated_card(&self) -> bool {\n self.get_payment_method_type() == Some(storage_enums::PaymentMethod::Card)\n && self.locker_id.is_none()\n && self.connector_mandate_details.is_some()\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "efce83df7f88d6098685ed5d700c407418af3d51" + } + ] +} \ No newline at end of file