8000 [ℹ️] NT-849 Adding id field to checkout model by eoji · Pull Request #735 · kickstarter/android-oss · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[ℹ️] NT-849 Adding id field to checkout model #735

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

Merged
merged 1 commit into from
Feb 13, 2020
Merged

[ℹ️] NT-849 Adding id field to checkout model #735

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
2 changes: 2 additions & 0 deletions app/src/main/graphql/checkout.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
mutation CreateBacking($projectId: ID!, $amount: String!, $paymentType: String!, $paymentSourceId: String!, $locationId: String, $rewardId: ID, $refParam: String) {
createBacking(input: {projectId: $projectId, amount: $amount, paymentType: $paymentType, paymentSourceId: $paymentSourceId, locationId: $locationId, rewardId: $rewardId, refParam: $refParam}) {
checkout {
id
backing {
clientSecret
requiresAction
Expand All @@ -20,6 +21,7 @@ mutation CancelBacking($backingId: ID!, $note: String) {
mutation UpdateBacking($backingId: ID!, $amount: String, $locationId: String, $rewardId: ID, $paymentSourceId: String) {
updateBacking(input: { id: $backingId, amount: $amount, locationId: $locationId, rewardId: $rewardId, paymentSourceId: $paymentSourceId}) {
checkout {
id
backing {
clientSecret
requiresAction
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/com/kickstarter/mock/factories/CheckoutFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.kickstarter.mock.factories

import com.kickstarter.models.Checkout

class CheckoutFactory private constructor() {
companion object {
fun requiresAction(requiresAction: Boolean): Checkout {
return Checkout.builder()
.id(IdFactory.id().toLong())
.backing(CheckoutBackingFactory.requiresAction(requiresAction))
.build()
}
}
}
10 changes: 5 additions & 5 deletions app/src/main/java/com/kickstarter/mock/services/MockApolloClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import UpdateUserCurrencyMutation
import UpdateUserEmailMutation
import UpdateUserPasswordMutation
import UserPrivacyQuery
import com.kickstarter.mock.factories.CheckoutBackingFactory
import com.kickstarter.mock.factories.CheckoutFactory
import com.kickstarter.mock.factories.StoredCardFactory
import com.kickstarter.models.*
import com.kickstarter.services.ApolloClientType
Expand All @@ -24,8 +24,8 @@ open class MockApolloClient : ApolloClientType {
return Observable.just(true)
}

override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(false))
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(false))
}

override fun clearUnseenActivity(): Observable<Int> {
Expand Down Expand Up @@ -58,8 +58,8 @@ open class MockApolloClient : ApolloClientType {
"12345")))
}

override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(false))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(false))
}

override fun updateUserCurrencyPreference(currency: CurrencyCode): Observable<UpdateUserCurrencyMutation.Data> {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/kickstarter/models/Checkout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import auto.parcel.AutoParcel

@AutoParcel
abstract class Checkout : Parcelable {
abstract fun id(): Long?
abstract fun backing(): Backing

@AutoParcel.Builder
abstract class Builder {
abstract fun id(id: Long?): Builder
abstract fun backing(backing: Backing): Builder
abstract fun build(): Checkout
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/kickstarter/services/ApolloClientType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type.CurrencyCode
interface ApolloClientType {
fun cancelBacking(backing: Backing, note: String): Observable<Any>

fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing>
fun createBacking(createBackingData: CreateBackingData): Observable<Checkout>

fun clearUnseenActivity(): Observable<Int>

Expand All @@ -33,7 +33,7 @@ interface ApolloClientType {

fun sendVerificationEmail(): Observable<SendEmailVerificationMutation.Data>

fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing>
fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout>

fun updateUserCurrencyPreference(currency: CurrencyCode): Observable<UpdateUserCurrencyMutation.Data>

Expand Down
18 changes: 12 additions & 6 deletions app/src/main/java/com/kickstarter/services/KSApolloClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
}
}

override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.defer {
val createBackingMutation = CreateBackingMutation.builder()
.projectId(encodeRelayId(createBackingData.project))
Expand All @@ -73,7 +73,7 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
.refParam(createBackingData.refTag?.tag())
.build()

val ps = PublishSubject.create<Checkout.Backing>()
val ps = PublishSubject.create<Checkout>()

this.service.mutate(createBackingMutation)
.enqueue(object : ApolloCall.Callback<CreateBackingMutation.Data>() {
Expand All @@ -92,7 +92,10 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
.requiresAction(checkoutPayload?.backing()?.requiresAction()?: false)
.build()

ps.onNext(backing)
ps.onNext(Checkout.builder()
.id(decodeRelayId(checkoutPayload?.id()))
.backing(backing)
.build())
ps.onCompleted()
}
})
Expand Down Expand Up @@ -291,7 +294,7 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
}
}

override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.defer {
val updateBackingMutation = UpdateBackingMutation.builder()
.backingId(encodeRelayId(updateBackingData.backing))
Expand All @@ -301,7 +304,7 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
.paymentSourceId(updateBackingData.paymentSourceId)
.build()

val ps = PublishSubject.create<Checkout.Backing>()
val ps = PublishSubject.create<Checkout>()
service.mutate(updateBackingMutation)
.enqueue(object : ApolloCall.Callback<UpdateBackingMutation.Data>() {
override fun onFailure(exception: ApolloException) {
Expand All @@ -319,7 +322,10 @@ class KSApolloClient(val service: ApolloClient) : ApolloClientType {
.requiresAction(checkoutPayload?.backing()?.requiresAction()?: false)
.build()

ps.onNext(backing)
ps.onNext(Checkout.builder()
.id(decodeRelayId(checkoutPayload?.id()))
.backing(backing)
.build())
ps.onCompleted()
}
})
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/kickstarter/viewmodels/PledgeFragmentViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,11 +891,12 @@ interface PledgeFragmentViewModel {
}
.share()

val createOrUpdateSuccess = Observable.merge(createBackingNotification, updateBackingNotification)
val successfulBacking = Observable.merge(createBackingNotification, updateBackingNotification)
.compose(values())
.map { it.backing() }
.filter { BooleanUtils.isFalse(it.requiresAction()) }

val successAndPledgeReason = Observable.merge(createOrUpdateSuccess,
val successAndPledgeReason = Observable.merge(successfulBacking,
this.stripeSetupResultSuccessful.filter { it == StripeIntentResult.Outcome.SUCCEEDED })
.compose<Pair<Any, PledgeReason>>(combineLatestPair(pledgeReason))

Expand All @@ -919,6 +920,7 @@ interface PledgeFragmentViewModel {

Observable.merge(createBackingNotification, updateBackingNotification)
.compose(values())
.map { it.backing() }
.filter { BooleanUtils.isTrue(it.requiresAction()) }
.map { it.clientSecret() }
.compose(bindToLifecycle())
Expand Down
50 changes: 25 additions & 25 deletions app/src/test/java/com/kickstarter/viewmodels/PledgeFragmentViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
.cookieManager(cookieManager)
.sharedPreferences(sharedPreferences)
.apolloClient(object : MockApolloClient() {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
//Assert that stored cookie is passed in
TestCase.assertEquals(createBackingData.refTag, RefTag.discovery())
return super.createBacking(createBackingData)
Expand Down Expand Up @@ -1506,7 +1506,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environment()
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.error(Exception("womp"))
}
})
Expand Down Expand Up @@ -1542,8 +1542,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -1572,8 +1572,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -1602,8 +1602,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -1665,7 +1665,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
}
})
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.error(Exception("womp"))
}
})
Expand Down Expand Up @@ -1697,7 +1697,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {

val environment = environment().toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.error(Exception("womp"))
}
})
Expand All @@ -1717,7 +1717,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForShippingRules(ShippingRulesEnvelopeFactory.shippingRules())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.error(Exception("womp"))
}
})
Expand All @@ -1736,7 +1736,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environment()
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.error(Exception("womp"))
}
})
Expand Down Expand Up @@ -1863,8 +1863,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -1904,8 +1904,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -1945,8 +1945,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun updateBacking(updateBackingData: UpdateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -2105,7 +2105,7 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
< BEA9 /td> override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.error(Throwable("error"))
}
})
Expand All @@ -2131,8 +2131,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -2162,8 +2162,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down Expand Up @@ -2194,8 +2194,8 @@ class PledgeFragmentViewModelTest : KSRobolectricTestCase() {
val environment = environmentForLoggedInUser(UserFactory.user())
.toBuilder()
.apolloClient(object : MockApolloClient() {
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout.Backing> {
return Observable.just(CheckoutBackingFactory.requiresAction(true))
override fun createBacking(createBackingData: CreateBackingData): Observable<Checkout> {
return Observable.just(CheckoutFactory.requiresAction(true))
}
})
.build()
Expand Down
0