PR feedback

guardian · Nov 13, 2023 · 06a0c62 · 06a0c62
1 parent fe34754
commit 06a0c62
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/GetAccount.scala b/handlers/product-move-api/src/main/scala/com/gu/productmove/zuora/GetAccount.scala
@@ -83,26 +83,14 @@ object GetAccount {
 
     given JsonDecoder[BasicInfo] = DeriveJsonDecoder.gen[BasicInfoWire].map {
       case BasicInfoWire(id, defaultPaymentMethod, identityId, sfContactId__c, balance, currency) =>
-        identityId match {
-          case Some(someIdentityId) if someIdentityId == "" =>
-            BasicInfo(
-              id = id,
-              defaultPaymentMethod = defaultPaymentMethod,
-              IdentityId__c = None,
-              sfContactId__c = sfContactId__c,
-              balance = (balance.toDouble * 100).toInt,
-              currency = currencyCodetoObject(currency),
-            )
-          case _ =>
-            BasicInfo(
-              id = id,
-              defaultPaymentMethod = defaultPaymentMethod,
-              IdentityId__c = identityId,
-              sfContactId__c = sfContactId__c,
-              balance = (balance.toDouble * 100).toInt,
-              currency = currencyCodetoObject(currency),
-            )
-        }
+        BasicInfo(
+          id = id,
+          defaultPaymentMethod = defaultPaymentMethod,
+          IdentityId__c = identityId.filter(_ != ""),
+          sfContactId__c = sfContactId__c,
+          balance = (balance.toDouble * 100).toInt,
+          currency = currencyCodetoObject(currency),
+        )
     }
   }
 

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
@@ -55,11 +55,11 @@ private class TermRenewalLive(zuoraGet: ZuoraGet) extends TermRenewal:
   ): ZIO[Stage with GetSubscription, ErrorResponse, RenewalResponse] = for {
     _ <- ZIO.log(s"Attempting to renew subscription $subscriptionName")
     today <- Clock.currentDateTime.map(_.toLocalDate)
-    response <- renewSubscription(subscriptionName, today, runBilling)
+    response <- renewSubscriptionFromDate(subscriptionName, today, runBilling)
     _ <- ZIO.log(s"Successfully renewed subscription $subscriptionName")
   } yield response
 
-  private def renewSubscription(
+  private def renewSubscriptionFromDate(
       subscriptionName: SubscriptionName,
       contractEffectiveDate: LocalDate,
       runBilling: Boolean,