refactoring

guardian · Jan 22, 2024 · ca94e0b · ca94e0b
1 parent 53a830e
commit ca94e0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 35 deletions.
diff --git a/lambda/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Amendment.scala b/lambda/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Amendment.scala
@@ -47,26 +47,9 @@ object Amendment {
       subscription: ZuoraSubscription,
       effectiveDate: LocalDate,
   ): Either[AmendmentDataFailure, ZuoraSubscriptionUpdate] = {
-
-    def transform1[T](option: Option[T]): Either[AmendmentDataFailure, T] = {
-      option match {
-        case None                 => Left(AmendmentDataFailure("error"))
-        case Some(ratePlanCharge) => Right(ratePlanCharge)
-      }
-    }
-
-    def transform2[T](data: Either[String, T]): Either[AmendmentDataFailure, T] = {
-      data match {
-        case Left(string) => Left(AmendmentDataFailure(string))
-        case Right(t)     => Right(t)
-      }
-    }
-
     for {
-      data2024 <- transform2[SubscriptionData2024](
-        Estimation.subscriptionToSubscriptionData2024(subscription)
-      )
-      chargeDistribution <- transform1[ChargeDistribution2024](subscriptionToNewChargeDistribution2024(subscription))
+      data2024 <- Estimation.subscriptionToSubscriptionData2024(subscription).left.map(AmendmentDataFailure)
+      chargeDistribution <- subscriptionToNewChargeDistribution2024(subscription).toRight(AmendmentDataFailure("error"))
     } yield ZuoraSubscriptionUpdate(
       add = List(
         AddZuoraRatePlan(

diff --git a/...da/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Estimation.scala b/...da/src/main/scala/pricemigrationengine/migrations/Newspaper2024Migration/Estimation.scala
@@ -137,24 +137,10 @@ object Estimation {
 
     // PriceData(currency: Currency, oldPrice: BigDecimal, newPrice: BigDecimal, billingPeriod: String)
 
-    def transform1[T](option: Option[T]): Either[AmendmentDataFailure, T] = {
-      option match {
-        case None                 => Left(AmendmentDataFailure("error"))
-        case Some(ratePlanCharge) => Right(ratePlanCharge)
-      }
-    }
-
-    def transform2[T](data: Either[String, T]): Either[AmendmentDataFailure, T] = {
-      data match {
-        case Left(string) => Left(AmendmentDataFailure(string))
-        case Right(t)     => Right(t)
-      }
-    }
-
     for {
-      data2024 <- transform2[SubscriptionData2024](subscriptionToSubscriptionData2024(subscription))
+      data2024 <- subscriptionToSubscriptionData2024(subscription).left.map(AmendmentDataFailure)
       oldPrice = data2024.currentPrice
-      newPrice <- transform1[BigDecimal](subscriptionToNewPrice(subscription))
+      newPrice <- subscriptionToNewPrice(subscription).toRight(AmendmentDataFailure("error"))
     } yield PriceData(
       data2024.currency,
       oldPrice,