From 3fcafd34464a5060a4160c34a91225195729e82a Mon Sep 17 00:00:00 2001 From: Mario Galic Date: Thu, 26 Sep 2019 14:17:13 +0100 Subject: [PATCH] Same Discount holiday stop product is reused for all products --- .../GuardianWeeklyHolidayStopConfig.scala | 15 +++------------ .../gu/holiday_stops/HolidayCreditProduct.scala | 4 +++- .../SundayVoucherHolidayStopConfig.scala | 16 +++------------- 3 files changed, 9 insertions(+), 26 deletions(-) diff --git a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/GuardianWeeklyHolidayStopConfig.scala b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/GuardianWeeklyHolidayStopConfig.scala index 74c58929c6..10aaa6ffb1 100644 --- a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/GuardianWeeklyHolidayStopConfig.scala +++ b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/GuardianWeeklyHolidayStopConfig.scala @@ -123,30 +123,21 @@ object GuardianWeeklyHolidayStopConfig { lazy val Prod = GuardianWeeklyHolidayStopConfig( - HolidayCreditProduct( - productRatePlanId = "2c92a0076ae9189c016b080c930a6186", - productRatePlanChargeId = "2c92a0086ae928d7016b080f638477a6" - ), + HolidayCreditProduct.Prod, guardianWeeklyProductRatePlanIdsPROD, gwNforNProductRatePlanIdsPROD, ) lazy val Code = GuardianWeeklyHolidayStopConfig( - HolidayCreditProduct( - productRatePlanId = "2c92c0f86b0378b0016b08112e870d0a", - productRatePlanChargeId = "2c92c0f86b0378b0016b08112ec70d14" - ), + HolidayCreditProduct.Code, guardianWeeklyProductRatePlanIdsUAT, gwNforNProductRatePlanIdsUAT ) lazy val Dev = GuardianWeeklyHolidayStopConfig( - HolidayCreditProduct( - productRatePlanId = "2c92c0f96b03800b016b081fc04f1ba2", - productRatePlanChargeId = "2c92c0f96b03800b016b081fc0f41bb4" - ), + HolidayCreditProduct.Dev, guardianWeeklyProductRatePlanIdsDEV, gwNforNProductRatePlanIdsDEV ) diff --git a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/HolidayCreditProduct.scala b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/HolidayCreditProduct.scala index df44468806..a8eac4ec0c 100644 --- a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/HolidayCreditProduct.scala +++ b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/HolidayCreditProduct.scala @@ -1,8 +1,10 @@ package com.gu.holiday_stops /** - * Same Discount product is reused for all products, namely: + * Same Discount holiday stop product is reused for all products, namely: * 'DO NOT USE MANUALLY: Holiday Credit - automated' + * + * https://www.zuora.com/apps/Product.do?method=view&id=2c92a0ff5345f9200153559c6d2a3385#ST_DO%20NOT%20USE%20MANUALLY:%20Holiday%20Credit%20-%20automated */ case class HolidayCreditProduct( productRatePlanId: String, diff --git a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/SundayVoucherHolidayStopConfig.scala b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/SundayVoucherHolidayStopConfig.scala index a02316f869..b6c70313d6 100644 --- a/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/SundayVoucherHolidayStopConfig.scala +++ b/lib/holiday-stops/src/main/scala/com/gu/holiday_stops/SundayVoucherHolidayStopConfig.scala @@ -1,6 +1,5 @@ package com.gu.holiday_stops -// DO NOT USE MANUALLY: Holiday Credit - automated case class SundayVoucherHolidayStopConfig( holidayCreditProduct: HolidayCreditProduct, productRatePlanChargeId: String @@ -8,24 +7,15 @@ case class SundayVoucherHolidayStopConfig( object SundayVoucherHolidayStopConfig { val Prod = SundayVoucherHolidayStopConfig( - holidayCreditProduct = HolidayCreditProduct( - productRatePlanId = "2c92a0076ae9189c016b080c930a6186", - productRatePlanChargeId = "2c92a0086ae928d7016b080f638477a6" - ), + HolidayCreditProduct.Prod, productRatePlanChargeId = "2c92a0fe5af9a6b9015b0fe1ed121177" ) val Code = SundayVoucherHolidayStopConfig( - holidayCreditProduct = HolidayCreditProduct( - productRatePlanId = "2c92c0f86b0378b0016b08112e870d0a", - productRatePlanChargeId = "2c92c0f86b0378b0016b08112ec70d14" - ), + HolidayCreditProduct.Code, productRatePlanChargeId = "2c92c0f95aff3b54015b0ee0eb620b30" ) val Dev = SundayVoucherHolidayStopConfig( - holidayCreditProduct = HolidayCreditProduct( - productRatePlanId = "2c92c0f96b03800b016b081fc04f1ba2", - productRatePlanChargeId = "2c92c0f96b03800b016b081fc0f41bb4" - ), + HolidayCreditProduct.Dev, productRatePlanChargeId = "2c92c0f95aff3b56015b1045fba832d4" ) }