Skip to content

fix(router): correct payment_method_data parsing in list-payments response #13135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayush22667 wants to merge 2 commits into
base: main
Choose a base branch
from
+34 −9
Open

fix(router): correct payment_method_data parsing in list-payments response #13135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
701cadf
fix(router): correct payment_method_data parsing in list-payments res…
ayush22667 Jul 2, 2026
2abb83c
chore: empty commit to trigger tests
ayush22667 Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 34 additions & 9 deletions crates/router/src/core/payments/transformers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4600,6 +4600,39 @@ pub fn construct_connector_invoke_hidden_frame(
impl ForeignFrom<(storage::PaymentIntent, storage::PaymentAttempt)> for api::PaymentsResponse {
fn foreign_from((pi, pa): (storage::PaymentIntent, storage::PaymentAttempt)) -> Self {
let connector_transaction_id = pa.get_connector_payment_id().map(ToString::to_string);
// Build `payment_method_data` by first parsing the stored column as
// `AdditionalPaymentData` and then converting via `PaymentMethodDataResponse::from`
let payment_method_data = pa
.check_and_get_payment_method_data_based_on_encryption_strategy()
.and_then(|data| match data {
serde_json::Value::Null => {
router_env::logger::debug!(
payment_attempt_id = ?pa.attempt_id,
"No additional payment method data present for payment attempt"
);
None
}
_ => match data.parse_value::<api_models::payments::AdditionalPaymentData>(

@Sakilmostak Sakilmostak Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of wild card, parse only in case of json

"AdditionalPaymentData",
) {
Ok(additional_payment_data) => {
Some(api_models::payments::PaymentMethodDataResponseWithBilling {
payment_method_data: Some(api::PaymentMethodDataResponse::from(
additional_payment_data,
)),
billing: None,
})
}
Err(e) => {
router_env::logger::error!(
payment_attempt_id = ?pa.attempt_id,
error = ?e,
"Failed to parse 'AdditionalPaymentData' from payment method data"
);
None
}
},
});
Self {
connector_response_metadata: pa.get_connector_response_metadata_from_attempt_metadata(),
payment_id: pi.payment_id,
Expand Down Expand Up @@ -4629,15 +4662,7 @@ impl ForeignFrom<(storage::PaymentIntent, storage::PaymentAttempt)> for api::Pay
attempt_count: pi.attempt_count,
profile_id: pi.profile_id,
merchant_connector_id: pa.merchant_connector_id,
payment_method_data: pa.payment_method_data.and_then(|data| {
match data.parse_value("PaymentMethodDataResponseWithBilling") {
Ok(parsed_data) => Some(parsed_data),
Err(e) => {
router_env::logger::error!("Failed to parse 'PaymentMethodDataResponseWithBilling' from payment method data. Error: {e:?}");
None
}
}
}),
payment_method_data,
merchant_order_reference_id: pi.merchant_order_reference_id,
customer: pi.customer_details.and_then(|customer_details|
match customer_details.into_inner().expose().parse_value::<CustomerData>("CustomerData"){
Expand Down
Loading