Tidy some stuff up

guardian · Nov 9, 2023 · f522603 · f522603
1 parent 8c7917e
commit f522603
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/TermRenewal.scala b/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/TermRenewal.scala
@@ -15,7 +15,7 @@ import com.gu.productmove.endpoint.move.ProductMoveEndpointTypes.{ErrorResponse,
 import com.gu.productmove.zuora.GetSubscription.GetSubscriptionResponse
 import com.gu.productmove.zuora.model.{SubscriptionId, SubscriptionName}
 import com.gu.productmove.zuora.rest.ZuoraGet
-import com.gu.productmove.zuora.rest.ZuoraRestBody.{ZuoraSuccessResultsArray, ZuoraSuccessCheck, ZuoraSuccessLowercase}
+import com.gu.productmove.zuora.rest.ZuoraRestBody.{ZuoraSuccessCheck, ZuoraSuccessLowercase}
 import com.gu.util.config
 import sttp.capabilities.zio.ZioStreams
 import sttp.capabilities.{Effect, WebSockets}

diff --git a/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/rest/ZuoraClient.scala b/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/rest/ZuoraClient.scala
@@ -87,25 +87,20 @@ object ZuoraRestBody {
   // the `/v1/object/` endpoint which we are using to get the user's payment method does not have a success property, and instead returns `size: "0"` if nothing was found
   // Zuora either returns a "success" property with a lower or upper case starting letter, hence the need for SuccessCheckLowercase and SuccessCheckCapitalised enums
   enum ZuoraSuccessCheck:
-    case SuccessCheckSize, SuccessCheckLowercase, SuccessCheckCapitalised, SuccessCheckResultsArray, None
+    case SuccessCheckSize, SuccessCheckLowercase, SuccessCheckCapitalised, None
 
   case class Reason(
       code: Int,
       message: String,
   )
   given JsonDecoder[Reason] = DeriveJsonDecoder.gen
 
-  sealed trait ZuoraSuccessCheckResponse
   case class ZuoraSuccessCapitalised(Success: Boolean, reasons: Option[List[Reason]])
   given JsonDecoder[ZuoraSuccessCapitalised] = DeriveJsonDecoder.gen
   case class ZuoraSuccessLowercase(success: Boolean, reasons: Option[List[Reason]])
   given JsonDecoder[ZuoraSuccessLowercase] = DeriveJsonDecoder.gen
   case class ZuoraSuccessSize(size: Option[Int])
   given JsonDecoder[ZuoraSuccessSize] = DeriveJsonDecoder.gen
-  case class ZuoraSuccessResultsArray(results: List[ZuoraResultsArrayItem])
-  given JsonDecoder[ZuoraSuccessResultsArray] = DeriveJsonDecoder.gen
-  case class ZuoraResultsArrayItem(Success: Boolean)
-  given JsonDecoder[ZuoraResultsArrayItem] = DeriveJsonDecoder.gen
 
   def attemptDecode[A](body: String)(implicit decoder: JsonDecoder[A]) =
     body.fromJson[A].left.map(InternalServerError.apply)
@@ -151,17 +146,6 @@ object ZuoraRestBody {
                 case None => Left(InternalServerError(s"success = false, body: $body"))
               }
         } yield ()
-
-      case ZuoraSuccessCheck.SuccessCheckResultsArray =>
-        for {
-          zuoraResponse <- attemptDecode[ZuoraSuccessResultsArray](body)
-          isSuccessful <-
-            if (zuoraResponse.results.forall(_.Success)) Right(())
-            else
-              Left(InternalServerError(s"success = false, body: $body"))
-
-        } yield ()
-
       case ZuoraSuccessCheck.None => Right(())
     }