Create a new term for subscriptions during product switch

build.sbt

@@ -306,7 +306,7 @@ def lambdaProject(
   Project(projectName, file(s"handlers/$projectName"))
     .enablePlugins(RiffRaffArtifact)
     .configs(EffectsTest, HealthCheckTest)
-    .settings(scalaSettings, testSettings)
+    .settings(scalaSettings, testSettings, scalafmtSettings)
     .settings(
       name := projectName,
       description := projectDescription,

handlers/product-move-api/src/main/scala/com/gu/productmove/Handler.scala

@@ -44,7 +44,7 @@ object Handler extends ZIOApiGatewayRequestHandler {
   def testProductMove(): Unit = super.runTest(
     "POST",
     "/product-move/A-S123",
-    Some(ProductMoveEndpointTypes.ExpectedInput(49.99, false, false, None, None).toJson),
+    Some(ProductMoveEndpointTypes.ExpectedInput(49.99, false, None, None).toJson),
   )
 
   @main

handlers/product-move-api/src/main/scala/com/gu/productmove/endpoint/move/ProductMoveEndpoint.scala

@@ -2,9 +2,8 @@ package com.gu.productmove.endpoint.move
 
 import com.gu.newproduct.api.productcatalog.{Annual, BillingPeriod, Monthly}
 import com.gu.supporterdata.model.SupporterRatePlanItem
-
 import com.gu.productmove.SecretsLive
-import com.gu.productmove.endpoint.move.ProductMoveEndpointTypes._
+import com.gu.productmove.endpoint.move.ProductMoveEndpointTypes.*
 import com.gu.productmove.GuStageLive.Stage
 import com.gu.productmove.framework.ZIOApiGatewayRequestHandler.TIO
 import com.gu.productmove.framework.{LambdaEndpoint, ZIOApiGatewayRequestHandler}
@@ -13,18 +12,22 @@ import com.gu.productmove.salesforce.Salesforce.SalesforceRecordInput
 import com.gu.productmove.zuora.GetSubscription.RatePlanCharge
 import com.gu.productmove.zuora.rest.{ZuoraClientLive, ZuoraGet, ZuoraGetLive}
 import com.gu.productmove.zuora.{
+  CreatePaymentLive,
   GetAccount,
   GetAccountLive,
+  GetInvoiceItems,
+  GetInvoiceItemsLive,
+  GetInvoiceLive,
   GetSubscription,
   GetSubscriptionLive,
+  InvoiceItemAdjustment,
+  InvoiceItemAdjustmentLive,
   Subscribe,
   SubscribeLive,
   SubscriptionUpdate,
   SubscriptionUpdateLive,
-  GetInvoiceItems,
-  GetInvoiceItemsLive,
-  InvoiceItemAdjustment,
-  InvoiceItemAdjustmentLive,
+  TermRenewal,
+  TermRenewalLive,
   ZuoraCancel,
   ZuoraCancelLive,
 }
@@ -41,12 +44,12 @@ import com.gu.productmove.{
   SQSLive,
   SttpClientLive,
 }
-import sttp.tapir._
+import sttp.tapir.*
 import sttp.tapir.EndpointIO.Example
 import sttp.tapir.Schema
 import sttp.tapir.json.zio.jsonBody
-import zio._
-import zio.json._
+import zio.*
+import zio.json.*
 import com.gu.newproduct.api.productcatalog.ZuoraIds.ZuoraIds
 
 import java.time.format.DateTimeFormatter
@@ -61,7 +64,7 @@ object ProductMoveEndpoint {
     run(
       SubscriptionName("A-S00448793"),
       SwitchType.RecurringContributionToSupporterPlus,
-      ExpectedInput(1, false, false, None, None),
+      ExpectedInput(1, false, None, None),
     ),
   )
 
@@ -186,12 +189,15 @@ object ProductMoveEndpoint {
       ZuoraClientLive.layer,
       ZuoraGetLive.layer,
       SubscriptionUpdateLive.layer,
+      TermRenewalLive.layer,
       SQSLive.layer,
       GetAccountLive.layer,
       InvoiceItemAdjustmentLive.layer,
       GuStageLive.layer,
       DynamoLive.layer,
       GetInvoiceItemsLive.layer,
+      GetInvoiceLive.layer,
+      CreatePaymentLive.layer,
       SecretsLive.layer,
     )
 }

handlers/product-move-api/src/main/scala/com/gu/productmove/endpoint/move/ProductMoveEndpointTypes.scala

@@ -20,7 +20,6 @@ object ProductMoveEndpointTypes {
   case class ExpectedInput(
       @description("Price of new Supporter Plus subscription") price: BigDecimal,
       @description("Whether to preview the move or to carry it out") preview: Boolean,
-      checkChargeAmountBeforeUpdate: Boolean,
       @description(
         "The User Id of the CSR performing the Switch. Populated only if the request comes from Salesforce",
       ) csrUserId: Option[String],