Omnisub 5499 - Upgrade/downgrade subscription #98

cb-aravindradhakrishnan · 2024-01-18T08:12:59Z

No description provided.

…onMode

cb-haripriyan · 2024-01-24T13:24:47Z

chargebee/src/main/java/com/chargebee/android/billingservice/CBPurchase.kt

@@ -77,6 +77,23 @@ object CBPurchase {
        })
    }

+    fun changeProduct(


Can we add appropriate code comments?

cb-haripriyan · 2024-01-24T13:26:33Z

chargebee/src/main/java/com/chargebee/android/billingservice/CBPurchase.kt

+
+    private fun changeProduct(changeProductParams: ChangeProductParams, callback: CBCallback.PurchaseCallback<String>) {
+        isSDKKeyValid({
+            log(customer, changeProductParams.purchaseProductParams.product.id)


The action being logged in this method is before_purchase_command.
Can we change this to something appropriate?

modified log method to accept name, oldproductId?, action. And pass those values based on where it is being called. Does this make sense?

cb-haripriyan · 2024-01-24T13:28:26Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+        this.purchaseProductParams = changeProductParams.purchaseProductParams
+        val offerToken = changeProductParams.purchaseProductParams.offerToken
+        val oldProductId = changeProductParams.oldProductId
+        val prorationMode = changeProductParams.prorationMode ?: BillingFlowParams.ProrationMode.IMMEDIATE_WITH_TIME_PRORATION


Let's start with support for IMMEDIATE_WITH_TIME_PRORATION. We would need to build in support for other proration modes in the backend.

cb-haripriyan · 2024-01-24T13:29:41Z

chargebee/src/main/java/com/chargebee/android/models/ChangeProductParams.kt

+data class ChangeProductParams(
+    val purchaseProductParams: PurchaseProductParams,
+    val oldProductId: String,
+    val prorationMode: Int?


Do we need the prorationMode right now, given we only support IMMEDIATE_WITH_TIME_PRORATION currently?
Does it make sense to compose ChangeProductParams with PurchaseProductParams as opposed to using individual parameters?

cb-haripriyan · 2024-01-24T13:48:52Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+
+    private fun changeProduct(changeProductParams: ChangeProductParams) {
+        this.changeProductParams = changeProductParams
+        this.purchaseProductParams = changeProductParams.purchaseProductParams


Do we need to set this?

Yes its used in acknowledgePurchase method

cb-haripriyan · 2024-01-24T13:49:47Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+                    purchaseCallBack?.onError(throwCBException(billingResult))
+                } else {
+                    oneTimePurchaseCallback?.onError(throwCBException(billingResult))
+                }


Do we need to handle for oneTimePurchaseCallback? Since OTP cannot be changed.

Missed it!!... Removed now.

cb-haripriyan · 2024-01-24T13:50:18Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+        val purchaseTransactionHistory = mutableListOf<PurchaseTransaction>()
+        purchaseTransactionHistory.addAll(subscriptionHistory ?: emptyList())
+        val prevProduct: PurchaseTransaction? = purchaseTransactionHistory.find { it.productId.first() == oldProductId }
+        return prevProduct?.purchaseToken ?: ""


nit: return an empty optional instead of empty string

cb-haripriyan · 2024-01-24T13:51:24Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+                            .setProductDetailsParamsList(productDetailsParamsList)
+                            .setSubscriptionUpdateParams(
+                                BillingFlowParams.SubscriptionUpdateParams.newBuilder()
+                                    .setOldPurchaseToken(oldPurchaseToken)


What would be the response if the oldPurchaseToken is empty/null?

It's loading infinitely. Handled it now with an error message.

cb-haripriyan · 2024-01-24T13:51:51Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+                                oneTimePurchaseCallback?.onError(
+                                    billingError
+                                )
+                            }


Do we need to handle for oneTimePurchaseCallback? Since OTP cannot be changed.

Missed it!!... Removed now.

Is this removed yet?

cb-haripriyan · 2024-01-24T13:54:06Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

-                    purchaseCallBack?.onError(
-                        throwCBException(billingResult)
-                    )
+                    if (this.changeProductParams.oldProductId.isNotEmpty() && billingResult.responseCode == ERROR) {


Where do we reset the changeProductParams variable?

… mode as default

cb-haripriyan · 2024-02-06T06:00:39Z

README.md

+### Upgrade or Downgrade Product
+Pass the `ChangeProductParams` and `CBCustomer` to the following function when the user chooses the product to purchase.
+
+`CBCustomer` - **Optional object**.


Let's add the full description similar to the previous examples.

cb-haripriyan · 2024-02-06T06:01:50Z

README.md

+      }
+})
+ ```
+The above function will handle the subscription upgrade or downgrade.


This seems redundant. Can we rephrase this?

cb-haripriyan · 2024-02-06T06:05:17Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

-                            )
-                        } else {
-                            oneTimePurchaseCallback?.onError(
-                                billingError


Why have we this in changed the purchase method?

cb-haripriyan · 2024-02-06T06:07:33Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

+                                oneTimePurchaseCallback?.onError(
+                                    billingError
+                                )
+                            }


Is this removed yet?

cb-haripriyan · 2024-02-06T06:09:09Z

chargebee/src/main/java/com/chargebee/android/billingservice/BillingClientManager.kt

-                    purchaseCallBack?.onError(
-                        throwCBException(billingResult)
-                    )
+                    if (this::changeProductParams.isInitialized && this.changeProductParams.currentProductId.isNotEmpty() && billingResult.responseCode == ERROR) {


Where is isInitialized defined?

It is inbuild in kotlin. Returns true if this lateinit property has been assigned a value, and false otherwise.

cb-haripriyan · 2024-02-06T09:43:31Z

README.md

+})
+ ```
+The above function is designed to manage subscription upgrades or downgrades between base plans within a single subscription or across multiple subscriptions.
+


Should this be across different subscriptions?

cb-sabuj · 2024-02-23T07:15:15Z

README.md

@@ -161,6 +161,29 @@ CBPurchase.purchaseProduct(purchaseProductParams = purchaseProductParams, custom
 ```
 The above function will handle the purchase against Google Play Store and send the IAP token for server-side token verification to your Chargebee account. Use the Subscription ID returned by the above function, to check for Subscription status on Chargebee and confirm the access - granted or denied.

+### Upgrade or Downgrade Product
+Pass the `ChangeProductParams` and `CBCustomer` to the following function when the user chooses the product to purchase.


Can we mention the function name rather than only saying "to the following function..."? It will make the sentence more clear.

Pass the ChangeProductParams and CBCustomer to the following ChangeProduct function when the user chooses the product to purchase.

@cb-sabuj Done

cb-sabuj · 2024-02-23T07:19:35Z

README.md

@@ -161,6 +161,29 @@ CBPurchase.purchaseProduct(purchaseProductParams = purchaseProductParams, custom
 ```
 The above function will handle the purchase against Google Play Store and send the IAP token for server-side token verification to your Chargebee account. Use the Subscription ID returned by the above function, to check for Subscription status on Chargebee and confirm the access - granted or denied.

+### Upgrade or Downgrade Product
+Pass the `ChangeProductParams` and `CBCustomer` to the following function when the user chooses the product to purchase.


Pass the ChangeProductParams and CBCustomer to the following ChangeProduct function when the user chooses the product to purchase.

sonarcloud · 2024-02-26T10:56:46Z

Quality Gate passed

Issues
3 New issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

cb-aravindradhakrishnan added 2 commits January 18, 2024 13:35

feat: Added Change Product method in CBPurchase

79acc6c

feat: Added Change Product option

08d0006

cb-aravindradhakrishnan requested a review from cb-haripriyan January 18, 2024 08:12

cb-aravindradhakrishnan changed the title ~~Omnisub 5499~~ Omnisub 5499 - Upgrade/downgrade subscription Jan 18, 2024

cb-aravindradhakrishnan added 3 commits January 24, 2024 12:56

feat: Created ChangeProduct params classwith oldProductId and prorati…

942e453

…onMode

feat: Code refactored

94f2f6f

feat: Return Valid errors

203dc88

cb-aravindradhakrishnan marked this pull request as ready for review January 24, 2024 11:12

cb-aravindradhakrishnan requested a review from cb-anurags January 24, 2024 11:12

cb-haripriyan reviewed Jan 24, 2024

View reviewed changes

cb-haripriyan requested changes Jan 24, 2024

View reviewed changes

cb-aravindradhakrishnan added 15 commits January 25, 2024 11:51

feat: Added Code comments

e8cd2e6

feat: Modified logs

c6b1758

feat: Replace empty string with empty optional

83b7702

feat: Remove OTP callback on error

e66769f

feat: Remove prorationMode from ChangeProductParams and set supported…

08616b0

… mode as default

Feat: Error handling

484d8b9

feat: Rename changeProductParams props

27c85e6

feat: Rename changeProductParams props

7b706ca

feat: Proper error message

56593af

feat: Updated readme

62c3248

feat: Proper error message

803326f

feat: Rename changeProductParams props

159809a

feat: Proper error message

7e0d6da

feat: Reset currentProductId

ecb90c4

feat: Handled within subscription case

90f39e3

cb-haripriyan reviewed Feb 6, 2024

View reviewed changes

cb-aravindradhakrishnan added 3 commits February 6, 2024 12:36

feat: Revert OTP callback on error

2c98f6a

feat: Revert OTP callback on error

86676e1

feat: Updated readme

f8b63b0

feat: Function name change

ba2d1a7

cb-haripriyan approved these changes Feb 6, 2024

View reviewed changes

cb-aravindradhakrishnan added 2 commits February 6, 2024 15:21

feat: Updated readme

e9c5422

feat: Add relevant error messages

418c231

cb-sabuj approved these changes Feb 23, 2024

View reviewed changes

cb-sabuj self-requested a review February 23, 2024 07:17

cb-sabuj requested changes Feb 23, 2024

View reviewed changes

feat: Update readme

fb2ae76

cb-aravindradhakrishnan requested a review from cb-sabuj February 26, 2024 10:57

Omnisub 5499 - Upgrade/downgrade subscription #98

Are you sure you want to change the base?

Omnisub 5499 - Upgrade/downgrade subscription #98

Conversation

cb-aravindradhakrishnan commented Jan 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Feb 26, 2024

Quality Gate passed