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

Rename packages to packageIds in PaywallData #1309

Merged
merged 4 commits into from
Oct 9, 2023
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 @@ -91,7 +91,7 @@ data class PaywallData(
/**
* The list of package identifiers this paywall will display.
*/
val packages: List<String>,
@SerialName("packages") val packageIds: List<String>,

/**
* The package to be selected by default.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class PaywallDataTest {
assertThat(paywall.templateName).isEqualTo("1")
assertThat(paywall.assetBaseURL).isEqualTo(URL("https://rc-paywalls.s3.amazonaws.com"))
assertThat(paywall.revision).isEqualTo(7)
assertThat(paywall.config.packages).containsExactly("\$rc_monthly", "\$rc_annual", "custom_package")
assertThat(paywall.config.packageIds).containsExactly("\$rc_monthly", "\$rc_annual", "custom_package")
assertThat(paywall.config.defaultPackage).isEqualTo("\$rc_annual")
assertThat(paywall.config.images.header).isEqualTo("header.jpg")
assertThat(paywall.config.images.background).isEqualTo("background.jpg")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private fun RowScope.Button(
private fun FooterPreview() {
Footer(
configuration = PaywallData.Configuration(
packages = listOf(),
packageIds = listOf(),
termsOfServiceURL = URL("https://revenuecat.com/tos"),
privacyURL = URL("https://revenuecat.com/privacy"),
displayRestorePurchases = true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal object TemplateConfigurationFactory {
variableDataProvider = variableDataProvider,
availablePackages = availablePackages,
activelySubscribedProductIdentifiers = activelySubscribedProductIdentifiers,
packageIdsInConfig = paywallData.config.packages,
packageIdsInConfig = paywallData.config.packageIds,
default = paywallData.config.defaultPackage,
localization = localizedConfiguration,
configurationType = template.configurationType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal val TestData.template1: PaywallData
get() = PaywallData(
templateName = PaywallTemplate.TEMPLATE_1.id,
config = PaywallData.Configuration(
packages = listOf(
packageIds = listOf(
PackageType.MONTHLY.identifier!!,
),
defaultPackage = PackageType.MONTHLY.identifier!!,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal val TestData.template2: PaywallData
get() = PaywallData(
templateName = PaywallTemplate.TEMPLATE_2.id,
config = PaywallData.Configuration(
packages = listOf(
packageIds = listOf(
PackageType.ANNUAL.identifier!!,
PackageType.MONTHLY.identifier!!,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ internal val TestData.template3: PaywallData
get() = PaywallData(
templateName = PaywallTemplate.TEMPLATE_3.id,
config = PaywallData.Configuration(
packages = listOf(
packageIds = listOf(
PackageType.MONTHLY.identifier!!,
),
images = PaywallData.Configuration.Images(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ internal fun PaywallData.Companion.createDefaultForIdentifiers(
return PaywallData(
templateName = PaywallData.defaultTemplate.id,
config = PaywallData.Configuration(
packages = packageIdentifiers,
packageIds = packageIdentifiers,
images = PaywallData.Configuration.Images(
background = PaywallData.defaultBackgroundImage,
icon = PaywallData.defaultAppIconPlaceholder,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal fun Offering.validatedPaywall(

val template = paywallData.validate().getOrElse {
return PaywallValidationResult(
PaywallData.createDefaultForIdentifiers(paywallData.config.packages, currentColorScheme),
PaywallData.createDefaultForIdentifiers(paywallData.config.packageIds, currentColorScheme),
PaywallData.defaultTemplate,
it as PaywallValidationError,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class PaywallDataValidationTest {
)

private fun verifyPackages(actual: PaywallData, expectation: PaywallData) {
assertThat(actual.config.packages).isEqualTo(expectation.config.packages)
assertThat(actual.config.packageIds).isEqualTo(expectation.config.packageIds)
}

private fun compareWithDefaultTemplate(displayablePaywall: PaywallData) {
Expand All @@ -144,7 +144,7 @@ class PaywallDataValidationTest {
assertThat(config.images.background).isEqualTo(defaultConfig.images.background)
assertThat(config.images.header).isEqualTo(defaultConfig.images.header)
assertThat(config.images.icon).isEqualTo(defaultConfig.images.icon)
assertThat(config.packages).containsExactly(*defaultConfig.packages.toTypedArray())
assertThat(config.packageIds).containsExactly(*defaultConfig.packageIds.toTypedArray())
assertThat(config.defaultPackage).isEqualTo(defaultConfig.defaultPackage)
assertThat(config.termsOfServiceURL).isEqualTo(defaultConfig.termsOfServiceURL)
assertThat(config.privacyURL).isEqualTo(defaultConfig.privacyURL)
Expand Down