diff --git "a/diffs/pr_6687/18bc1fd/diff.json" "b/diffs/pr_6687/18bc1fd/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6687/18bc1fd/diff.json" @@ -0,0 +1,342 @@ +{ + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac", + "pr_number": 6687, + "rust_files": [ + "crates/diesel_models/src/payment_method.rs", + "crates/diesel_models/src/schema_v2.rs", + "crates/hyperswitch_domain_models/src/payment_methods.rs", + "crates/router/src/core/payment_methods.rs", + "crates/router/src/core/payment_methods/cards.rs", + "crates/router/src/core/payouts.rs", + "crates/router/src/core/payouts/helpers.rs", + "crates/router/src/core/payouts/validator.rs" + ], + "diffs": [ + { + "id": "crates/router/src/core/payouts.rs::function::response_handler", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn response_handler(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &PayoutData,\n) -> RouterResponse {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payouts = payout_data.payouts.to_owned();\n\n let payment_method_id: Option = payout_data\n .payment_method\n .as_ref() // Safely access the `payment_method` as a reference\n .map(|pm| pm.payment_method_id.clone());\n\n let payout_link = payout_data.payout_link.to_owned();\n let billing_address = payout_data.billing_address.to_owned();\n let customer_details = payout_data.customer_details.to_owned();\n let customer_id = payouts.customer_id;\n let billing = billing_address\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(From::from);\n\n let translated_unified_message = helpers::get_translated_unified_code_and_message(\n state,\n payout_attempt.unified_code.as_ref(),\n payout_attempt.unified_message.as_ref(),\n &payout_data.current_locale,\n )\n .await?;\n\n let additional_payout_method_data = payout_attempt.additional_payout_method_data.clone();\n\n let payout_method_data =\n additional_payout_method_data.map(payouts::PayoutMethodDataResponse::from);\n\n let response = api::PayoutCreateResponse {\n payout_id: payouts.payout_id.to_owned(),\n merchant_id: merchant_account.get_id().to_owned(),\n amount: payouts.amount,\n currency: payouts.destination_currency.to_owned(),\n connector: payout_attempt.connector,\n payout_type: payouts.payout_type.to_owned(),\n payout_method_data,\n billing,\n auto_fulfill: payouts.auto_fulfill,\n customer_id,\n email: customer_details.as_ref().and_then(|c| c.email.clone()),\n name: customer_details.as_ref().and_then(|c| c.name.clone()),\n phone: customer_details.as_ref().and_then(|c| c.phone.clone()),\n phone_country_code: customer_details\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n customer: customer_details\n .as_ref()\n .map(payment_api_types::CustomerDetailsResponse::foreign_from),\n client_secret: payouts.client_secret.to_owned(),\n return_url: payouts.return_url.to_owned(),\n business_country: payout_attempt.business_country,\n business_label: payout_attempt.business_label,\n description: payouts.description.to_owned(),\n entity_type: payouts.entity_type.to_owned(),\n recurring: payouts.recurring,\n metadata: payouts.metadata,\n merchant_connector_id: payout_attempt.merchant_connector_id.to_owned(),\n status: payout_attempt.status.to_owned(),\n error_message: payout_attempt.error_message.to_owned(),\n error_code: payout_attempt.error_code,\n profile_id: payout_attempt.profile_id,\n created: Some(payouts.created_at),\n connector_transaction_id: payout_attempt.connector_payout_id,\n priority: payouts.priority,\n attempts: None,\n unified_code: payout_attempt.unified_code,\n unified_message: translated_unified_message,\n payout_link: payout_link\n .map(|payout_link| {\n url::Url::parse(payout_link.url.peek()).map(|link| PayoutLinkResponse {\n payout_link_id: payout_link.link_id,\n link: link.into(),\n })\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse payout link's URL\")?,\n payment_method_id,\n };\n Ok(services::ApplicationResponse::Json(response))\n}", + "after_code": "pub async fn response_handler(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n payout_data: &PayoutData,\n) -> RouterResponse {\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payouts = payout_data.payouts.to_owned();\n\n let payment_method_id: Option = payout_data\n .payment_method\n .as_ref() // Safely access the `payment_method` as a reference\n .map(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n {\n pm.payment_method_id.clone()\n }\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n {\n pm.id.clone().get_string_repr().to_string()\n }\n });\n\n let payout_link = payout_data.payout_link.to_owned();\n let billing_address = payout_data.billing_address.to_owned();\n let customer_details = payout_data.customer_details.to_owned();\n let customer_id = payouts.customer_id;\n let billing = billing_address\n .as_ref()\n .map(hyperswitch_domain_models::address::Address::from)\n .map(From::from);\n\n let translated_unified_message = helpers::get_translated_unified_code_and_message(\n state,\n payout_attempt.unified_code.as_ref(),\n payout_attempt.unified_message.as_ref(),\n &payout_data.current_locale,\n )\n .await?;\n\n let additional_payout_method_data = payout_attempt.additional_payout_method_data.clone();\n\n let payout_method_data =\n additional_payout_method_data.map(payouts::PayoutMethodDataResponse::from);\n\n let response = api::PayoutCreateResponse {\n payout_id: payouts.payout_id.to_owned(),\n merchant_id: merchant_account.get_id().to_owned(),\n amount: payouts.amount,\n currency: payouts.destination_currency.to_owned(),\n connector: payout_attempt.connector,\n payout_type: payouts.payout_type.to_owned(),\n payout_method_data,\n billing,\n auto_fulfill: payouts.auto_fulfill,\n customer_id,\n email: customer_details.as_ref().and_then(|c| c.email.clone()),\n name: customer_details.as_ref().and_then(|c| c.name.clone()),\n phone: customer_details.as_ref().and_then(|c| c.phone.clone()),\n phone_country_code: customer_details\n .as_ref()\n .and_then(|c| c.phone_country_code.clone()),\n customer: customer_details\n .as_ref()\n .map(payment_api_types::CustomerDetailsResponse::foreign_from),\n client_secret: payouts.client_secret.to_owned(),\n return_url: payouts.return_url.to_owned(),\n business_country: payout_attempt.business_country,\n business_label: payout_attempt.business_label,\n description: payouts.description.to_owned(),\n entity_type: payouts.entity_type.to_owned(),\n recurring: payouts.recurring,\n metadata: payouts.metadata,\n merchant_connector_id: payout_attempt.merchant_connector_id.to_owned(),\n status: payout_attempt.status.to_owned(),\n error_message: payout_attempt.error_message.to_owned(),\n error_code: payout_attempt.error_code,\n profile_id: payout_attempt.profile_id,\n created: Some(payouts.created_at),\n connector_transaction_id: payout_attempt.connector_payout_id,\n priority: payouts.priority,\n attempts: None,\n unified_code: payout_attempt.unified_code,\n unified_message: translated_unified_message,\n payout_link: payout_link\n .map(|payout_link| {\n url::Url::parse(payout_link.url.peek()).map(|link| PayoutLinkResponse {\n payout_link_id: payout_link.link_id,\n link: link.into(),\n })\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to parse payout link's URL\")?,\n payment_method_id,\n };\n Ok(services::ApplicationResponse::Json(response))\n}", + "diff_span": { + "before": " .payment_method\n .as_ref() // Safely access the `payment_method` as a reference\n .map(|pm| pm.payment_method_id.clone());\n\n let payout_link = payout_data.payout_link.to_owned();", + "after": " .payment_method\n .as_ref() // Safely access the `payment_method` as a reference\n .map(|pm| {\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n {\n pm.payment_method_id.clone()\n }\n\n #[cfg(all(feature = \"v2\", feature = \"payment_methods_v2\"))]\n {\n pm.id.clone().get_string_repr().to_string()\n }\n });\n\n let payout_link = payout_data.payout_link.to_owned();" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::convert", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "after_code": "async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }", + "diff_span": { + "before": "", + "after": " .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethodUpdateInternal::function::from", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }", + "after_code": "fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n transaction_flow,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }", + "diff_span": { + "before": "", + "after": " PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n transaction_flow,\n } => Self {\n payment_method_data: None," + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::enum::PaymentMethodUpdate", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum PaymentMethodUpdate {\n UpdatePaymentMethodDataAndLastUsed {\n payment_method_data: Option,\n scheme: Option,\n last_used_at: PrimitiveDateTime,\n },\n PaymentMethodDataUpdate {\n payment_method_data: Option,\n },\n LastUsedUpdate {\n last_used_at: PrimitiveDateTime,\n },\n NetworkTransactionIdAndStatusUpdate {\n network_transaction_id: Option,\n status: Option,\n },\n StatusUpdate {\n status: Option,\n },\n AdditionalDataUpdate {\n payment_method_data: Option,\n status: Option,\n locker_id: Option,\n payment_method_type_v2: Option,\n payment_method_subtype: Option,\n network_token_requestor_reference_id: Option,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n locker_fingerprint_id: Option,\n },\n ConnectorMandateDetailsUpdate {\n connector_mandate_details: Option,\n },\n}", + "after_code": "pub enum PaymentMethodUpdate {\n UpdatePaymentMethodDataAndLastUsed {\n payment_method_data: Option,\n scheme: Option,\n last_used_at: PrimitiveDateTime,\n },\n PaymentMethodDataUpdate {\n payment_method_data: Option,\n },\n LastUsedUpdate {\n last_used_at: PrimitiveDateTime,\n },\n NetworkTransactionIdAndStatusUpdate {\n network_transaction_id: Option,\n status: Option,\n },\n StatusUpdate {\n status: Option,\n },\n AdditionalDataUpdate {\n payment_method_data: Option,\n status: Option,\n locker_id: Option,\n payment_method_type_v2: Option,\n payment_method_subtype: Option,\n network_token_requestor_reference_id: Option,\n network_token_locker_id: Option,\n network_token_payment_method_data: Option,\n locker_fingerprint_id: Option,\n },\n ConnectorMandateDetailsUpdate {\n connector_mandate_details: Option,\n transaction_flow: Option,\n },\n}", + "diff_span": { + "before": "", + "after": " ConnectorMandateDetailsUpdate {\n connector_mandate_details: Option,\n transaction_flow: Option,\n },\n}" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payouts/validator.rs::function::validate_create_request", + "file": "crates/router/src/core/payouts/validator.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn validate_create_request(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n req: &payouts::PayoutCreateRequest,\n merchant_key_store: &domain::MerchantKeyStore,\n) -> RouterResult<(\n String,\n Option,\n common_utils::id_type::ProfileId,\n Option,\n Option,\n)> {\n let merchant_id = merchant_account.get_id();\n\n if let Some(payout_link) = &req.payout_link {\n if *payout_link {\n validate_payout_link_request(req)?;\n }\n };\n\n // Merchant ID\n let predicate = req.merchant_id.as_ref().map(|mid| mid != merchant_id);\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string(),\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n // Payout ID\n let db: &dyn StorageInterface = &*state.store;\n let payout_id = core_utils::get_or_generate_uuid(\"payout_id\", req.payout_id.as_ref())?;\n match validate_uniqueness_of_payout_id_against_merchant_id(\n db,\n &payout_id,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .attach_printable_lazy(|| {\n format!(\n \"Unique violation while checking payout_id: {} against merchant_id: {:?}\",\n payout_id.to_owned(),\n merchant_id\n )\n })? {\n Some(_) => Err(report!(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned()\n })),\n None => Ok(()),\n }?;\n\n // Fetch customer details (merge of loose fields + customer object) and create DB entry\n let customer_in_request = helpers::get_customer_details_from_request(req);\n let customer = if customer_in_request.customer_id.is_some()\n || customer_in_request.name.is_some()\n || customer_in_request.email.is_some()\n || customer_in_request.phone.is_some()\n || customer_in_request.phone_country_code.is_some()\n {\n helpers::get_or_create_customer_details(\n state,\n &customer_in_request,\n merchant_account,\n merchant_key_store,\n )\n .await?\n } else {\n None\n };\n\n // // payout_token\n // let payout_method_data = match (req.payout_token.as_ref(), customer.as_ref()) {\n // (Some(_), None) => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n // field_name: \"customer or customer_id when payout_token is provided\"\n // })),\n // (Some(payout_token), Some(customer)) => {\n // helpers::make_payout_method_data(\n // state,\n // req.payout_method_data.as_ref(),\n // Some(payout_token),\n // &customer.customer_id,\n // merchant_account.get_id(),\n // req.payout_type,\n // merchant_key_store,\n // None,\n // merchant_account.storage_scheme,\n // )\n // .await\n // }\n // _ => Ok(None),\n // }?;\n\n #[cfg(feature = \"v1\")]\n let profile_id = core_utils::get_profile_id_from_business_details(\n &state.into(),\n merchant_key_store,\n req.business_country,\n req.business_label.as_ref(),\n merchant_account,\n req.profile_id.as_ref(),\n &*state.store,\n false,\n )\n .await?;\n\n #[cfg(feature = \"v2\")]\n // Profile id will be mandatory in v2 in the request / headers\n let profile_id = req\n .profile_id\n .clone()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"profile_id\",\n })\n .attach_printable(\"Profile id is a mandatory parameter\")?;\n\n // fetching payment_method using req.payment_method_id and passing it from here\n let payment_method: Option =\n if let Some(payment_method_id) = req.payment_method_id.clone() {\n match customer.as_ref() {\n Some(customer) => {\n let payment_method = db\n .find_payment_method(\n &state.into(),\n merchant_key_store,\n &payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?;\n utils::when(payment_method.customer_id != customer.customer_id, || {\n Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payment method does not belong to this customer_id\".to_string()\n })\n .attach_printable(\n \"customer_id in payment_method does not match with customer_id in request\",\n ))\n })?;\n Some(payment_method)\n }\n None => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"customer_id when payment_method_id is passed\",\n }))?,\n }\n } else {\n None\n };\n\n let payout_method_data = match (\n req.payout_token.as_ref(),\n customer.as_ref(),\n payment_method.as_ref(),\n ) {\n (Some(_), None, _) => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"customer or customer_id when payout_token is provided\"\n })),\n (Some(payout_token), Some(customer), _) => {\n helpers::make_payout_method_data(\n state,\n req.payout_method_data.as_ref(),\n Some(payout_token),\n &customer.customer_id,\n merchant_account.get_id(),\n req.payout_type,\n merchant_key_store,\n None,\n merchant_account.storage_scheme,\n )\n .await\n }\n (_, Some(_), Some(payment_method)) => {\n match get_pm_list_context(\n state,\n payment_method\n .payment_method\n .as_ref()\n .get_required_value(\"payment_method_id\")?,\n merchant_key_store,\n payment_method,\n None,\n false,\n )\n .await?\n {\n Some(pm) => match (pm.card_details, pm.bank_transfer_details) {\n (Some(card), _) => Ok(Some(payouts::PayoutMethodData::Card(\n api_models::payouts::CardPayout {\n card_number: card.card_number.get_required_value(\"card_number\")?,\n card_holder_name: card.card_holder_name,\n expiry_month: card.expiry_month.get_required_value(\"expiry_month\")?,\n expiry_year: card.expiry_year.get_required_value(\"expiry_month\")?,\n },\n ))),\n (_, Some(bank)) => Ok(Some(payouts::PayoutMethodData::Bank(bank))),\n _ => Ok(None),\n },\n None => Ok(None),\n }\n }\n _ => Ok(None),\n }?;\n\n Ok((\n payout_id,\n payout_method_data,\n profile_id,\n customer,\n payment_method,\n ))\n}", + "after_code": "pub async fn validate_create_request(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n req: &payouts::PayoutCreateRequest,\n merchant_key_store: &domain::MerchantKeyStore,\n) -> RouterResult<(\n String,\n Option,\n common_utils::id_type::ProfileId,\n Option,\n Option,\n)> {\n let merchant_id = merchant_account.get_id();\n\n if let Some(payout_link) = &req.payout_link {\n if *payout_link {\n validate_payout_link_request(req)?;\n }\n };\n\n // Merchant ID\n let predicate = req.merchant_id.as_ref().map(|mid| mid != merchant_id);\n utils::when(predicate.unwrap_or(false), || {\n Err(report!(errors::ApiErrorResponse::InvalidDataFormat {\n field_name: \"merchant_id\".to_string(),\n expected_format: \"merchant_id from merchant account\".to_string(),\n })\n .attach_printable(\"invalid merchant_id in request\"))\n })?;\n\n // Payout ID\n let db: &dyn StorageInterface = &*state.store;\n let payout_id = core_utils::get_or_generate_uuid(\"payout_id\", req.payout_id.as_ref())?;\n match validate_uniqueness_of_payout_id_against_merchant_id(\n db,\n &payout_id,\n merchant_id,\n merchant_account.storage_scheme,\n )\n .await\n .attach_printable_lazy(|| {\n format!(\n \"Unique violation while checking payout_id: {} against merchant_id: {:?}\",\n payout_id.to_owned(),\n merchant_id\n )\n })? {\n Some(_) => Err(report!(errors::ApiErrorResponse::DuplicatePayout {\n payout_id: payout_id.to_owned()\n })),\n None => Ok(()),\n }?;\n\n // Fetch customer details (merge of loose fields + customer object) and create DB entry\n let customer_in_request = helpers::get_customer_details_from_request(req);\n let customer = if customer_in_request.customer_id.is_some()\n || customer_in_request.name.is_some()\n || customer_in_request.email.is_some()\n || customer_in_request.phone.is_some()\n || customer_in_request.phone_country_code.is_some()\n {\n helpers::get_or_create_customer_details(\n state,\n &customer_in_request,\n merchant_account,\n merchant_key_store,\n )\n .await?\n } else {\n None\n };\n\n // // payout_token\n // let payout_method_data = match (req.payout_token.as_ref(), customer.as_ref()) {\n // (Some(_), None) => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n // field_name: \"customer or customer_id when payout_token is provided\"\n // })),\n // (Some(payout_token), Some(customer)) => {\n // helpers::make_payout_method_data(\n // state,\n // req.payout_method_data.as_ref(),\n // Some(payout_token),\n // &customer.customer_id,\n // merchant_account.get_id(),\n // req.payout_type,\n // merchant_key_store,\n // None,\n // merchant_account.storage_scheme,\n // )\n // .await\n // }\n // _ => Ok(None),\n // }?;\n\n #[cfg(feature = \"v1\")]\n let profile_id = core_utils::get_profile_id_from_business_details(\n &state.into(),\n merchant_key_store,\n req.business_country,\n req.business_label.as_ref(),\n merchant_account,\n req.profile_id.as_ref(),\n &*state.store,\n false,\n )\n .await?;\n\n #[cfg(feature = \"v2\")]\n // Profile id will be mandatory in v2 in the request / headers\n let profile_id = req\n .profile_id\n .clone()\n .ok_or(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"profile_id\",\n })\n .attach_printable(\"Profile id is a mandatory parameter\")?;\n\n // fetching payment_method using req.payment_method_id and passing it from here\n let payment_method: Option =\n if let Some(payment_method_id) = req.payment_method_id.clone() {\n match customer.as_ref() {\n Some(customer) => {\n let payment_method = db\n .find_payment_method(\n &state.into(),\n merchant_key_store,\n &payment_method_id,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?;\n utils::when(payment_method.customer_id != customer.customer_id, || {\n Err(report!(errors::ApiErrorResponse::InvalidRequestData {\n message: \"payment method does not belong to this customer_id\".to_string()\n })\n .attach_printable(\n \"customer_id in payment_method does not match with customer_id in request\",\n ))\n })?;\n Some(payment_method)\n }\n None => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"customer_id when payment_method_id is passed\",\n }))?,\n }\n } else {\n None\n };\n\n let payout_method_data = match (\n req.payout_token.as_ref(),\n customer.as_ref(),\n payment_method.as_ref(),\n ) {\n (Some(_), None, _) => Err(report!(errors::ApiErrorResponse::MissingRequiredField {\n field_name: \"customer or customer_id when payout_token is provided\"\n })),\n (Some(payout_token), Some(customer), _) => {\n helpers::make_payout_method_data(\n state,\n req.payout_method_data.as_ref(),\n Some(payout_token),\n &customer.customer_id,\n merchant_account.get_id(),\n req.payout_type,\n merchant_key_store,\n None,\n merchant_account.storage_scheme,\n )\n .await\n }\n (_, Some(_), Some(payment_method)) => {\n match get_pm_list_context(\n state,\n payment_method\n .payment_method\n .as_ref()\n .get_required_value(\"payment_method_id\")?,\n merchant_key_store,\n payment_method,\n None,\n false,\n )\n .await?\n {\n Some(pm) => match (pm.card_details, pm.bank_transfer_details) {\n (Some(card), _) => Ok(Some(payouts::PayoutMethodData::Card(\n api_models::payouts::CardPayout {\n card_number: card.card_number.get_required_value(\"card_number\")?,\n card_holder_name: card.card_holder_name,\n expiry_month: card.expiry_month.get_required_value(\"expiry_month\")?,\n expiry_year: card.expiry_year.get_required_value(\"expiry_month\")?,\n },\n ))),\n (_, Some(bank)) => Ok(Some(payouts::PayoutMethodData::Bank(bank))),\n _ => Ok(None),\n },\n None => Ok(None),\n }\n }\n _ => Ok(None),\n }?;\n\n Ok((\n payout_id,\n payout_method_data,\n profile_id,\n customer,\n payment_method,\n ))\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac", + "before_imports": [ + "use error_stack::{report, ResultExt};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use actix_web::http::header;", + "use super::helpers;" + ], + "after_imports": [ + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use crate::core::payment_methods::cards::get_pm_list_context;", + "use actix_web::http::header;", + "use super::helpers;", + "use error_stack::{report, ResultExt};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::construct_new", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }", + "after_code": "async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }", + "diff_span": { + "before": "", + "after": " .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::PaymentMethod::function::convert_back", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }", + "after_code": "async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n transaction_flow: item.transaction_flow,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }", + "diff_span": { + "before": "", + "after": " })\n .await?,\n transaction_flow: item.transaction_flow,\n })\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payment_methods.rs::function::create_payment_method_for_intent", + "file": "crates/router/src/core/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn create_payment_method_for_intent(\n state: &SessionState,\n metadata: Option,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n merchant_id: &id_type::MerchantId,\n key_store: &domain::MerchantKeyStore,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n) -> errors::CustomResult<(domain::PaymentMethod, Secret), errors::ApiErrorResponse> {\n let db = &*state.store;\n let ephemeral_key = payment_helpers::create_ephemeral_key(\n state,\n customer_id,\n merchant_id,\n ephemeral_key::ResourceType::PaymentMethod,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to create ephemeral_key\")?;\n\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id: None,\n payment_method_type: None,\n payment_method_subtype: None,\n payment_method_data: None,\n connector_mandate_details: None,\n customer_acceptance: None,\n client_secret: None,\n status: enums::PaymentMethodStatus::AwaitingData,\n network_transaction_id: None,\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok((response, ephemeral_key.secret))\n}", + "after_code": "pub async fn create_payment_method_for_intent(\n state: &SessionState,\n metadata: Option,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n merchant_id: &id_type::MerchantId,\n key_store: &domain::MerchantKeyStore,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n) -> errors::CustomResult<(domain::PaymentMethod, Secret), errors::ApiErrorResponse> {\n let db = &*state.store;\n let ephemeral_key = payment_helpers::create_ephemeral_key(\n state,\n customer_id,\n merchant_id,\n ephemeral_key::ResourceType::PaymentMethod,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to create ephemeral_key\")?;\n\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id: None,\n payment_method_type: None,\n payment_method_subtype: None,\n payment_method_data: None,\n connector_mandate_details: None,\n customer_acceptance: None,\n client_secret: None,\n status: enums::PaymentMethodStatus::AwaitingData,\n network_transaction_id: None,\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n transaction_flow: None,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok((response, ephemeral_key.secret))\n}", + "diff_span": { + "before": "", + "after": " network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n transaction_flow: None,\n },\n storage_scheme," + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payment_methods.rs::function::create_payment_method_in_db", + "file": "crates/router/src/core/payment_methods.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn create_payment_method_in_db(\n state: &SessionState,\n req: &api::PaymentMethodCreate,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n locker_id: Option,\n merchant_id: &id_type::MerchantId,\n customer_acceptance: Option,\n payment_method_data: domain::types::OptionalEncryptableJsonType<\n api::payment_methods::PaymentMethodsData,\n >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n card_scheme: Option,\n) -> errors::CustomResult {\n let db = &*state.store;\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id,\n payment_method_type: Some(req.payment_method_type),\n payment_method_subtype: Some(req.payment_method_subtype),\n payment_method_data,\n connector_mandate_details,\n customer_acceptance,\n client_secret: None,\n status: status.unwrap_or(enums::PaymentMethodStatus::Active),\n network_transaction_id: network_transaction_id.to_owned(),\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok(response)\n}", + "after_code": "pub async fn create_payment_method_in_db(\n state: &SessionState,\n req: &api::PaymentMethodCreate,\n customer_id: &id_type::GlobalCustomerId,\n payment_method_id: id_type::GlobalPaymentMethodId,\n locker_id: Option,\n merchant_id: &id_type::MerchantId,\n customer_acceptance: Option,\n payment_method_data: domain::types::OptionalEncryptableJsonType<\n api::payment_methods::PaymentMethodsData,\n >,\n key_store: &domain::MerchantKeyStore,\n connector_mandate_details: Option,\n status: Option,\n network_transaction_id: Option,\n storage_scheme: enums::MerchantStorageScheme,\n payment_method_billing_address: crypto::OptionalEncryptableValue,\n card_scheme: Option,\n transaction_flow: Option,\n) -> errors::CustomResult {\n let db = &*state.store;\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id,\n payment_method_type: Some(req.payment_method_type),\n payment_method_subtype: Some(req.payment_method_subtype),\n payment_method_data,\n connector_mandate_details,\n customer_acceptance,\n client_secret: None,\n status: status.unwrap_or(enums::PaymentMethodStatus::Active),\n network_transaction_id: network_transaction_id.to_owned(),\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n transaction_flow,\n },\n storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Failed to add payment method in db\")?;\n\n Ok(response)\n}", + "diff_span": { + "before": "", + "after": " payment_method_billing_address: crypto::OptionalEncryptableValue,\n card_scheme: Option,\n transaction_flow: Option,\n) -> errors::CustomResult {\n let db = &*state.store;\n let current_time = common_utils::date_time::now();\n\n let response = db\n .insert_payment_method(\n &state.into(),\n key_store,\n domain::PaymentMethod {\n customer_id: customer_id.to_owned(),\n merchant_id: merchant_id.to_owned(),\n id: payment_method_id,\n locker_id,\n payment_method_type: Some(req.payment_method_type),\n payment_method_subtype: Some(req.payment_method_subtype),\n payment_method_data,\n connector_mandate_details,\n customer_acceptance,\n client_secret: None,\n status: status.unwrap_or(enums::PaymentMethodStatus::Active),\n network_transaction_id: network_transaction_id.to_owned(),\n created_at: current_time,\n last_modified: current_time,\n last_used_at: current_time,\n payment_method_billing_address,\n updated_by: None,\n version: domain::consts::API_VERSION,\n locker_fingerprint_id: None,\n network_token_locker_id: None,\n network_token_payment_method_data: None,\n network_token_requestor_reference_id: None,\n transaction_flow,\n },\n storage_scheme," + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payouts.rs::function::payouts_create_core", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn payouts_create_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n // Validate create request\n let (payout_id, payout_method_data, profile_id, customer, payment_method) =\n validator::validate_create_request(&state, &merchant_account, &req, &key_store).await?;\n\n // Create DB entries\n let mut payout_data = payout_create_db_entries(\n &state,\n &merchant_account,\n &key_store,\n &req,\n &payout_id,\n &profile_id,\n payout_method_data.as_ref(),\n &state.locale,\n customer.as_ref(),\n payment_method.clone(),\n )\n .await?;\n /*\n\n\n dummy commit\n\n\n\n\n\n */\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payout_type = payout_data.payouts.payout_type.to_owned();\n\n // Persist payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?\n };\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "after_code": "pub async fn payouts_create_core(\n state: SessionState,\n merchant_account: domain::MerchantAccount,\n key_store: domain::MerchantKeyStore,\n req: payouts::PayoutCreateRequest,\n) -> RouterResponse {\n // Validate create request\n let (payout_id, payout_method_data, profile_id, customer, payment_method) =\n validator::validate_create_request(&state, &merchant_account, &req, &key_store).await?;\n\n // Create DB entries\n let mut payout_data = payout_create_db_entries(\n &state,\n &merchant_account,\n &key_store,\n &req,\n &payout_id,\n &profile_id,\n payout_method_data.as_ref(),\n &state.locale,\n customer.as_ref(),\n payment_method.clone(),\n )\n .await?;\n\n let payout_attempt = payout_data.payout_attempt.to_owned();\n let payout_type = payout_data.payouts.payout_type.to_owned();\n\n // Persist payout method data in temp locker\n if req.payout_method_data.is_some() {\n let customer_id = payout_data\n .payouts\n .customer_id\n .clone()\n .get_required_value(\"customer_id when payout_method_data is provided\")?;\n payout_data.payout_method_data = helpers::make_payout_method_data(\n &state,\n req.payout_method_data.as_ref(),\n payout_attempt.payout_token.as_deref(),\n &customer_id,\n &payout_attempt.merchant_id,\n payout_type,\n &key_store,\n Some(&mut payout_data),\n merchant_account.storage_scheme,\n )\n .await?;\n }\n\n if let Some(true) = payout_data.payouts.confirm {\n payouts_core(\n &state,\n &merchant_account,\n &key_store,\n &mut payout_data,\n req.routing.clone(),\n req.connector.clone(),\n )\n .await?\n };\n\n response_handler(&state, &merchant_account, &payout_data).await\n}", + "diff_span": { + "before": " )\n .await?;\n /*\n\n\n dummy commit\n\n\n\n\n\n */\n\n let payout_attempt = payout_data.payout_attempt.to_owned();", + "after": "" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PaymentMethodUpdateInternal", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From for PaymentMethodUpdateInternal {\n fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }\n}", + "after_code": "impl From for PaymentMethodUpdateInternal {\n fn from(payment_method_update: PaymentMethodUpdate) -> Self {\n match payment_method_update {\n PaymentMethodUpdate::PaymentMethodDataUpdate {\n payment_method_data,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::LastUsedUpdate { last_used_at } => Self {\n payment_method_data: None,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::UpdatePaymentMethodDataAndLastUsed {\n payment_method_data,\n last_used_at,\n ..\n } => Self {\n payment_method_data,\n last_used_at: Some(last_used_at),\n network_transaction_id: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::NetworkTransactionIdAndStatusUpdate {\n network_transaction_id,\n status,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::StatusUpdate { status } => Self {\n payment_method_data: None,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n PaymentMethodUpdate::AdditionalDataUpdate {\n payment_method_data,\n status,\n locker_id,\n payment_method_type_v2,\n payment_method_subtype,\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n } => Self {\n payment_method_data,\n last_used_at: None,\n network_transaction_id: None,\n status,\n locker_id,\n payment_method_type_v2,\n connector_mandate_details: None,\n updated_by: None,\n payment_method_subtype,\n last_modified: common_utils::date_time::now(),\n network_token_requestor_reference_id,\n network_token_locker_id,\n network_token_payment_method_data,\n locker_fingerprint_id,\n },\n PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n transaction_flow,\n } => Self {\n payment_method_data: None,\n last_used_at: None,\n status: None,\n locker_id: None,\n payment_method_type_v2: None,\n connector_mandate_details,\n network_transaction_id: None,\n updated_by: None,\n payment_method_subtype: None,\n last_modified: common_utils::date_time::now(),\n network_token_locker_id: None,\n network_token_requestor_reference_id: None,\n network_token_payment_method_data: None,\n locker_fingerprint_id: None,\n },\n }\n }\n}", + "diff_span": { + "before": "", + "after": " PaymentMethodUpdate::ConnectorMandateDetailsUpdate {\n connector_mandate_details,\n transaction_flow,\n } => Self {\n payment_method_data: None," + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethodNew", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n}", + "after_code": "pub struct PaymentMethodNew {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "diff_span": { + "before": "", + "after": " pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::PaymentMethod::function::from", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n }\n }", + "after_code": "fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }", + "diff_span": { + "before": "", + "after": " .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::impl::PaymentMethod", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From<&PaymentMethodNew> for PaymentMethod {\n fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n }\n }\n}", + "after_code": "impl From<&PaymentMethodNew> for PaymentMethod {\n fn from(payment_method_new: &PaymentMethodNew) -> Self {\n Self {\n customer_id: payment_method_new.customer_id.clone(),\n merchant_id: payment_method_new.merchant_id.clone(),\n locker_id: payment_method_new.locker_id.clone(),\n created_at: payment_method_new.created_at,\n last_modified: payment_method_new.last_modified,\n payment_method_data: payment_method_new.payment_method_data.clone(),\n last_used_at: payment_method_new.last_used_at,\n connector_mandate_details: payment_method_new.connector_mandate_details.clone(),\n customer_acceptance: payment_method_new.customer_acceptance.clone(),\n status: payment_method_new.status,\n network_transaction_id: payment_method_new.network_transaction_id.clone(),\n client_secret: payment_method_new.client_secret.clone(),\n updated_by: payment_method_new.updated_by.clone(),\n payment_method_billing_address: payment_method_new\n .payment_method_billing_address\n .clone(),\n locker_fingerprint_id: payment_method_new.locker_fingerprint_id.clone(),\n payment_method_type_v2: payment_method_new.payment_method_type_v2,\n payment_method_subtype: payment_method_new.payment_method_subtype,\n id: payment_method_new.id.clone(),\n version: payment_method_new.version,\n network_token_requestor_reference_id: payment_method_new\n .network_token_requestor_reference_id\n .clone(),\n network_token_locker_id: payment_method_new.network_token_locker_id.clone(),\n network_token_payment_method_data: payment_method_new\n .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }\n}", + "diff_span": { + "before": "", + "after": " .network_token_payment_method_data\n .clone(),\n transaction_flow: payment_method_new.transaction_flow,\n }\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payouts.rs::function::create_recipient_disburse_account", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "pub async fn create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipientAccount,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n\n if let (\n true,\n Some(ref payout_method_data),\n Some(connector_payout_id),\n Some(customer_details),\n Some(merchant_connector_id),\n ) = (\n payout_data.payouts.recurring,\n payout_data.payout_method_data.clone(),\n payout_response_data.connector_payout_id.clone(),\n payout_data.customer_details.clone(),\n connector_data.merchant_connector_id.clone(),\n ) {\n let connector_mandate_details = HashMap::from([(\n merchant_connector_id, // which connector was called [MCA]\n PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_payout_id, // what does the connector return\n payment_method_type: Some(api_enums::PaymentMethodType::foreign_from(\n payout_method_data,\n )),\n original_payment_authorized_amount: Some(\n payout_data.payouts.amount.get_amount_as_i64(),\n ),\n original_payment_authorized_currency: Some(\n payout_data.payouts.destination_currency,\n ),\n },\n )]);\n\n let connector_mandate_details_value =\n serde_json::to_value(connector_mandate_details).ok();\n\n /**************** above this is correct **********************\n need to fetch connector_mandate_details using payment_method_id\n */\n let pm_id = payout_data.payouts.payout_method_id.clone();\n\n if let Some(payout_method_id) = pm_id {\n let payment_method = db\n .find_payment_method(\n &(state.into()),\n key_store,\n &payout_method_id, // need to get from api request\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?;\n\n payout_data.payment_method = Some(payment_method.clone());\n payout_data.payouts.payout_method_id =\n Some(payment_method.payment_method_id.clone());\n\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n // router_env::logger::info!(\"{:?}\", payment_method.payment_method_id.clone());\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n // router_env::logger::info!(\"{:?}\", payment_method.clone());\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n } else {\n // router_env::logger::info!(\"9999999999999999\");\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_details.customer_id,\n payout_method_data,\n connector_mandate_details_value,\n merchant_account,\n key_store,\n )\n .await\n .attach_printable(\"Failed to save payout data to locker\")?;\n };\n }\n }\n Err(err) => {\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status: storage_enums::PayoutStatus::Failed,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n }\n };\n\n Ok(())\n}", + "after_code": "pub async fn create_recipient_disburse_account(\n state: &SessionState,\n merchant_account: &domain::MerchantAccount,\n connector_data: &api::ConnectorData,\n payout_data: &mut PayoutData,\n key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n // 1. Form Router data\n let router_data = core_utils::construct_payout_router_data(\n state,\n connector_data,\n merchant_account,\n payout_data,\n )\n .await?;\n\n // 2. Fetch connector integration details\n let connector_integration: services::BoxedPayoutConnectorIntegrationInterface<\n api::PoRecipientAccount,\n types::PayoutsData,\n types::PayoutsResponseData,\n > = connector_data.connector.get_connector_integration();\n\n // 3. Call connector service\n let router_data_resp = services::execute_connector_processing_step(\n state,\n connector_integration,\n &router_data,\n payments::CallConnectorAction::Trigger,\n None,\n )\n .await\n .to_payout_failed_response()?;\n\n // 4. Process data returned by the connector\n let db = &*state.store;\n match router_data_resp.response {\n Ok(payout_response_data) => {\n let payout_attempt = &payout_data.payout_attempt;\n let status = payout_response_data\n .status\n .unwrap_or(payout_attempt.status.to_owned());\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_response_data.connector_payout_id.clone(),\n status,\n error_code: None,\n error_message: None,\n is_eligible: payout_response_data.payout_eligible,\n unified_code: None,\n unified_message: None,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n\n if let (\n true,\n Some(ref payout_method_data),\n Some(connector_payout_id),\n Some(customer_details),\n Some(merchant_connector_id),\n ) = (\n payout_data.payouts.recurring,\n payout_data.payout_method_data.clone(),\n payout_response_data.connector_payout_id.clone(),\n payout_data.customer_details.clone(),\n connector_data.merchant_connector_id.clone(),\n ) {\n let connector_mandate_details = HashMap::from([(\n merchant_connector_id, // which connector was called [MCA]\n PaymentsMandateReferenceRecord {\n connector_mandate_id: connector_payout_id, // what does the connector return\n payment_method_type: Some(api_enums::PaymentMethodType::foreign_from(\n payout_method_data,\n )),\n original_payment_authorized_amount: Some(\n payout_data.payouts.amount.get_amount_as_i64(),\n ),\n original_payment_authorized_currency: Some(\n payout_data.payouts.destination_currency,\n ),\n },\n )]);\n\n let connector_mandate_details_value =\n serde_json::to_value(connector_mandate_details).ok();\n\n let pm_id = payout_data.payouts.payout_method_id.clone();\n\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n if let Some(payout_method_id) = pm_id {\n let payment_method = db\n .find_payment_method(\n &(state.into()),\n key_store,\n &payout_method_id, // need to get from api request\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?;\n\n payout_data.payment_method = Some(payment_method.clone());\n payout_data.payouts.payout_method_id =\n Some(payment_method.payment_method_id.clone());\n } else {\n helpers::save_payout_data_to_locker(\n state,\n payout_data,\n &customer_details.customer_id,\n payout_method_data,\n connector_mandate_details_value,\n merchant_account,\n key_store,\n )\n .await\n .attach_printable(\"Failed to save payout data to locker\")?;\n };\n }\n }\n Err(err) => {\n let (error_code, error_message) = (Some(err.code), Some(err.message));\n let (unified_code, unified_message) = helpers::get_gsm_record(\n state,\n error_code.clone(),\n error_message.clone(),\n payout_data.payout_attempt.connector.clone(),\n consts::PAYOUT_FLOW_STR,\n )\n .await\n .map_or((None, None), |gsm| (gsm.unified_code, gsm.unified_message));\n let updated_payout_attempt = storage::PayoutAttemptUpdate::StatusUpdate {\n connector_payout_id: payout_data.payout_attempt.connector_payout_id.to_owned(),\n status: storage_enums::PayoutStatus::Failed,\n error_code,\n error_message,\n is_eligible: None,\n unified_code: unified_code\n .map(UnifiedCode::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_code\",\n })?,\n unified_message: unified_message\n .map(UnifiedMessage::try_from)\n .transpose()\n .change_context(errors::ApiErrorResponse::InvalidDataValue {\n field_name: \"unified_message\",\n })?,\n };\n payout_data.payout_attempt = db\n .update_payout_attempt(\n &payout_data.payout_attempt,\n updated_payout_attempt,\n &payout_data.payouts,\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"Error updating payout_attempt in db\")?;\n }\n };\n\n Ok(())\n}", + "diff_span": { + "before": " serde_json::to_value(connector_mandate_details).ok();\n\n /**************** above this is correct **********************\n need to fetch connector_mandate_details using payment_method_id\n */\n let pm_id = payout_data.payouts.payout_method_id.clone();\n\n if let Some(payout_method_id) = pm_id {\n let payment_method = db\n .find_payment_method(\n &(state.into()),\n key_store,\n &payout_method_id, // need to get from api request\n merchant_account.storage_scheme,\n )\n .await\n .change_context(errors::ApiErrorResponse::PaymentMethodNotFound)\n .attach_printable(\"Unable to find payment method\")?;\n\n payout_data.payment_method = Some(payment_method.clone());\n payout_data.payouts.payout_method_id =\n Some(payment_method.payment_method_id.clone());\n\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n // router_env::logger::info!(\"{:?}\", payment_method.payment_method_id.clone());\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n // router_env::logger::info!(\"{:?}\", payment_method.clone());\n // router_env::logger::info!(\"XXXXXXXXXXXXXXXXX\");\n } else {\n // router_env::logger::info!(\"9999999999999999\");\n helpers::save_payout_data_to_locker(\n state,", + "after": " let pm_id = payout_data.payouts.payout_method_id.clone();\n\n #[cfg(all(\n any(feature = \"v1\", feature = \"v2\"),\n not(feature = \"payment_methods_v2\")\n ))]\n if let Some(payout_method_id) = pm_id {\n let payment_method = db" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac", + "before_imports": [ + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use router_env::{instrument, logger, tracing, Env};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n};", + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ], + "after_imports": [ + "use crate::{\n core::{\n errors::{\n self, ConnectorErrorExt, CustomResult, RouterResponse, RouterResult, StorageErrorExt,\n },\n payments::{self, customers, helpers as payment_helpers},\n utils as core_utils,\n },\n db::StorageInterface,\n routes::SessionState,\n services,\n types::{\n self,\n api::{self, payments as payment_api_types, payouts},\n domain,\n storage::{self, PaymentRoutingInfo},\n transformers::ForeignFrom,\n },\n utils::{self, OptionExt},\n};", + "use diesel_models::{\n enums as storage_enums,\n generic_link::{GenericLinkNew, PayoutLink},\n};", + "use hyperswitch_domain_models::payment_methods::PaymentMethod;", + "use common_utils::{\n consts,\n ext_traits::{AsyncExt, ValueExt},\n id_type::CustomerId,\n link_utils::{GenericLinkStatus, GenericLinkUiConfig, PayoutLinkData, PayoutLinkStatus},\n types::{MinorUnit, UnifiedCode, UnifiedMessage},\n};" + ] + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::impl::PaymentMethod", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl super::behaviour::Conversion for PaymentMethod {\n type DstType = diesel_models::payment_method::PaymentMethod;\n type NewDstType = diesel_models::payment_method::PaymentMethodNew;\n async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n })\n }\n}", + "after_code": "impl super::behaviour::Conversion for PaymentMethod {\n type DstType = diesel_models::payment_method::PaymentMethod;\n type NewDstType = diesel_models::payment_method::PaymentMethodNew;\n async fn convert(self) -> CustomResult {\n Ok(Self::DstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n transaction_flow: item.transaction_flow,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }\n}", + "diff_span": { + "before": "", + "after": " .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }\n\n async fn convert_back(\n state: &keymanager::KeyManagerState,\n item: Self::DstType,\n key: &Secret>,\n key_manager_identifier: keymanager::Identifier,\n ) -> CustomResult\n where\n Self: Sized,\n {\n async {\n Ok::>(Self {\n customer_id: item.customer_id,\n merchant_id: item.merchant_id,\n id: item.id,\n created_at: item.created_at,\n last_modified: item.last_modified,\n payment_method_type: item.payment_method_type_v2,\n payment_method_subtype: item.payment_method_subtype,\n payment_method_data: item\n .payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n locker_id: item.locker_id.map(VaultId::generate),\n last_used_at: item.last_used_at,\n connector_mandate_details: item.connector_mandate_details,\n customer_acceptance: item.customer_acceptance,\n status: item.status,\n network_transaction_id: item.network_transaction_id,\n client_secret: item.client_secret,\n payment_method_billing_address: item\n .payment_method_billing_address\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n updated_by: item.updated_by,\n locker_fingerprint_id: item.locker_fingerprint_id,\n version: item.version,\n network_token_requestor_reference_id: item.network_token_requestor_reference_id,\n network_token_locker_id: item.network_token_locker_id,\n network_token_payment_method_data: item\n .network_token_payment_method_data\n .async_lift(|inner| async {\n crypto_operation(\n state,\n type_name!(Self::DstType),\n CryptoOperation::DecryptOptional(inner),\n key_manager_identifier.clone(),\n key.peek(),\n )\n .await\n .and_then(|val| val.try_into_optionaloperation())\n })\n .await?,\n transaction_flow: item.transaction_flow,\n })\n }\n .await\n .change_context(ValidationError::InvalidValue {\n message: \"Failed while decrypting payment method data\".to_string(),\n })\n }\n\n async fn construct_new(self) -> CustomResult {\n Ok(Self::NewDstType {\n customer_id: self.customer_id,\n merchant_id: self.merchant_id,\n id: self.id,\n created_at: self.created_at,\n last_modified: self.last_modified,\n payment_method_type_v2: self.payment_method_type,\n payment_method_subtype: self.payment_method_subtype,\n payment_method_data: self.payment_method_data.map(|val| val.into()),\n locker_id: self.locker_id.map(|id| id.get_string_repr().clone()),\n last_used_at: self.last_used_at,\n connector_mandate_details: self.connector_mandate_details,\n customer_acceptance: self.customer_acceptance,\n status: self.status,\n network_transaction_id: self.network_transaction_id,\n client_secret: self.client_secret,\n payment_method_billing_address: self\n .payment_method_billing_address\n .map(|val| val.into()),\n updated_by: self.updated_by,\n locker_fingerprint_id: self.locker_fingerprint_id,\n version: self.version,\n network_token_requestor_reference_id: self.network_token_requestor_reference_id,\n network_token_locker_id: self.network_token_locker_id,\n network_token_payment_method_data: self\n .network_token_payment_method_data\n .map(|val| val.into()),\n transaction_flow: self.transaction_flow,\n })\n }" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payouts/helpers.rs::function::save_payout_data_to_locker", + "file": "crates/router/src/core/payouts/helpers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn save_payout_data_to_locker(\n _state: &SessionState,\n _payout_data: &mut PayoutData,\n _customer_id: &id_type::CustomerId,\n _payout_method_data: &api::PayoutMethodData,\n _merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n todo!()\n}", + "after_code": "pub async fn save_payout_data_to_locker(\n _state: &SessionState,\n _payout_data: &mut PayoutData,\n _customer_id: &id_type::CustomerId,\n _payout_method_data: &api::PayoutMethodData,\n _connector_mandate_details: Option,\n _merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n Ok(())\n}", + "diff_span": { + "before": " _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n todo!()\n}", + "after": " _customer_id: &id_type::CustomerId,\n _payout_method_data: &api::PayoutMethodData,\n _connector_mandate_details: Option,\n _merchant_account: &domain::MerchantAccount,\n _key_store: &domain::MerchantKeyStore,\n) -> RouterResult<()> {\n Ok(())\n}" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/router/src/core/payouts.rs::function::connector_mandate_id_is_none", + "file": "crates/router/src/core/payouts.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn connector_mandate_id_is_none(\n payout_data: &mut PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult {\n if let Some(pm) = &payout_data.payment_method {\n let connector_mandate_details = pm\n .connector_mandate_details\n .clone()\n .map(|details| {\n details.parse_value::(\n \"connector_mandate_details\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {\n if let Some(_mandate_reference_record) = connector_mandate_details\n .clone()\n .get_required_value(\"connector_mandate_details\")\n .change_context(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"there were no connector mandate details\")?\n .get(merchant_connector_id)\n {\n return Ok(false);\n }\n }\n return Ok(true);\n }\n Ok(true)\n}", + "after_code": "fn connector_mandate_id_is_none(\n payout_data: &mut PayoutData,\n connector_data: &api::ConnectorData,\n) -> RouterResult {\n #[cfg(all(\n any(feature = \"v2\", feature = \"v1\"),\n not(feature = \"payment_methods_v2\")\n ))]\n if let Some(pm) = &payout_data.payment_method {\n let connector_mandate_details = pm\n .connector_mandate_details\n .clone()\n .map(|details| {\n details.parse_value::(\n \"connector_mandate_details\",\n )\n })\n .transpose()\n .change_context(errors::ApiErrorResponse::InternalServerError)\n .attach_printable(\"unable to deserialize connector mandate details\")?;\n\n if let Some(merchant_connector_id) = connector_data.merchant_connector_id.as_ref() {\n if let Some(_mandate_reference_record) = connector_mandate_details\n .clone()\n .get_required_value(\"connector_mandate_details\")\n .change_context(errors::ApiErrorResponse::IncorrectPaymentMethodConfiguration)\n .attach_printable(\"there were no connector mandate details\")?\n .get(merchant_connector_id)\n {\n return Ok(false);\n }\n }\n return Ok(true);\n }\n Ok(true)\n}", + "diff_span": { + "before": "", + "after": " connector_data: &api::ConnectorData,\n) -> RouterResult {\n #[cfg(all(\n any(feature = \"v2\", feature = \"v1\"),\n not(feature = \"payment_methods_v2\")\n ))]\n if let Some(pm) = &payout_data.payment_method {\n let connector_mandate_details = pm" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/hyperswitch_domain_models/src/payment_methods.rs::struct::PaymentMethod", + "file": "crates/hyperswitch_domain_models/src/payment_methods.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_type: Option,\n pub payment_method_subtype: Option,\n pub payment_method_data:\n OptionalEncryptableJsonType,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: OptionalEncryptableValue,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: OptionalEncryptableValue,\n}", + "after_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_type: Option,\n pub payment_method_subtype: Option,\n pub payment_method_data:\n OptionalEncryptableJsonType,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: OptionalEncryptableValue,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: OptionalEncryptableValue,\n pub transaction_flow: Option,\n}", + "diff_span": { + "before": "", + "after": " pub network_token_locker_id: Option,\n pub network_token_payment_method_data: OptionalEncryptableValue,\n pub transaction_flow: Option,\n}" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + }, + { + "id": "crates/diesel_models/src/payment_method.rs::struct::PaymentMethod", + "file": "crates/diesel_models/src/payment_method.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n}", + "after_code": "pub struct PaymentMethod {\n pub customer_id: common_utils::id_type::GlobalCustomerId,\n pub merchant_id: common_utils::id_type::MerchantId,\n pub created_at: PrimitiveDateTime,\n pub last_modified: PrimitiveDateTime,\n pub payment_method_data: Option,\n pub locker_id: Option,\n pub last_used_at: PrimitiveDateTime,\n pub connector_mandate_details: Option,\n pub customer_acceptance: Option,\n pub status: storage_enums::PaymentMethodStatus,\n pub network_transaction_id: Option,\n pub client_secret: Option,\n pub payment_method_billing_address: Option,\n pub updated_by: Option,\n pub locker_fingerprint_id: Option,\n pub payment_method_type_v2: Option,\n pub payment_method_subtype: Option,\n pub id: common_utils::id_type::GlobalPaymentMethodId,\n pub version: common_enums::ApiVersion,\n pub network_token_requestor_reference_id: Option,\n pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}", + "diff_span": { + "before": "", + "after": " pub network_token_locker_id: Option,\n pub network_token_payment_method_data: Option,\n pub transaction_flow: Option,\n}" + }, + "commit_sha": "18bc1fdb8f8c88993c172585c405ae4b0d45edac" + } + ] +} \ No newline at end of file