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.

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

Add Card.toPaymentMethodsParams() #1706

Merged
merged 1 commit into from
Oct 15, 2019
Merged

Add Card.toPaymentMethodsParams() #1706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions stripe/src/main/java/com/stripe/android/model/Card.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,28 @@ class Card private constructor(
}
}

fun toPaymentMethodsParams(): PaymentMethodCreateParams {
return PaymentMethodCreateParams.create(
toPaymentMethodParamsCard(),
PaymentMethod.BillingDetails.Builder()
.setName(name)
.setAddress(
Address.Builder()
.setLine1(addressLine1)
.setLine2(addressLine2)
.setCity(addressCity)
.setState(addressState)
.setCountry(addressCountry)
.setPostalCode(addressZip)
.build()
)
.build()
)
}

/**
* Use [toPaymentMethodsParams] to include Billing Details
*/
fun toPaymentMethodParamsCard(): PaymentMethodCreateParams.Card {
return PaymentMethodCreateParams.Card.Builder()
.setNumber(number)
Expand Down
73 changes: 46 additions & 27 deletions stripe/src/test/java/com/stripe/android/model/CardTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ class CardTest {

@Test
fun fromString_whenStringIsValidJson_returnsExpectedCard() {
val expectedCard = createUsdCard()
val expectedCard = CARD_USD
val actualCard = Card.fromJson(JSON_CARD_USD)
assertEquals(expectedCard, actualCard)
}
Expand Down Expand Up @@ -641,6 +641,29 @@ class CardTest {
assertEquals(card, card.toBuilder().build())
}

@Test
fun toPaymentMethodsParams() {
val actual = CARD_USD.toPaymentMethodsParams()
val expected = PaymentMethodCreateParams.create(
PaymentMethodCreateParams.Card.Builder()
.setExpiryMonth(8)
.setExpiryYear(2017)
.build(),
PaymentMethod.BillingDetails.Builder()
.setName("John Cardholder")
.setAddress(Address.Builder()
.setLine1("123 Any Street")
.setLine2("456")
.setCity("Des Moines")
.setState("IA")
.setPostalCode("50305")
.setCountry("US")
.build())
.build()
)
assertEquals(expected, actual)
}

companion object {
private const val YEAR_IN_FUTURE: Int = 2100

Expand Down Expand Up @@ -678,33 +701,29 @@ class CardTest {

private const val BAD_JSON: String = "{ \"id\": "

private fun createUsdCard(): Card {
val metadata = mapOf(
internal val CARD_USD = Card.Builder(null, 8, 2017, null)
.brand(Card.CardBrand.VISA)
.funding(Card.FundingType.CREDIT)
.last4("4242")
.id("card_189fi32eZvKYlo2CHK8NPRME")
.country("US")
.currency("usd")
.addressCountry("US")
.addressCity("Des Moines")
.addressState("IA")
.addressZip("50305")
.addressZipCheck("unavailable")
.addressLine1("123 Any Street")
.addressLine1Check("unavailable")
.addressLine2("456")
.name("John Cardholder")
.cvcCheck("unavailable")
.customer("customer77")
.fingerprint("abc123")
.metadata(mapOf(
"color" to "blue",
"animal" to "dog"
)

return Card.Builder(null, 8, 2017, null)
.brand(Card.CardBrand.VISA)
.funding(Card.FundingType.CREDIT)
.last4("4242")
.id("card_189fi32eZvKYlo2CHK8NPRME")
.country("US")
.currency("usd")
.addressCountry("US")
.addressCity("Des Moines")
.addressState("IA")
.addressZip("50305")
.addressZipCheck("unavailable")
.addressLine1("123 Any Street")
.addressLine1Check("unavailable")
.addressLine2("456")
.name("John Cardholder")
.cvcCheck("unavailable")
.customer("customer77")
.fingerprint("abc123")
.metadata(metadata)
.build()
}
))
.build()
}
}