Merge pull request #1099 from guardian/ph-20241128-1330-splus

compute the doNotProcessUntil timespan for cancellation saves

lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala

@@ -83,12 +83,16 @@ object NotificationHandler extends CohortHandler {
       cancellationDate <- ZIO
         .fromOption(SupporterPlus2024Migration.cancellationSaveDiscountEffectiveDate(subscription))
         .orElseFail(DataExtractionFailure(s"Could not extract cancellation date for item ${item}"))
+      billingPeriod <- ZIO
+        .fromOption(item.billingPeriod)
+        .orElseFail(DataExtractionFailure(s"Could not extract billing period for item ${item}"))
+      months <- ZIO.succeed(CohortItem.billingPeriodToInt(billingPeriod))
       _ <- CohortTable
         .update(
           CohortItem(
             subscriptionName = item.subscriptionName,
             processingStage = DoNotProcessUntil,
-            doNotProcessUntil = Some(cancellationDate.plusMonths(6))
+            doNotProcessUntil = Some(cancellationDate.plusMonths(months * 2))
           )
         )
     } yield ()

lambda/src/main/scala/pricemigrationengine/model/CohortItem.scala

@@ -96,4 +96,15 @@ object CohortItem {
       }
     }
   }
+
+  def billingPeriodToInt(period: String): Int = {
+    // This function is used to convert a CohortItem's billingPeriod in to the number of months
+    // that the billing period represents.
+    BillingPeriod.fromString(period) match {
+      case Monthly    => 1
+      case Quarterly  => 3
+      case SemiAnnual => 6
+      case Annual     => 12
+    }
+  }
 }