MBL-1123: Refactor PaymentSourceSelected to be an enum #1990
+71
−130
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amy-at-kickstarter
force-pushed
the
feat/adyer/MBL-1123/refactor-payment-source-selected
branch
from
d4e0064
to
67bb693
Compare
amy-at-kickstarter
changed the title
| @@ -0,0 +1,25 @@ | |||
| import Foundation | |||
| public enum PaymentSourceSelected: Equatable { | |||
| case paymentSourceId(String) | |||
There was a problem hiding this comment.
Suggestions for better names welcome - as far as I know, this is an ID that comes from GraphQL and represents a particular payment methods stored in our own DB.
| ) | ||
| PaymentSourceSelected.paymentSourceId(UserCreditCards.visa.id), | ||
| PaymentSourceSelected | ||
| .setupIntentClientSecret("seti_1LVlHO4VvJ2PtfhK43R6p7FI_secret_MEDiGbxfYVnHGsQy8v8TbZJTQhlNKLZ") | ||
| ]) |
There was a problem hiding this comment.
This is a good example of how these are different now.
amy-at-kickstarter
force-pushed
the
feat/adyer/MBL-1123/refactor-payment-source-selected
branch
from
67bb693
to
9572634
Compare
amy-at-kickstarter
requested review from
a team,
ifosli and
scottkicks
and removed request for
a team
scottkicks
approved these changes
Mar 20, 2024
Comment on lines
6
to
23
| public var paymentSourceId: String? { | ||
| if case let .paymentSourceId(value) = self { | ||
| return value | ||
| } else { | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| public var setupIntentClientSecret: String? { | ||
| if case let .setupIntentClientSecret(value) = self { | ||
| return value | ||
| } else { | ||
| return nil | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
any particular reason you didn't want to use switch statements here?
There was a problem hiding this comment.
Hm, not really. Just tried it out and it's a little neater looking, so I'll swap these.
Comment on lines
-263
to
+264
| paymentSourceId: selectedPaymentSheetPaymentMethodCardId, | ||
| isSetupIntentClientSecret: true | ||
| ) | ||
| return PaymentSourceSelected.setupIntentClientSecret(selectedPaymentSheetPaymentMethodCardId) | ||
| case let (.some(selectedPaymentMethodCardId), .none): | ||
| return PaymentSourceSelected( | ||
| paymentSourceId: selectedPaymentMethodCardId, | ||
| isSetupIntentClientSecret: false | ||
| ) | ||
| return PaymentSourceSelected.paymentSourceId(selectedPaymentMethodCardId) |
amy-at-kickstarter
force-pushed
the
feat/adyer/MBL-1123/refactor-payment-source-selected
branch
from
9572634
to
fefa917
Compare
amy-at-kickstarter
force-pushed
the
feat/adyer/MBL-1123/refactor-payment-source-selected
branch
from
fefa917
to
5bb1591
Compare
|
Ran two manual tests on staging - I made a pledge with an existing card, and another pledge that was adding a new card. |
amy-at-kickstarter
deleted the
feat/adyer/MBL-1123/refactor-payment-source-selected
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📲 What
Refactor
PaymentSourceSelectedto be anenum, instead of astruct.🤔 Why
For
MBL-1123, I'm adding another type of payment source toPledgeViewModel. We start to createPaymentIntentsecrets, which are a separate kind of client secret from our existingSetupIntentsecrets.Before, the different between payment types was modeled by storing the payment source ID and a boolean, which flagged whether or not the string was a stripe token or a Kickstarter ID.
After, this is modeled as an enum, so that it should be much clearer what kind of payment source we're passing around the codebase. As a bonus, this actually deleted a few lines of redundant code, since it makes the plumbing a little simpler.
When I finish this ticket, we'll have an enum like this: