fix? not including test

Author: xlisachan

apps/payments/next/app/[locale]/subscriptions/[subscriptionId]/cancel/page.tsx

@@ -46,6 +46,10 @@ export default async function CancelSubscriptionPage({
     );
   }
 
+  if (pageContent.isEligibleForCancelInterstitialOffer === true) {
+    redirect(`/${locale}/subscriptions/${subscriptionId}/offer`);
+  }
+
   return (
     <CancelSubscription
       userId={uid}

libs/payments/management/src/lib/churn-intervention.service.ts

@@ -401,63 +401,107 @@ export class ChurnInterventionService {
   async determineCancelInterstitialOfferEligibility(args: {
     uid: string;
     subscriptionId: string;
-    offeringApiIdentifier: string;
-    currentInterval: SubplatInterval;
-    upgradeInterval: SubplatInterval;
     acceptLanguage?: string | null;
     selectedLanguage?: string;
   }) {
-    const cmsCancelInterstitialOffer =
-      await this.productConfigurationManager.getCancelInterstitialOffer(
-        args.offeringApiIdentifier,
-        args.currentInterval,
-        args.upgradeInterval,
-        args.acceptLanguage || undefined,
-        args.selectedLanguage
-      );
+    const upgradeInterval = SubplatInterval.Yearly;
+    const subscription = await this.subscriptionManager.retrieve(
+      args.subscriptionId
+    );
 
-    const cmsCancelInterstitialOfferResult =
-      cmsCancelInterstitialOffer.getTransformedResult();
-    if (!cmsCancelInterstitialOfferResult) {
+    if (!subscription) {
       this.statsd.increment('cancel_intervention_decision', {
         type: 'none',
-        reason: 'no_cancel_interstitial_offer_found',
+        reason: 'subscription_not_found',
       });
       return {
         isEligible: false,
-        reason: 'no_cancel_interstitial_offer_found',
+        reason: 'subscription_not_found',
         cmsCancelInterstitialOfferResult: null,
       };
     }
 
-    const currentStripeInterval =
+    const currentInterval =
       await this.productConfigurationManager.getSubplatIntervalBySubscription(
-        args.subscriptionId
+        subscription
       );
-    if (
-      !currentStripeInterval ||
-      currentStripeInterval !== args.currentInterval
-    ) {
+
+    if (!currentInterval) {
       this.statsd.increment('cancel_intervention_decision', {
         type: 'none',
-        reason: 'current_interval_mismatch',
+        reason: 'current_interval_not_found',
       });
       return {
         isEligible: false,
-        reason: 'current_interval_mismatch',
+        reason: 'current_interval_not_found',
+        cmsCancelInterstitialOfferResult: null,
+      };
+    }
+
+    const stripePriceId = subscription.items.data.at(0)?.price.id;
+
+    if (!stripePriceId) {
+      this.statsd.increment('cancel_intervention_decision', {
+        type: 'none',
+        reason: 'stripe_price_id_not_found',
+      });
+      return {
+        isEligible: false,
+        reason: 'stripe_price_id_not_found',
+        cmsCancelInterstitialOfferResult: null,
+      };
+    }
+
+    const result =
+      await this.productConfigurationManager.getPageContentByPriceIds([
+        stripePriceId,
+      ]);
+    const offeringId =
+      result.purchaseForPriceId(stripePriceId).offering?.apiIdentifier;
+
+    if (!offeringId) {
+      this.statsd.increment('cancel_intervention_decision', {
+        type: 'none',
+        reason: 'offering_id_not_found',
+      });
+      return {
+        isEligible: false,
+        reason: 'offering_id_not_found',
+        cmsCancelInterstitialOfferResult: null,
+      };
+    }
+
+    const cmsCancelInterstitialOffer =
+      await this.productConfigurationManager.getCancelInterstitialOffer(
+        offeringId,
+        currentInterval,
+        upgradeInterval,
+        args.acceptLanguage || undefined,
+        args.selectedLanguage
+      );
+    const cmsCancelInterstitialOfferResult =
+      cmsCancelInterstitialOffer.getTransformedResult();
+
+    if (!cmsCancelInterstitialOfferResult) {
+      this.statsd.increment('cancel_intervention_decision', {
+        type: 'none',
+        reason: 'no_cancel_interstitial_offer_found',
+      });
+      return {
+        isEligible: false,
+        reason: 'no_cancel_interstitial_offer_found',
         cmsCancelInterstitialOfferResult: null,
       };
     }
 
     try {
       await this.productConfigurationManager.retrieveStripePrice(
-        args.offeringApiIdentifier,
-        args.upgradeInterval
+        offeringId,
+        upgradeInterval
       );
     } catch {
       this.statsd.increment('cancel_intervention_decision', {
-        type: 'none',
-        reason: 'no_upgrade_plan_found',
+        type: 'cancel_interstitial_offer',
       });
       return {
         isEligible: false,
@@ -467,8 +511,8 @@ export class ChurnInterventionService {
     }
 
     const eligibility = await this.eligibilityService.checkEligibility(
-      args.upgradeInterval,
-      args.offeringApiIdentifier,
+      upgradeInterval,
+      offeringId,
       args.uid,
       args.subscriptionId
     );

libs/payments/ui/src/lib/actions/getStaySubscribedFlowContent.ts

@@ -8,6 +8,7 @@ import { getApp } from '../nestapp/app';
 
 export const getStaySubscribedFlowContentAction = async (
   uid: string,
+  customerId: string,
   subscriptionId: string,
   acceptLanguage?: string | null,
   selectedLanguage?: string
@@ -16,6 +17,7 @@ export const getStaySubscribedFlowContentAction = async (
     .getActionsService()
     .getStaySubscribedFlowContent({
       uid,
+      customerId,
       subscriptionId,
       acceptLanguage,
       selectedLanguage,

libs/payments/ui/src/lib/nestapp/nextjs-actions.service.ts

@@ -687,21 +687,21 @@ export class NextJSActionsService {
         }
       );
 
-    // const cancelInterstitialOfferEligibility =
-    //   await this.churnInterventionService.determineCancelInterstitialOfferEligibility(
-    //     {
-    //       uid: args.uid,
-    //       subscriptionId: args.subscriptionId,
-    //       acceptLanguage: args.acceptLanguage,
-    //       selectedLanguage: args.selectedLanguage,
-    //     }
-    //   );
+    const cancelInterstitialOfferEligibility =
+      await this.churnInterventionService.determineCancelInterstitialOfferEligibility(
+        {
+          uid: args.uid,
+          subscriptionId: args.subscriptionId,
+          acceptLanguage: args.acceptLanguage,
+          selectedLanguage: args.selectedLanguage,
+        }
+      );
 
     return {
       ...result,
       isEligibleForChurnCancel: churnCancelEligibility.isEligible,
-      // isEligibleForCancelInterstitialOffer:
-      //   cancelInterstitialOfferEligibility.isEligible,
+      isEligibleForCancelInterstitialOffer:
+        cancelInterstitialOfferEligibility.isEligible,
     };
   }
 
@@ -730,7 +730,6 @@ export class NextJSActionsService {
     const churnStaySubscribedEligibility =
       await this.churnInterventionService.determineStaySubscribedEligibility(
         args.uid,
-        args.customerId,
         args.subscriptionId,
         args.acceptLanguage,
         args.selectedLanguage