Refactor presentedOfferingIdentifier into presentedOfferingContext object

api-tester/src/main/java/com/revenuecat/apitester/java/PackageAPI.java

@@ -2,6 +2,7 @@
 
 import com.revenuecat.purchases.Package;
 import com.revenuecat.purchases.PackageType;
+import com.revenuecat.purchases.PresentedOfferingContext;
 import com.revenuecat.purchases.models.StoreProduct;
 
 @SuppressWarnings({"unused"})
@@ -11,6 +12,7 @@ static void check(final Package p) {
         final PackageType packageType = p.getPackageType();
         final StoreProduct product = p.getProduct();
         final String offering = p.getOffering();
+        final PresentedOfferingContext offeringContext = p.getPresentedOfferingContext();
     }
 
     static void check(final PackageType type) {

api-tester/src/main/java/com/revenuecat/apitester/java/PresentedOfferingContextAPI.java

@@ -0,0 +1,14 @@
+package com.revenuecat.apitester.java;
+
+import com.revenuecat.purchases.PresentedOfferingContext;
+
+@SuppressWarnings({"unused"})
+final class PresentedOfferingContextAPI {
+    static void check(final PresentedOfferingContext presentedOfferingContext) {
+        final String offeringIdentifier = presentedOfferingContext.getOfferingIdentifier();
+    }
+
+    static void checkConstructor(final String offeringIdentifier) {
+        final PresentedOfferingContext presentedOfferingContext = new PresentedOfferingContext(offeringIdentifier);
+    }
+}

api-tester/src/main/java/com/revenuecat/apitester/java/StoreProductAPI.java

@@ -1,6 +1,7 @@
 package com.revenuecat.apitester.java;
 
 import com.android.billingclient.api.ProductDetails;
+import com.revenuecat.purchases.PresentedOfferingContext;
 import com.revenuecat.purchases.ProductType;
 import com.revenuecat.purchases.amazon.AmazonStoreProduct;
 import com.revenuecat.purchases.amazon.AmazonStoreProductKt;
@@ -16,7 +17,7 @@
 
 import java.util.Locale;
 
-@SuppressWarnings({"unused"})
+@SuppressWarnings({"unused", "deprecation"})
 final class StoreProductAPI {
     static void check(final StoreProduct product) {
         final Locale locale = Locale.getDefault();
@@ -36,9 +37,13 @@ static void check(final StoreProduct product) {
         SubscriptionOptions subscriptionOptions = product.getSubscriptionOptions();
         SubscriptionOption defaultOption = product.getDefaultOption();
         String presentedOfferingIdentifier = product.getPresentedOfferingIdentifier();
+        PresentedOfferingContext presentedOfferingContext = product.getPresentedOfferingContext();
 
         GoogleStoreProduct underlyingGoogleProduct = GoogleStoreProductKt.getGoogleProduct(product);
         AmazonStoreProduct underlyingAmazonProduct = AmazonStoreProductKt.getAmazonProduct(product);
+
+        final StoreProduct copyWithOfferingId = product.copyWithOfferingId("offeringId");
+        final StoreProduct copyWithContext = product.copyWithPresentedOfferingContext(new PresentedOfferingContext("offeringId"));
     }
 
     static void check(final ProductType type) {
@@ -85,12 +90,14 @@ static void checkGoogleStoreProduct(GoogleStoreProduct googleStoreProduct) {
                 null,
                 googleStoreProduct.getType(),
                 googleStoreProduct.getPrice(),
+                googleStoreProduct.getName(),
                 googleStoreProduct.getTitle(),
                 googleStoreProduct.getDescription(),
                 null,
                 null,
                 null,
                 googleStoreProduct.getProductDetails(),
+                null,
                 null
         );
 

api-tester/src/main/java/com/revenuecat/apitester/java/StoreTransactionAPI.java

@@ -1,5 +1,6 @@
 package com.revenuecat.apitester.java;
 
+import com.revenuecat.purchases.PresentedOfferingContext;
 import com.revenuecat.purchases.ProductType;
 import com.revenuecat.purchases.ProrationMode;
 import com.revenuecat.purchases.ReplacementMode;
@@ -25,6 +26,7 @@ static void check(final StoreTransaction transaction) {
         final String signature = transaction.getSignature();
         final JSONObject originalJson = transaction.getOriginalJson();
         final String presentedOfferingIdentifier = transaction.getPresentedOfferingIdentifier();
+        final PresentedOfferingContext presentedOfferingContext = transaction.getPresentedOfferingContext();
         final String su1 = transaction.getStoreUserID();
         final PurchaseType purchaseType = transaction.getPurchaseType();
         final String marketplace = transaction.getMarketplace();
@@ -33,6 +35,24 @@ static void check(final StoreTransaction transaction) {
         final ProrationMode prorationMode = transaction.getProrationMode();
 
         StoreTransaction constructedStoreTransaction = new StoreTransaction(
+                transaction.getOrderId(),
+                transaction.getProductIds(),
+                transaction.getType(),
+                transaction.getPurchaseTime(),
+                transaction.getPurchaseToken(),
+                transaction.getPurchaseState(),
+                transaction.isAutoRenewing(),
+                transaction.getSignature(),
+                transaction.getOriginalJson(),
+                transaction.getPresentedOfferingContext(),
+                transaction.getStoreUserID(),
+                transaction.getPurchaseType(),
+                transaction.getMarketplace(),
+                transaction.getSubscriptionOptionId(),
+                transaction.getReplacementMode()
+        );
+
+        StoreTransaction constructedStoreTransactionWithOfferingId = new StoreTransaction(
                 transaction.getOrderId(),
                 transaction.getProductIds(),
                 transaction.getType(),

api-tester/src/main/java/com/revenuecat/apitester/java/SubscriptionOptionAPI.java

@@ -1,6 +1,7 @@
 package com.revenuecat.apitester.java;
 
 import com.android.billingclient.api.ProductDetails;
+import com.revenuecat.purchases.PresentedOfferingContext;
 import com.revenuecat.purchases.models.GoogleSubscriptionOption;
 import com.revenuecat.purchases.models.PricingPhase;
 import com.revenuecat.purchases.models.PurchasingData;
@@ -16,6 +17,7 @@ static void checkSubscriptionOption(SubscriptionOption subscriptionOption) {
         List<String> tags = subscriptionOption.getTags();
         Boolean isBasePlan = subscriptionOption.isBasePlan();
         String presentedOfferingId = subscriptionOption.getPresentedOfferingIdentifier();
+        PresentedOfferingContext presentedOfferingContext = subscriptionOption.getPresentedOfferingContext();
         PurchasingData purchasingData = subscriptionOption.getPurchasingData();
         String id = subscriptionOption.getId();
         Boolean isPrepaid = subscriptionOption.isPrepaid();
@@ -30,6 +32,16 @@ static void checkGoogleSubscriptionOption(GoogleSubscriptionOption googleSubscri
         ProductDetails productDetails = googleSubscriptionOption.getProductDetails();
 
         GoogleSubscriptionOption constructedGoogleSubOption = new GoogleSubscriptionOption(
+                productId,
+                basePlanId,
+                offerId,
+                googleSubscriptionOption.getPricingPhases(),
+                googleSubscriptionOption.getTags(),
+                productDetails,
+                offerToken
+        );
+
+        GoogleSubscriptionOption constructedGoogleSubOptionWithOfferingId = new GoogleSubscriptionOption(
                 productId,
                 basePlanId,
                 offerId,
@@ -39,6 +51,17 @@ static void checkGoogleSubscriptionOption(GoogleSubscriptionOption googleSubscri
                 offerToken,
                 googleSubscriptionOption.getPresentedOfferingIdentifier()
         );
+
+        GoogleSubscriptionOption constructedGoogleSubOptionWithPresentedContext = new GoogleSubscriptionOption(
+                productId,
+                basePlanId,
+                offerId,
+                googleSubscriptionOption.getPricingPhases(),
+                googleSubscriptionOption.getTags(),
+                productDetails,
+                offerToken,
+                googleSubscriptionOption.getPresentedOfferingContext()
+        );
     }
 
 }

api-tester/src/main/java/com/revenuecat/apitester/java/TestStoreProductAPI.java

@@ -2,11 +2,12 @@
 
 import com.revenuecat.purchases.models.Period;
 import com.revenuecat.purchases.models.Price;
+import com.revenuecat.purchases.models.StoreProduct;
 import com.revenuecat.purchases.models.TestStoreProduct;
 
-@SuppressWarnings({"unused"})
+@SuppressWarnings({"unused", "deprecation"})
 final class TestStoreProductAPI {
-    static void check(final Price price, final Period period) {
+    static void checkConstructors(final Price price, final Period period) {
         new TestStoreProduct(
                 "id", "title", "description", price, period, null, null
         );
@@ -20,4 +21,8 @@ static void check(final Price price, final Period period) {
             "id", "name", "title", "description", price, period, period, price
         );
     }
+
+    static void checkTestStoreProductIsStoreProduct(final TestStoreProduct testStoreProduct) {
+        StoreProduct storeProduct = testStoreProduct;
+    }
 }

api-tester/src/main/java/com/revenuecat/apitester/kotlin/PackageAPI.kt

@@ -2,6 +2,7 @@ package com.revenuecat.apitester.kotlin
 
 import com.revenuecat.purchases.Package
 import com.revenuecat.purchases.PackageType
+import com.revenuecat.purchases.PresentedOfferingContext
 import com.revenuecat.purchases.models.StoreProduct
 
 @Suppress("unused", "UNUSED_VARIABLE")
@@ -12,6 +13,7 @@ private class PackageAPI {
             val packageType: PackageType = packageType
             val product: StoreProduct = product
             val offering: String = offering
+            val presentedOfferingContext: PresentedOfferingContext = presentedOfferingContext
         }
     }
 

api-tester/src/main/java/com/revenuecat/apitester/kotlin/PresentedOfferingContextAPI.kt

@@ -0,0 +1,14 @@
+package com.revenuecat.apitester.kotlin
+
+import com.revenuecat.purchases.PresentedOfferingContext
+
+@Suppress("unused", "UNUSED_VARIABLE")
+private class PresentedOfferingContextAPI {
+    fun check(presentedOfferingContext: PresentedOfferingContext) {
+        val offeringIdentifier: String = presentedOfferingContext.offeringIdentifier
+    }
+
+    fun checkConstructor(offeringId: String) {
+        val presentedOfferingContext = PresentedOfferingContext(offeringId)
+    }
+}

api-tester/src/main/java/com/revenuecat/apitester/kotlin/StoreProductAPI.kt

@@ -1,6 +1,7 @@
 package com.revenuecat.apitester.kotlin
 
 import com.android.billingclient.api.ProductDetails
+import com.revenuecat.purchases.PresentedOfferingContext
 import com.revenuecat.purchases.ProductType
 import com.revenuecat.purchases.amazon.AmazonStoreProduct
 import com.revenuecat.purchases.amazon.amazonProduct
@@ -14,15 +15,15 @@ import com.revenuecat.purchases.models.googleProduct
 import org.json.JSONObject
 import java.util.Locale
 
-@Suppress("unused", "UNUSED_VARIABLE", "LongMethod")
+@Suppress("unused", "UNUSED_VARIABLE", "LongMethod", "DEPRECATION")
 private class StoreProductAPI {
     fun check(product: StoreProduct) {
         val locale = Locale.getDefault()
         with(product) {
             val storeProductId: String = id
             val sku: String = sku
             val type: ProductType = type
-            val price: Price? = price
+            val price: Price = price
             val formattedPricePerMonth: String? = formattedPricePerMonth(locale)
             val formattedPricePerMonthNoLocale: String? = formattedPricePerMonth()
             val pricePerWeek: Price? = pricePerWeek(locale)
@@ -38,8 +39,12 @@ private class StoreProductAPI {
             val subscriptionOptions: SubscriptionOptions? = subscriptionOptions
             val defaultOption: SubscriptionOption? = defaultOption
             val presentedOfferingIdentifier: String? = presentedOfferingIdentifier
+            val presentedOfferingContext: PresentedOfferingContext? = presentedOfferingContext
             val underlyingGoogleProduct: GoogleStoreProduct? = googleProduct
             val underlyingAmazonProduct: AmazonStoreProduct? = amazonProduct
+            val copiedProductWithOfferingId: StoreProduct = copyWithOfferingId("offeringId")
+            val copiedProduct: StoreProduct = copyWithPresentedOfferingContext(null)
+            val copiedProduct2: StoreProduct = copyWithPresentedOfferingContext(PresentedOfferingContext("offeringId"))
         }
     }
 
@@ -67,6 +72,21 @@ private class StoreProductAPI {
             googleStoreProduct.productDetails,
         )
 
+        val constructedGoogleStoreProductWithNullOfferingId = GoogleStoreProduct(
+            googleStoreProduct.id,
+            null,
+            googleStoreProduct.type,
+            googleStoreProduct.price,
+            googleStoreProduct.name,
+            googleStoreProduct.title,
+            googleStoreProduct.description,
+            googleStoreProduct.period,
+            googleStoreProduct.subscriptionOptions,
+            googleStoreProduct.defaultOption,
+            googleStoreProduct.productDetails,
+            null,
+        )
+
         val constructedGoogleStoreProductWithOfferingId = GoogleStoreProduct(
             googleStoreProduct.id,
             null,
@@ -78,7 +98,7 @@ private class StoreProductAPI {
             googleStoreProduct.subscriptionOptions,
             googleStoreProduct.defaultOption,
             googleStoreProduct.productDetails,
-            googleStoreProduct.presentedOfferingIdentifier,
+            "offeringId",
         )
 
         val constructedGoogleStoreProductWithName = GoogleStoreProduct(
@@ -93,7 +113,6 @@ private class StoreProductAPI {
             googleStoreProduct.subscriptionOptions,
             googleStoreProduct.defaultOption,
             googleStoreProduct.productDetails,
-            googleStoreProduct.presentedOfferingIdentifier,
         )
 
         val constructedGoogleStoreProductWithNameButNoOfferingId = GoogleStoreProduct(
@@ -131,6 +150,38 @@ private class StoreProductAPI {
             amazonStoreProduct.originalProductJSON,
         )
 
+        val constructedAmazonStoreProductWithContext = AmazonStoreProduct(
+            amazonStoreProduct.id,
+            amazonStoreProduct.type,
+            amazonStoreProduct.name,
+            amazonStoreProduct.title,
+            amazonStoreProduct.description,
+            amazonStoreProduct.period,
+            amazonStoreProduct.price,
+            amazonStoreProduct.subscriptionOptions,
+            amazonStoreProduct.defaultOption,
+            amazonStoreProduct.iconUrl,
+            amazonStoreProduct.freeTrialPeriod,
+            amazonStoreProduct.originalProductJSON,
+            PresentedOfferingContext("offeringId"),
+        )
+
+        val constructedAmazonStoreProductWithNullContext = AmazonStoreProduct(
+            amazonStoreProduct.id,
+            amazonStoreProduct.type,
+            amazonStoreProduct.name,
+            amazonStoreProduct.title,
+            amazonStoreProduct.description,
+            amazonStoreProduct.period,
+            amazonStoreProduct.price,
+            amazonStoreProduct.subscriptionOptions,
+            amazonStoreProduct.defaultOption,
+            amazonStoreProduct.iconUrl,
+            amazonStoreProduct.freeTrialPeriod,
+            amazonStoreProduct.originalProductJSON,
+            null,
+        )
+
         val constructedAmazonStoreProductWithOfferingId = AmazonStoreProduct(
             amazonStoreProduct.id,
             amazonStoreProduct.type,
@@ -174,7 +225,7 @@ private class StoreProductAPI {
             amazonStoreProduct.iconUrl,
             amazonStoreProduct.freeTrialPeriod,
             amazonStoreProduct.originalProductJSON,
-            amazonStoreProduct.presentedOfferingIdentifier,
+            amazonStoreProduct.presentedOfferingContext,
         )
         val iconUrl: String = amazonStoreProduct.iconUrl
         val freeTrialPeriod: Period? = amazonStoreProduct.freeTrialPeriod

api-tester/src/main/java/com/revenuecat/apitester/kotlin/StoreTransactionAPI.kt

@@ -1,5 +1,6 @@
 package com.revenuecat.apitester.kotlin
 
+import com.revenuecat.purchases.PresentedOfferingContext
 import com.revenuecat.purchases.ProductType
 import com.revenuecat.purchases.ProrationMode
 import com.revenuecat.purchases.ReplacementMode
@@ -8,7 +9,7 @@ import com.revenuecat.purchases.models.PurchaseType
 import com.revenuecat.purchases.models.StoreTransaction
 import org.json.JSONObject
 
-@Suppress("unused", "UNUSED_VARIABLE")
+@Suppress("unused", "UNUSED_VARIABLE", "LongMethod")
 private class StoreTransactionAPI {
     fun check(transaction: StoreTransaction) {
         with(transaction) {
@@ -23,13 +24,32 @@ private class StoreTransactionAPI {
             val signature: String? = signature
             val originalJson: JSONObject = originalJson
             val presentedOfferingIdentifier: String? = presentedOfferingIdentifier
+            val presentedOfferingContext: PresentedOfferingContext? = presentedOfferingContext
             val su1: String? = storeUserID
             val purchaseType: PurchaseType = purchaseType
             val subscriptionOptionId: String? = subscriptionOptionId
             val replacementMode: ReplacementMode? = replacementMode
             val prorationMode: ProrationMode? = prorationMode
 
             val constructedStoreTransaction = StoreTransaction(
+                orderId,
+                productIds,
+                type,
+                purchaseTime,
+                purchaseToken,
+                purchaseState,
+                isAutoRenewing,
+                signature,
+                originalJson,
+                presentedOfferingContext,
+                storeUserID,
+                purchaseType,
+                marketplace,
+                subscriptionOptionId,
+                replacementMode,
+            )
+
+            val constructedStoreTransactionWithOfferingId = StoreTransaction(
                 orderId,
                 productIds,
                 type,