Zuora response introspection

guardian · Oct 22, 2024 · 24645b1 · 24645b1
1 parent 83c19d4
commit 24645b1
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/lambda/src/main/scala/pricemigrationengine/model/ZuoraRenewOrderPayload.scala b/lambda/src/main/scala/pricemigrationengine/model/ZuoraRenewOrderPayload.scala
@@ -83,3 +83,18 @@ object ZuoraRenewOrderPayload {
     )
   }
 }
+
+case class ZuoraRenewOrderResponseReason(code: Long, message: String)
+object ZuoraRenewOrderResponseReason {
+  implicit val rwZuoraRenewOrderResponseReason: ReadWriter[ZuoraRenewOrderResponseReason] = macroRW
+}
+
+case class ZuoraRenewOrderResponse(
+    success: Boolean,
+    processId: String,
+    reasons: List[ZuoraRenewOrderResponseReason],
+    requestId: String
+)
+object ZuoraRenewOrderResponse {
+  implicit val rwZuoraRenewOrderResponse: ReadWriter[ZuoraRenewOrderResponse] = macroRW
+}
diff --git a/lambda/src/main/scala/pricemigrationengine/services/ZuoraLive.scala b/lambda/src/main/scala/pricemigrationengine/services/ZuoraLive.scala
@@ -212,18 +212,28 @@ object ZuoraLive {
             subscriptionNumber: String,
             payload: ZuoraRenewOrderPayload
         ): ZIO[Any, ZuoraRenewalFailure, Unit] = {
-          retry(
-            post[Unit](
-              path = s"orders",
-              body = write(payload)
-            ).mapBoth(
-              e =>
+
+          post[ZuoraRenewOrderResponse](
+            path = s"orders",
+            body = write(payload)
+          ).foldZIO(
+            e =>
+              ZIO.fail(
                 ZuoraRenewalFailure(
-                  s"Failed to renew subscription number ${subscriptionNumber} with payload: ${payload}"
-                ),
-              response => ()
-            )
-          ) <* logging.info(s"renewed subscription ${subscriptionNumber}")
+                  s"Subscription number: $subscriptionNumber, payload: ${payload}, reason: ${e.reason}"
+                )
+              ),
+            answer =>
+              if (answer.success) {
+                ZIO.succeed(())
+              } else {
+                ZIO.fail(
+                  ZuoraRenewalFailure(
+                    s"Subscription number: $subscriptionNumber, payload: ${payload}, with answer ${answer}"
+                  )
+                )
+              }
+          )
         }
       }
     )