SASS-10418 Removing new values from rentals, just leaving them in ren…

…t-a-room
hmrc · Feb 18, 2025 · 6695fc3 · 6695fc3
1 parent 1433bfa
commit 6695fc3
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 54 deletions.
diff --git a/app/models/RentARoomAdjustmentsStoreAnswers.scala b/app/models/RentARoomAdjustmentsStoreAnswers.scala
@@ -16,7 +16,7 @@
 
 package models
 
-import models.request.{BalancingCharge, UnusedLossesBroughtForward, WhenYouReportedTheLoss}
+import models.request.{WhenYouReportedTheLoss, BalancingCharge, UnusedLossesBroughtForward}
 import play.api.libs.json.{OFormat, Json}
 
 final case class RentARoomAdjustmentsStoreAnswers(

diff --git a/app/models/repository/Merger.scala b/app/models/repository/Merger.scala
@@ -382,16 +382,7 @@ object Merger {
                   fromDownstreamAdjustment.businessPremisesRenovationAllowanceBalancingCharges
               ),
               residentialFinanceCost = residentialFinanceCost,
-              unusedResidentialFinanceCost = Some(residentialFinanceCostCarriedForward),
-              unusedLossesBroughtForward = UnusedLossesBroughtForward(
-                unusedLossesBroughtForwardYesOrNo = extractedMaybe
-                  .map(_.unusedLossesBroughtForwardYesNo)
-                  .getOrElse((
-                    fromDownstreamAdjustment.lossBroughtForward.isDefined
-                  )),
-                unusedLossesBroughtForwardAmount = fromDownstreamAdjustment.lossBroughtForward
-              ),
-              whenYouReportedTheLoss = extractedMaybe.flatMap(_.whenYouReportedTheLoss)
+              unusedResidentialFinanceCost = Some(residentialFinanceCostCarriedForward)
             )
           )
         case _ => None

