Remove Sunday+ plans from new-product-api (#3324)

graham228221 · web-flow · commit 44d1ebd806f8 · 2026-01-08T09:51:21.000Z
diff --git a/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/addsubscription/email/serialisers/DigipackEmailFields.scala b/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/addsubscription/email/serialisers/DigipackEmailFields.scala
@@ -23,7 +23,7 @@ object DigipackEmailDataSerialiser {
 object DigipackEmailFields {
 
   val digipackPlans =
-    List(VoucherWeekendPlus, VoucherEveryDayPlus, VoucherSixDayPlus, VoucherSundayPlus, VoucherSaturdayPlus)
+    List(VoucherWeekendPlus, VoucherEveryDayPlus, VoucherSixDayPlus, VoucherSaturdayPlus)
   val dateformat = DateTimeFormatter.ofPattern("d MMMM yyyy")
 
   def nounFor(billingPeriod: BillingPeriod) = billingPeriod match {
diff --git a/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/addsubscription/email/serialisers/PaperEmailFields.scala b/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/addsubscription/email/serialisers/PaperEmailFields.scala
@@ -15,7 +15,7 @@ object PaperEmailDataSerialiser {
 object PaperEmailFields {
 
   private val digipackPlans =
-    List(VoucherWeekendPlus, VoucherEveryDayPlus, VoucherSixDayPlus, VoucherSundayPlus, VoucherSaturdayPlus)
+    List(VoucherWeekendPlus, VoucherEveryDayPlus, VoucherSixDayPlus, VoucherSaturdayPlus)
   private val dateformat = DateTimeFormatter.ofPattern("d MMMM yyyy")
 
   def serialise(data: PaperEmailData): Map[String, String] =
diff --git a/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/DigitalVoucherPlans.scala b/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/DigitalVoucherPlans.scala
@@ -60,12 +60,6 @@ class DigitalVoucherPlans(getStartDateFromFulfilmentFiles: (ProductType, List[Da
       startDateRule(sundayDays),
       Monthly,
     ),
-    (
-      DigitalVoucherSundayPlus,
-      PlanDescription("Sunday+"),
-      startDateRule(sundayDays),
-      Monthly,
-    ),
     (
       DigitalVoucherSixday,
       PlanDescription("Sixday"),
diff --git a/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/HomeDeliveryPlans.scala b/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/HomeDeliveryPlans.scala
@@ -36,7 +36,6 @@ class HomeDeliveryPlans(getStartDateFromFulfilmentFiles: (ProductType, List[DayO
     (HomeDeliveryEveryDayPlus, PlanDescription("Everyday+"), everyDayRules, Monthly),
     (HomeDeliverySixDayPlus, PlanDescription("Sixday+"), sixDayRules, Monthly),
     (HomeDeliveryWeekendPlus, PlanDescription("Weekend+"), weekendRules, Monthly),
-    (HomeDeliverySundayPlus, PlanDescription("Sunday+"), sundayDateRules, Monthly),
     (HomeDeliverySaturdayPlus, PlanDescription("Saturday+"), saturdayDateRules, Monthly),
   )
 
diff --git a/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/VoucherPlans.scala b/handlers/new-product-api/src/main/scala/com/gu/newproduct/api/productcatalog/plans/VoucherPlans.scala
@@ -34,7 +34,6 @@ class VoucherPlans(getStartDateFromFulfilmentFiles: (ProductType, List[DayOfWeek
     (VoucherSixDay, PlanDescription("Sixday"), mondayRules, Monthly),
     (VoucherWeekendPlus, PlanDescription("Weekend+"), saturdayDateRules, Monthly),
     (VoucherSaturdayPlus, PlanDescription("Saturday+"), saturdayDateRules, Monthly),
-    (VoucherSundayPlus, PlanDescription("Sunday+"), sundayDateRules, Monthly),
     (VoucherEveryDayPlus, PlanDescription("Everyday+"), mondayRules, Monthly),
     (VoucherSixDayPlus, PlanDescription("Sixday+"), mondayRules, Monthly),
   )
diff --git a/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/PricesFromZuoraCatalogEffectsTest.scala b/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/PricesFromZuoraCatalogEffectsTest.scala
@@ -43,7 +43,6 @@ object ProductsData {
 
   val voucher = Set(
     VoucherSaturdayPlus,
-    VoucherSundayPlus,
     VoucherWeekendPlus,
     VoucherSixDayPlus,
     VoucherEveryDayPlus,
@@ -59,7 +58,6 @@ object ProductsData {
     HomeDeliveryEveryDay,
     HomeDeliverySixDay,
     HomeDeliveryWeekendPlus,
-    HomeDeliverySundayPlus,
     HomeDeliveryEveryDayPlus,
     HomeDeliverySixDayPlus,
     HomeDeliverySaturday,
@@ -71,7 +69,6 @@ object ProductsData {
     DigitalVoucherSaturdayPlus,
     DigitalVoucherSixdayPlus,
     DigitalVoucherWeekend,
-    DigitalVoucherSundayPlus,
     DigitalVoucherEverydayPlus,
     DigitalVoucherSixday,
     DigitalVoucherEveryday,
diff --git a/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/PricesFromZuoraCatalogTest.scala b/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/PricesFromZuoraCatalogTest.scala
@@ -36,20 +36,6 @@ class PricesFromZuoraCatalogTest extends AnyFlatSpec with Matchers {
         |              "pricing": [ { "currency": "GBP", "price": 11.26 }, { "currency": "USD", "price": 11.46 }, { "currency": "EUR", "price": 11.26 } ]
         |            }
         |          ]
-        |        },
-        |        {
-        |          "id": "VoucherSundayPlusId",
-        |          "productRatePlanCharges": [
-        |            {
-        |              "name": "Digital Pack",
-        |              "pricing": [ { "currency": "GBP", "price": 11.27 }
-        |              ]
-        |            },
-        |            {
-        |              "name": "Sunday",
-        |              "pricing": [ {"currency": "GBP", "price": 10.79 } ]
-        |            }
-        |          ]
         |        }
         |      ]
         |    }
@@ -62,7 +48,6 @@ class PricesFromZuoraCatalogTest extends AnyFlatSpec with Matchers {
   it should "load catalog" in {
 
     val rateplanToPlanId = Map(
-      ProductRatePlanId("VoucherSundayPlusId") -> VoucherSundayPlus,
       ProductRatePlanId("VoucherSaturdayPlusId") -> VoucherSaturdayPlus,
     )
 
@@ -78,9 +63,6 @@ class PricesFromZuoraCatalogTest extends AnyFlatSpec with Matchers {
           USD -> AmountMinorUnits(2192),
           EUR -> AmountMinorUnits(2152),
         ),
-        VoucherSundayPlus -> Map(
-          GBP -> AmountMinorUnits(2206),
-        ),
       ),
     )
   }
diff --git a/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/addsubscription/email/paper/PaperEmailDataTest.scala b/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/addsubscription/email/paper/PaperEmailDataTest.scala
@@ -221,7 +221,7 @@ class PaperEmailDataTest extends AnyFlatSpec with Matchers {
   it should "IncludesDigipack should be true for plus plans " in {
 
     val digipackPlans =
-      List(VoucherEveryDayPlus, VoucherWeekendPlus, VoucherSixDayPlus, VoucherSaturdayPlus, VoucherSundayPlus)
+      List(VoucherEveryDayPlus, VoucherWeekendPlus, VoucherSixDayPlus, VoucherSaturdayPlus)
 
     val allDigipackPlanFields: List[Map[String, String]] = fieldsForPlanIds(digipackPlans)
 
diff --git a/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/productcatalog/CatalogWireTest.scala b/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/productcatalog/CatalogWireTest.scala
@@ -33,7 +33,6 @@ class CatalogWireTest extends AnyFlatSpec with Matchers with ResourceLoader {
     case VoucherWeekendPlus => gbpPrice(2942)
     case VoucherWeekend => gbpPrice(2076)
     case VoucherSunday => gbpPrice(1079)
-    case VoucherSundayPlus => gbpPrice(2206)
     case VoucherSaturday => gbpPrice(1036)
     case VoucherSaturdayPlus => gbpPrice(2162)
     case VoucherEveryDay => gbpPrice(4762)
@@ -51,7 +50,6 @@ class CatalogWireTest extends AnyFlatSpec with Matchers with ResourceLoader {
     case HomeDeliveryWeekend => gbpPrice(888)
     case HomeDeliveryEveryDayPlus => gbpPrice(999)
     case HomeDeliverySaturdayPlus => gbpPrice(678)
-    case HomeDeliverySundayPlus => gbpPrice(1010)
     case HomeDeliverySixDayPlus => gbpPrice(1111)
     case HomeDeliveryWeekendPlus => gbpPrice(2222)
     case DigipackMonthly =>
@@ -103,7 +101,6 @@ class CatalogWireTest extends AnyFlatSpec with Matchers with ResourceLoader {
     case DigitalVoucherSaturday => gbpPrice(7007)
     case DigitalVoucherSaturdayPlus => gbpPrice(7008)
     case DigitalVoucherSunday => gbpPrice(7009)
-    case DigitalVoucherSundayPlus => gbpPrice(7010)
     case NationalDeliveryEveryday => gbpPrice(7100)
     case NationalDeliverySixday => gbpPrice(7101)
     case NationalDeliveryWeekend => gbpPrice(7102)
diff --git a/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/productcatalog/catalogWireTest.json b/handlers/new-product-api/src/test/scala/com/gu/newproduct/api/productcatalog/catalogWireTest.json
@@ -166,23 +166,6 @@
         "description" : "GBP 6.78 every month"
       } ],
       "paymentPlan" : "GBP 6.78 every month"
-    }, {
-      "id" : "home_delivery_sunday_plus",
-      "label" : "Sunday+",
-      "startDateRules" : {
-        "daysOfWeek" : [ "Sunday" ],
-        "selectableWindow" : {
-          "startDate" : "2020-02-04",
-          "sizeInDays" : 28
-        }
-      },
-      "paymentPlans" : [ {
-        "currencyCode" : "GBP",
-        "amount" : 10.1,
-        "billingPeriod" : "Monthly",
-        "description" : "GBP 10.10 every month"
-      } ],
-      "paymentPlan" : "GBP 10.10 every month"
     }, {
       "id" : "home_delivery_everyday",
       "label" : "Everyday",
@@ -445,23 +428,6 @@
         "description" : "GBP 70.08 every month"
       } ],
       "paymentPlan" : "GBP 70.08 every month"
-    }, {
-      "id" : "digital_voucher_sunday_plus",
-      "label" : "Sunday+",
-      "startDateRules" : {
-        "daysOfWeek" : [ "Sunday" ],
-        "selectableWindow" : {
-          "startDate" : "2020-04-05",
-          "sizeInDays" : 1
-        }
-      },
-      "paymentPlans" : [ {
-        "currencyCode" : "GBP",
-        "amount" : 70.1,
-        "billingPeriod" : "Monthly",
-        "description" : "GBP 70.10 every month"
-      } ],
-      "paymentPlan" : "GBP 70.10 every month"
     }, {
       "id" : "digital_voucher_everyday",
       "label" : "Everyday",
@@ -619,23 +585,6 @@
         "description" : "GBP 21.62 every month"
       } ],
       "paymentPlan" : "GBP 21.62 every month"
-    }, {
-      "id" : "voucher_sunday_plus",
-      "label" : "Sunday+",
-      "startDateRules" : {
-        "daysOfWeek" : [ "Sunday" ],
-        "selectableWindow" : {
-          "startDate" : "2020-03-03",
-          "sizeInDays" : 35
-        }
-      },
-      "paymentPlans" : [ {
-        "currencyCode" : "GBP",
-        "amount" : 22.06,
-        "billingPeriod" : "Monthly",
-        "description" : "GBP 22.06 every month"
-      } ],
-      "paymentPlan" : "GBP 22.06 every month"
     }, {
       "id" : "voucher_everyday",
       "label" : "Everyday",
diff --git a/lib/zuora-models/src/main/scala/com/gu/newproduct/api/productcatalog/PlanId.scala b/lib/zuora-models/src/main/scala/com/gu/newproduct/api/productcatalog/PlanId.scala
@@ -44,8 +44,6 @@ object PlanId {
 
   case object VoucherSaturdayPlus extends PlanId("voucher_saturday_plus") with VoucherPlanId
 
-  case object VoucherSundayPlus extends PlanId("voucher_sunday_plus") with VoucherPlanId
-
   case object HomeDeliveryEveryDay extends PlanId("home_delivery_everyday") with HomeDeliveryPlanId
 
   case object HomeDeliverySixDay extends PlanId("home_delivery_sixday") with HomeDeliveryPlanId
@@ -60,8 +58,6 @@ object PlanId {
 
   case object HomeDeliveryWeekendPlus extends PlanId("home_delivery_weekend_plus") with HomeDeliveryPlanId
 
-  case object HomeDeliverySundayPlus extends PlanId("home_delivery_sunday_plus") with HomeDeliveryPlanId
-
   case object HomeDeliverySaturday extends PlanId("home_delivery_saturday") with HomeDeliveryPlanId
 
   case object HomeDeliverySaturdayPlus extends PlanId("home_delivery_saturday_plus") with HomeDeliveryPlanId
@@ -108,8 +104,6 @@ object PlanId {
 
   case object DigitalVoucherSunday extends PlanId("digital_voucher_sunday") with DigitalVoucherPlanId
 
-  case object DigitalVoucherSundayPlus extends PlanId("digital_voucher_sunday_plus") with DigitalVoucherPlanId
-
   case object DigitalVoucherSixday extends PlanId("digital_voucher_sixday") with DigitalVoucherPlanId
 
   case object DigitalVoucherSixdayPlus extends PlanId("digital_voucher_sixday_plus") with DigitalVoucherPlanId
@@ -131,7 +125,6 @@ object PlanId {
     VoucherSixDayPlus,
     VoucherWeekendPlus,
     VoucherSaturdayPlus,
-    VoucherSundayPlus,
     VoucherEveryDay,
     VoucherSixDay,
     VoucherWeekend,
@@ -154,7 +147,6 @@ object PlanId {
     HomeDeliverySixDayPlus,
     HomeDeliveryWeekendPlus,
     HomeDeliverySaturdayPlus,
-    HomeDeliverySundayPlus,
     HomeDeliveryEveryDay,
     HomeDeliverySixDay,
     HomeDeliveryWeekend,
@@ -184,7 +176,6 @@ object PlanId {
     DigitalVoucherSixdayPlus,
     DigitalVoucherWeekendPlus,
     DigitalVoucherSaturdayPlus,
-    DigitalVoucherSundayPlus,
     DigitalVoucherEveryday,
     DigitalVoucherSixday,
     DigitalVoucherWeekend,
diff --git a/lib/zuora-models/src/main/scala/com/gu/newproduct/api/productcatalog/ZuoraIds.scala b/lib/zuora-models/src/main/scala/com/gu/newproduct/api/productcatalog/ZuoraIds.scala
@@ -51,7 +51,6 @@ object ZuoraIds {
       sixDay: ProductRatePlanId,
       everydayPlus: ProductRatePlanId,
       saturdayPlus: ProductRatePlanId,
-      sundayPlus: ProductRatePlanId,
       weekendPlus: ProductRatePlanId,
       sixDayPlus: ProductRatePlanId,
   ) {
@@ -65,7 +64,6 @@ object ZuoraIds {
       VoucherEveryDayPlus -> everydayPlus,
       VoucherWeekendPlus -> weekendPlus,
       VoucherSixDayPlus -> sixDayPlus,
-      VoucherSundayPlus -> sundayPlus,
       VoucherSaturdayPlus -> saturdayPlus,
     )
 
@@ -77,7 +75,6 @@ object ZuoraIds {
       saturday: ProductRatePlanId,
       saturdayPlus: ProductRatePlanId,
       sunday: ProductRatePlanId,
-      sundayPlus: ProductRatePlanId,
       weekend: ProductRatePlanId,
       weekendPlus: ProductRatePlanId,
       sixDay: ProductRatePlanId,
@@ -93,7 +90,6 @@ object ZuoraIds {
       HomeDeliveryEveryDayPlus -> everydayPlus,
       HomeDeliveryWeekendPlus -> weekendPlus,
       HomeDeliverySixDayPlus -> sixDayPlus,
-      HomeDeliverySundayPlus -> sundayPlus,
     )
 
   }
@@ -142,7 +138,6 @@ object ZuoraIds {
       sixDay: ProductRatePlanId,
       everydayPlus: ProductRatePlanId,
       saturdayPlus: ProductRatePlanId,
-      sundayPlus: ProductRatePlanId,
       weekendPlus: ProductRatePlanId,
       sixDayPlus: ProductRatePlanId,
   ) {
@@ -156,7 +151,6 @@ object ZuoraIds {
       DigitalVoucherWeekendPlus -> weekendPlus,
       DigitalVoucherSixdayPlus -> sixDayPlus,
       DigitalVoucherSaturdayPlus -> saturdayPlus,
-      DigitalVoucherSundayPlus -> sundayPlus,
     )
 
   }
@@ -272,7 +266,6 @@ object ZuoraIds {
           weekend = ProductRatePlanId("2c92a0ff56fe33f00157040f9a537f4b"),
           sixDay = ProductRatePlanId("2c92a0fd56fe270b0157040e42e536ef"),
           everydayPlus = ProductRatePlanId("2c92a0ff56fe33f50157040bbdcf3ae4"),
-          sundayPlus = ProductRatePlanId("2c92a0fe56fe33ff0157040d4b824168"),
           saturdayPlus = ProductRatePlanId("2c92a0fd6205707201621fa1350710e3"),
           weekendPlus = ProductRatePlanId("2c92a0fd56fe26b60157040cdd323f76"),
           sixDayPlus = ProductRatePlanId("2c92a0fc56fe26ba0157040c5ea17f6a"),
@@ -284,7 +277,6 @@ object ZuoraIds {
           sunday = ProductRatePlanId("2c92a0ff5af9b657015b0fea5b653f81"),
           saturday = ProductRatePlanId("2c92a0fd5e1dcf0d015e3cb39d0a7ddb"),
           saturdayPlus = ProductRatePlanId("2c92a0ff6205708e01622484bb2c4613"),
-          sundayPlus = ProductRatePlanId("2c92a0fd560d13880156136b8e490f8b"),
           weekendPlus = ProductRatePlanId("2c92a0ff560d311b0156136b9f5c3968"),
           sixDayPlus = ProductRatePlanId("2c92a0ff560d311b0156136b697438a9"),
           everydayPlus = ProductRatePlanId("2c92a0fd560d132301560e43cf041a3c"),
@@ -310,7 +302,6 @@ object ZuoraIds {
           weekend = ProductRatePlanId("2c92a00870ec598001710740d24b3022"),
           sixDay = ProductRatePlanId("2c92a00870ec598001710740ca532f69"),
           everydayPlus = ProductRatePlanId("2c92a00870ec598001710740d3d03035"),
-          sundayPlus = ProductRatePlanId("2c92a00870ec598001710740cf9e3004"),
           saturdayPlus = ProductRatePlanId("2c92a00870ec598001710740ce702ff0"),
           weekendPlus = ProductRatePlanId("2c92a00870ec598001710740c6672ee7"),
           sixDayPlus = ProductRatePlanId("2c92a00870ec598001710740c4582ead"),
@@ -372,7 +363,6 @@ object ZuoraIds {
           weekend = ProductRatePlanId("2c92c0f8555ce5cf01556e7f01b81b94"),
           sixDay = ProductRatePlanId("2c92c0f8555ce5cf01556e7f01771b8a"),
           everydayPlus = ProductRatePlanId("2c92c0f95aff3b53015b10469bbf5f5f"),
-          sundayPlus = ProductRatePlanId("2c92c0f955a0b5bf0155b62623846fc8"),
           saturdayPlus = ProductRatePlanId("2c92c0f961f9cf300161fc44f2661258"),
           weekendPlus = ProductRatePlanId("2c92c0f95aff3b54015b1047efaa2ac3"),
           sixDayPlus = ProductRatePlanId("2c92c0f855c3b8190155c585a95e6f5a"),
@@ -382,7 +372,6 @@ object ZuoraIds {
           sixDay = ProductRatePlanId("2c92c0f955c3cf0f0155c5d9ddf13bc5"),
           weekend = ProductRatePlanId("2c92c0f955c3cf0f0155c5d9df433bf7"),
           sunday = ProductRatePlanId("2c92c0f85aff3453015b1041dfd2317f"),
-          sundayPlus = ProductRatePlanId("2c92c0f955c3cf0f0155c5d9e83a3cb7"),
           saturday = ProductRatePlanId("2c92c0f961f9cf300161fc4d2e3e3664"),
           saturdayPlus = ProductRatePlanId("2c92c0f961f9cf300161fc4f71473a34"),
           weekendPlus = ProductRatePlanId("2c92c0f95aff3b56015b104aa9a13ea5"),
@@ -410,7 +399,6 @@ object ZuoraIds {
           weekend = ProductRatePlanId("2c92c0f86fa49142016fa49ea0d028b6"),
           sixDay = ProductRatePlanId("2c92c0f86fa49142016fa49e9b9a286f"),
           everydayPlus = ProductRatePlanId("2c92c0f86fa49142016fa49eaa492988"),
-          sundayPlus = ProductRatePlanId("2c92c0f86fa49142016fa49ea90e2976"),
           saturdayPlus = ProductRatePlanId("2c92c0f86fa49142016fa49eb1732a39"),
           weekendPlus = ProductRatePlanId("2c92c0f86fa49142016fa49eaecb29dd"),
           sixDayPlus = ProductRatePlanId("2c92c0f86fa49142016fa49ea1af28c8"),

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ class HomeDeliveryPlans(getStartDateFromFulfilmentFiles: (ProductType, List[DayO`
`36`	`36`	`(HomeDeliveryEveryDayPlus, PlanDescription("Everyday+"), everyDayRules, Monthly),`
`37`	`37`	`(HomeDeliverySixDayPlus, PlanDescription("Sixday+"), sixDayRules, Monthly),`
`38`	`38`	`(HomeDeliveryWeekendPlus, PlanDescription("Weekend+"), weekendRules, Monthly),`
`39`		`- (HomeDeliverySundayPlus, PlanDescription("Sunday+"), sundayDateRules, Monthly),`
`40`	`39`	`(HomeDeliverySaturdayPlus, PlanDescription("Saturday+"), saturdayDateRules, Monthly),`
`41`	`40`	`)`
`42`	`41`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ class VoucherPlans(getStartDateFromFulfilmentFiles: (ProductType, List[DayOfWeek`
`34`	`34`	`(VoucherSixDay, PlanDescription("Sixday"), mondayRules, Monthly),`
`35`	`35`	`(VoucherWeekendPlus, PlanDescription("Weekend+"), saturdayDateRules, Monthly),`
`36`	`36`	`(VoucherSaturdayPlus, PlanDescription("Saturday+"), saturdayDateRules, Monthly),`
`37`		`- (VoucherSundayPlus, PlanDescription("Sunday+"), sundayDateRules, Monthly),`
`38`	`37`	`(VoucherEveryDayPlus, PlanDescription("Everyday+"), mondayRules, Monthly),`
`39`	`38`	`(VoucherSixDayPlus, PlanDescription("Sixday+"), mondayRules, Monthly),`
`40`	`39`	`)`