Cherry-pick changes from #3802 (#3804)

Co-authored-by: Michał Sikora <me@mehow.io>

Author: mebarbosa

modules/features/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/winback/WinbackViewModel.kt

@@ -261,7 +261,7 @@ class WinbackViewModel @Inject constructor(
             .await()
     }
 
-    private fun List<ProductDetails>.toSubscriptionPlans() = map(subscriptionMapper::mapFromProductDetails)
+    private fun List<ProductDetails>.toSubscriptionPlans() = map { productDetails -> subscriptionMapper.mapFromProductDetails(productDetails, removeWinbackOffer = false) }
         .filterIsInstance<Subscription.Simple>()
         .map(Subscription.Simple::toPlan)
         .sortedWith(PlanComparator)

modules/services/model/src/main/java/au/com/shiftyjelly/pocketcasts/models/type/SubscriptionMapper.kt

@@ -13,11 +13,13 @@ class SubscriptionMapper @Inject constructor() {
         productDetails: ProductDetails,
         isOfferEligible: Boolean = false,
         referralProductDetails: ReferralProductDetails? = null,
+        removeWinbackOffer: Boolean = true,
     ): Subscription? {
         val matchingSubscriptionOfferDetails = if (isOfferEligible || referralProductDetails != null) {
             productDetails
                 .subscriptionOfferDetails
                 ?.filter { referralProductDetails == null && !it.offerTags.contains(REFERRAL_OFFER_TAG) } // get SubscriptionOfferDetails with offers
+                ?.filter { if (removeWinbackOffer) !it.offerTags.contains(WINBACK_OFFER_TAG) else true }
                 ?.filter { it.offerSubscriptionPricingPhase != null } // get SubscriptionOfferDetails with offers
                 ?.ifEmpty { productDetails.subscriptionOfferDetails } // if no special offers, return all offers available
                 ?: productDetails.subscriptionOfferDetails // if null, return all offers
@@ -32,6 +34,7 @@ class SubscriptionMapper @Inject constructor() {
         } else {
             matchingSubscriptionOfferDetails
                 .filter { !it.offerTags.contains(REFERRAL_OFFER_TAG) }
+                .filter { if (removeWinbackOffer) !it.offerTags.contains(WINBACK_OFFER_TAG) else true }
                 // This assumes that base plan has lowest number of pricing phases,
                 // and if something else has the same number of phases,
                 // base plan will be the first one
@@ -163,5 +166,6 @@ class SubscriptionMapper @Inject constructor() {
 
     companion object {
         private const val REFERRAL_OFFER_TAG = "referral-offer"
+        private const val WINBACK_OFFER_TAG = "winback"
     }
 }

modules/services/repositories/src/test/java/au/com/shiftyjelly/pocketcasts/repositories/referrals/ReferralOfferInfoProviderTest.kt

@@ -95,7 +95,7 @@ class ReferralOfferInfoProviderTest {
         whenever(productDetails.subscriptionOfferDetails).thenReturn(listOf(subscriptionOfferDetails))
         whenever(subscription.productDetails).thenReturn(productDetails)
         whenever(subscriptionOfferDetails.offerId).thenReturn(offerId)
-        whenever(subscriptionMapper.mapFromProductDetails(eq(productDetails), anyBoolean(), any())).thenReturn(subscription)
+        whenever(subscriptionMapper.mapFromProductDetails(eq(productDetails), anyBoolean(), any(), any())).thenReturn(subscription)
 
         return ProductDetailsState.Loaded(listOf(productDetails))
     }