Rename packages to packageIds in PaywallData (#1309)

RevenueCat · Oct 31, 2023 · b206fd6 · b206fd6
1 parent bcf2dca
commit b206fd6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/paywalls/PaywallData.kt
@@ -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.

diff --git a/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt b/purchases/src/test/java/com/revenuecat/purchases/paywalls/PaywallDataTest.kt
@@ -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")

diff --git a/...venuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt b/...venuecatui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/composables/Footer.kt
@@ -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,

diff --git a/...n/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt b/...n/com/revenuecat/purchases/ui/revenuecatui/data/processed/TemplateConfigurationFactory.kt
@@ -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,

diff --git a/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt b/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template1TestData.kt
@@ -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!!,

diff --git a/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt b/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template2TestData.kt
@@ -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!!,
             ),

diff --git a/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt b/...lin/com/revenuecat/purchases/ui/revenuecatui/data/testdata/templates/Template3TestData.kt
@@ -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(

diff --git a/.../main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt b/.../main/kotlin/com/revenuecat/purchases/ui/revenuecatui/extensions/PaywallDataExtensions.kt
@@ -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,

diff --git a/...src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt b/...src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/OfferingToStateMapper.kt
@@ -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,
         )

diff --git a/...tui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt b/...tui/src/test/kotlin/com/revenuecat/purchases/ui/revenuecatui/PaywallDataValidationTest.kt
@@ -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) {
@@ -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)