Skip to content
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.

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

fix(payment_methos): prioritized apple_pay_combined deserialization over apple_pay #2393

Merged
merged 5 commits into from
Oct 3, 2023

Conversation

ShankarSinghC
Copy link
Contributor

@ShankarSinghC ShankarSinghC commented Sep 29, 2023

Type of Change

  • Bugfix
  • New feature
  • Enhancement
  • Refactoring
  • Dependency updates
  • Documentation
  • CI/CD

Description

When the merchant_connector_account metadata contains both apple_pay and apple_pay_combined apple_pay data gets deserialized and it is used for the session call. But we expect apple_pay_combined to be used as it will contain the updated data. This pr contains the change in which the data is first deserialized into apple_pay_combined and then into apple_pay if it fails. By this we ensure apple_pay_combined is prioritized over apple_pay.

Additional Changes

  • This PR modifies the API contract
  • This PR modifies the database schema
  • This PR modifies application configuration/environment variables

Motivation and Context

How did you test it?

Screenshot 2023-09-29 at 3 56 07 PM Screenshot 2023-09-29 at 3 55 43 PM bluesnap session call Screenshot 2023-09-29 at 4 50 22 PM image

Test case :-
-> For the existing merchant update the new apple pay details and verify the apple pay payment.
-> Also manual apple pay flow for bluesnap and simplified apple pay flow for bluesnap needs to be tested.

Checklist

  • I formatted the code cargo +nightly fmt --all
  • I addressed lints thrown by cargo clippy
  • I reviewed the submitted code
  • I added unit tests for my changes where possible
  • I added a CHANGELOG entry if applicable

@ShankarSinghC ShankarSinghC added A-core Area: Core flows C-bug Category: Bug S-waiting-on-review Status: This PR has been implemented and needs to be reviewed A-payment-methods Area: Payment Methods R-waiting-on-L1 Review: Waiting on L1 reviewer labels Sep 29, 2023
@ShankarSinghC ShankarSinghC requested review from a team as code owners September 29, 2023 11:25
@ShankarSinghC ShankarSinghC self-assigned this Sep 29, 2023
@ShankarSinghC ShankarSinghC requested a review from a team as a code owner September 29, 2023 11:25
Sangamesh26
Sangamesh26 previously approved these changes Sep 29, 2023
@pixincreate pixincreate changed the title fix(payment_methos): prioritized apple_pay_combained deserialization over apple_pay fix(payment_methos): prioritized apple_pay_combined deserialization over apple_pay Sep 30, 2023
@vspecky vspecky added this pull request to the merge queue Oct 3, 2023
Merged via the queue into main with commit f12ce9c Oct 3, 2023
10 checks passed
@vspecky vspecky deleted the fix_apple_pay_dsr branch October 3, 2023 07:32
@SanchithHegde SanchithHegde removed S-waiting-on-review Status: This PR has been implemented and needs to be reviewed R-waiting-on-L1 Review: Waiting on L1 reviewer labels Oct 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-core Area: Core flows A-payment-methods Area: Payment Methods C-bug Category: Bug
Projects
No open projects
Status: Merged
Development

Successfully merging this pull request may close these issues.

4 participants