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

NTV-438: Deprecate autoparcel for checkout #1583

Merged
merged 4 commits into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ package com.kickstarter.mock.factories

import com.kickstarter.models.Checkout

class CheckoutBackingFactory private constructor() {
companion object {
fun requiresAction(requiresAction: Boolean): Checkout.Backing {
return Checkout.Backing.builder()
.clientSecret(if (requiresAction) "boop" else null)
.requiresAction(requiresAction)
.build()
}
object CheckoutBackingFactory {
@JvmStatic
fun requiresAction(requiresAction: Boolean): Checkout.Backing {
return Checkout.Backing.builder()
.clientSecret(if (requiresAction) "boop" else null)
.requiresAction(requiresAction)
.build()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ 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()
}
object CheckoutFactory {
@JvmStatic
fun requiresAction(requiresAction: Boolean): Checkout {
return Checkout.builder()
.id(IdFactory.id().toLong())
.backing(CheckoutBackingFactory.requiresAction(requiresAction))
.build()
}
}
96 changes: 67 additions & 29 deletions app/src/main/java/com/kickstarter/models/Checkout.kt
Original file line number Diff line number Diff line change
@@ -1,49 +1,87 @@
package com.kickstarter.models

import android.os.Parcelable
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
import kotlinx.parcelize.Parcelize

@Parcelize
class Checkout private constructor(
private val id: Long?,
private val backing: Backing,
) : Parcelable {
fun id() = this.id
fun backing() = this.backing

@Parcelize
data class Builder(
private var id: Long? = null,
private var backing: Backing = Backing.builder().build()
) : Parcelable {
fun id(id: Long?) = apply { this.id = id }
fun backing(backing: Backing) = apply { this.backing = backing }
fun build() = Checkout(
id = id,
backing = backing
)
}

abstract fun toBuilder(): Builder
fun toBuilder() = Builder(
id = id,
backing = backing
)

companion object {
@JvmStatic
fun builder() = Builder()
}

fun builder(): Builder {
return AutoParcel_Checkout.Builder()
override fun equals(obj: Any?): Boolean {
var equals = super.equals(obj)
if (obj is Checkout) {
equals = id() == obj.id() &&
backing() == obj.backing()
}
return equals
}

@AutoParcel
abstract class Backing : Parcelable {
@Parcelize
data class Backing private constructor(
private val clientSecret: String?,
private val requiresAction: Boolean,
) : Parcelable {

fun clientSecret() = this.clientSecret
fun requiresAction() = this.requiresAction

abstract fun clientSecret(): String?
abstract fun requiresAction(): Boolean
@Parcelize
data class Builder(
private var clientSecret: String? = null,
private var requiresAction: Boolean = false,
) : Parcelable {
fun clientSecret(clientSecret: String?) = apply { this.clientSecret = clientSecret }
fun requiresAction(requiresAction: Boolean) = apply { this.requiresAction = requiresAction }
fun build() = Backing(
clientSecret = clientSecret,
requiresAction = requiresAction
)
}

@AutoParcel.Builder
abstract class Builder {
abstract fun clientSecret(secret: String?): Builder
abstract fun requiresAction(requiresAction: Boolean): Builder
abstract fun build(): Backing
override fun equals(obj: Any?): Boolean {
var equals = super.equals(obj)
if (obj is Backing) {
equals = clientSecret() == obj.clientSecret() &&
requiresAction() == obj.requiresAction()
}
return equals
}
fun toBuilder() = Builder(
clientSecret = clientSecret,
requiresAction = requiresAction

abstract fun toBuilder(): Builder
)

companion object {

fun builder(): Builder {
return AutoParcel_Checkout_Backing.Builder()
}
@JvmStatic
fun builder() = Builder()
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/kickstarter/models/SurveyResponse.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SurveyResponse private constructor(

@Parcelize
data class Builder(
private var answeredAt: DateTime? = DateTime.now(),
private var answeredAt: DateTime? = null,
private var id: Long = 0L,
private var project: Project? = null,
private var urls: Urls? = null
Expand Down
55 changes: 55 additions & 0 deletions app/src/test/java/com/kickstarter/models/CheckoutTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package com.kickstarter.models

import com.kickstarter.KSRobolectricTestCase
import com.kickstarter.mock.factories.CheckoutBackingFactory
import com.kickstarter.mock.factories.CheckoutFactory
import org.junit.Test

class CheckoutTest : KSRobolectricTestCase() {

@Test
fun testDefaultInit() {
val backing = Checkout.Backing.builder()
.requiresAction(true)
.build()

val checkout = Checkout.builder()
.id(1234L)
.backing(backing)
.build()

assertEquals(checkout.id(), 1234L)
assertEquals(checkout.backing(), backing)
assertEquals(backing.requiresAction(), true)
assertEquals(backing.clientSecret(), null)
}

@Test
fun testDefaultWebInit() {

val backing = Checkout.Backing.builder().build().toBuilder().requiresAction(false).build()
assertFalse(backing.requiresAction())

val checkout = Checkout.builder().build().toBuilder().backing(backing).build()
assertEquals(checkout.backing(), backing)
}

@Test
fun testCheckout_equalFalse() {
val checkout = CheckoutFactory.requiresAction(false)
val checkout2 = Checkout.builder().backing(CheckoutBackingFactory.requiresAction(true)).build()
val checkout3 = Checkout.builder().id(5678L).build()

assertFalse(checkout == checkout2)
assertFalse(checkout == checkout3)
assertFalse(checkout3 == checkout2)
}

@Test
fun testCheckout_equalTrue() {
val checkout1 = Checkout.builder().build()
val checkout2 = Checkout.builder().build()

assertEquals(checkout1, checkout2)
}
}