diff --git a/app/models/request/CreateUKPropertyPeriodicSubmissionRequest.scala b/app/models/request/CreateUKPropertyPeriodicSubmissionRequest.scala
@@ -56,7 +56,7 @@ object CreateUKPropertyPeriodicSubmissionRequest {
         fromPropertyRentalsIncome(taxYear, periodicSubmissionMaybe, e)
       case e @ RentalsAndRaRIncome(_, _, _, _, _, _, _, _) =>
         fromRentalsAndRaRIncome(taxYear, periodicSubmissionMaybe, e)
-      case e @ PropertyRentalAdjustments(_, _, _, _, _, _, _, _) =>
+      case e @ PropertyRentalAdjustments(_, _, _, _, _, _) =>
         fromPropertyRentalAdjustments(taxYear, periodicSubmissionMaybe, e).asRight[ServiceError]
       case e @ RentalsAndRaRAbout(_, _, _, _, _) => fromRentalsAndRaRAbout(taxYear, periodicSubmissionMaybe, e)
 

diff --git a/app/models/request/PropertyRentalAdjustments.scala b/app/models/request/PropertyRentalAdjustments.scala
@@ -26,9 +26,7 @@ final case class PropertyRentalAdjustments(
   propertyIncomeAllowance: Option[BigDecimal],
   renovationAllowanceBalancingCharge: RenovationAllowanceBalancingCharge,
   residentialFinanceCost: BigDecimal,
-  unusedResidentialFinanceCost: Option[BigDecimal],
-  unusedLossesBroughtForward: UnusedLossesBroughtForward,
-  whenYouReportedTheLoss: Option[WhenYouReportedTheLoss]
+  unusedResidentialFinanceCost: Option[BigDecimal]
 )
 
 object PropertyRentalAdjustments {
@@ -51,9 +49,9 @@ object RenovationAllowanceBalancingCharge {
 }
 
 final case class UnusedLossesBroughtForward(
-  unusedLossesBroughtForwardYesOrNo: Boolean,
-  unusedLossesBroughtForwardAmount: Option[BigDecimal]
-)
+                                             unusedLossesBroughtForwardYesOrNo: Boolean,
+                                             unusedLossesBroughtForwardAmount: Option[BigDecimal]
+                                           )
 
 object UnusedLossesBroughtForward {
   implicit val format: OFormat[UnusedLossesBroughtForward] = Json.format
@@ -75,4 +73,4 @@ object WhenYouReportedTheLoss extends Enumerable.Implicits {
 
   implicit val enumerable: Enumerable[WhenYouReportedTheLoss] =
     Enumerable(values.map(v => v.toString -> v): _*)
-}
+}
diff --git a/app/models/request/UpdateUKPropertyPeriodicSubmissionRequest.scala b/app/models/request/UpdateUKPropertyPeriodicSubmissionRequest.scala
@@ -82,7 +82,7 @@ object UpdateUKPropertyPeriodicSubmissionRequest {
       case e @ RentARoomExpenses(_, _, _, _, _, _)              => fromRaRExpenses(periodicSubmissionMaybe, e)
       case e @ PropertyRentalsIncome(_, _, _, _, _, _, _, _, _) => fromPropertyRentalsIncome(periodicSubmissionMaybe, e)
       case e @ RentalsAndRaRIncome(_, _, _, _, _, _, _, _)      => fromRentalsAndRaRIncome(periodicSubmissionMaybe, e)
-      case e @ PropertyRentalAdjustments(_, _, _, _, _, _, _, _) =>
+      case e @ PropertyRentalAdjustments(_, _, _, _, _, _) =>
         fromPropertyRentalAdjustments(periodicSubmissionMaybe, e).asRight[ServiceError]
       case e @ RentalsAndRaRAbout(_, _, _, _, _) => fromRentalsAndRaRAbout(periodicSubmissionMaybe, e)
       case _ =>

diff --git a/app/models/request/ukrentaroom/RaRAdjustments.scala b/app/models/request/ukrentaroom/RaRAdjustments.scala
@@ -16,7 +16,7 @@
 
 package models.request.ukrentaroom
 
-import models.request.{WhenYouReportedTheLoss, BalancingCharge, UnusedLossesBroughtForward}
+import models.request.{BalancingCharge, UnusedLossesBroughtForward, WhenYouReportedTheLoss}
 import play.api.libs.json.{OFormat, Json}
 
 final case class RaRAdjustments(

diff --git a/app/models/responses/AdjustmentStoreAnswers.scala b/app/models/responses/AdjustmentStoreAnswers.scala
@@ -16,14 +16,11 @@
 
 package models.responses
 
-import models.request.WhenYouReportedTheLoss
 import play.api.libs.json.{OFormat, Json}
 
 case class AdjustmentStoreAnswers(
                               balancingChargeYesNo: Boolean,
-                              renovationAllowanceBalancingChargeYesNo: Boolean,
-                              unusedLossesBroughtForwardYesNo: Boolean,
-                              whenYouReportedTheLoss: Option[WhenYouReportedTheLoss]
+                              renovationAllowanceBalancingChargeYesNo: Boolean
                             )
 
 object AdjustmentStoreAnswers {

diff --git a/app/services/PropertyService.scala b/app/services/PropertyService.scala
@@ -533,9 +533,7 @@ class PropertyService @Inject() (
 
     val adjustmentStoreAnswers = AdjustmentStoreAnswers(
       propertyRentalAdjustment.balancingCharge.balancingChargeYesNo,
-      propertyRentalAdjustment.renovationAllowanceBalancingCharge.renovationAllowanceBalancingChargeYesNo,
-      propertyRentalAdjustment.unusedLossesBroughtForward.unusedLossesBroughtForwardYesOrNo,
-      propertyRentalAdjustment.whenYouReportedTheLoss
+      propertyRentalAdjustment.renovationAllowanceBalancingCharge.renovationAllowanceBalancingChargeYesNo
     )
     for {
       maybePeriodicSubmission <- getCurrentPeriodicSubmission(

diff --git a/test/controllers/JourneyAnswersControllerSpec.scala b/test/controllers/JourneyAnswersControllerSpec.scala
@@ -286,12 +286,7 @@ class JourneyAnswersControllerSpec
             renovationAllowanceBalancingChargeAmount = Some(92)
           ),
           BigDecimal(56.78),
-          Some(BigDecimal(78.89)),
-          UnusedLossesBroughtForward(
-            unusedLossesBroughtForwardYesOrNo = true,
-            unusedLossesBroughtForwardAmount = Some(BigDecimal(37.92))
-          ),
-          Some(WhenYouReportedTheLoss.y2018to2019),
+          Some(BigDecimal(78.89))
         )
       )
 
@@ -1232,12 +1227,7 @@ class JourneyAnswersControllerSpec
             renovationAllowanceBalancingChargeAmount = Some(92)
           ),
           BigDecimal(56.78),
-          Some(BigDecimal(78.89)),
-          UnusedLossesBroughtForward(
-            unusedLossesBroughtForwardYesOrNo = true,
-            unusedLossesBroughtForwardAmount = Some(BigDecimal(12.56))
-          ),
-          Some(WhenYouReportedTheLoss.y2018to2019),
+          Some(BigDecimal(78.89))
         )
       )
 

diff --git a/test/models/PropertyAnnualSubmissionSpec.scala b/test/models/PropertyAnnualSubmissionSpec.scala
@@ -257,9 +257,7 @@ class PropertyAnnualSubmissionSpec extends UnitTest {
           Some(35.79)
         ),
         13.57,
-        Some(91.35),
-        UnusedLossesBroughtForward(true, Some(32.47)),
-        Some(WhenYouReportedTheLoss.y2018to2019)
+        Some(91.35)
       )
 
       val firstLevelDiff = diff(

diff --git a/test/models/repository/MergerSpec.scala b/test/models/repository/MergerSpec.scala
@@ -151,9 +151,8 @@ class MergerSpec extends UnitTest {
 
       val balancingChargeYesNo = true
       val renovationAllowanceBalancingChargeYesNo = false
-      val unusedLossesBroughtForwardYesOrNo = true
       val adjustmentStoreAnswers: Option[AdjustmentStoreAnswers] =
-        Some(AdjustmentStoreAnswers(balancingChargeYesNo, renovationAllowanceBalancingChargeYesNo, unusedLossesBroughtForwardYesOrNo, Some(whenReportedTheLoss)))
+        Some(AdjustmentStoreAnswers(balancingChargeYesNo, renovationAllowanceBalancingChargeYesNo))
       val propertyRentalAdjustments: Option[PropertyRentalAdjustments] =
         adjustmentStoreAnswers.merge(ukOtherAdjustmentsAndExpensesMaybe)
       propertyRentalAdjustments shouldBe Some(
@@ -166,12 +165,7 @@ class MergerSpec extends UnitTest {
             Some(businessPremisesRenovationAllowanceBalancingCharges)
           ),
           residentialFinanceCost,
-          Some(residentialFinanceCostCarriedForward),
-          UnusedLossesBroughtForward(
-            unusedLossesBroughtForwardYesOrNo,
-            Some(unusedLossesBroughtForward)
-          ),
-          whenYouReportedTheLoss = Some(whenReportedTheLoss)
+          Some(residentialFinanceCostCarriedForward)
         )
       )
     }

diff --git a/test/services/PropertyServiceSpec.scala b/test/services/PropertyServiceSpec.scala
@@ -447,9 +447,7 @@ class PropertyServiceSpec
         renovationAllowanceBalancingChargeAmount = Some(92)
       ),
       BigDecimal(56.78),
-      Some(BigDecimal(78.89)),
-      UnusedLossesBroughtForward(true, Some(12.56)),
-      Some(WhenYouReportedTheLoss.y2018to2019)
+      Some(BigDecimal(78.89))
     )
 
     "return a success with no content when the request is valid and data is persisted" in {