DL-13367 (#453)

* DL-13367 * wip * DL-13367: Refactoring tests * wip * Fixing tests * Fixing tests * DL-13367 * Review comments --------- Co-authored-by: Byasar3 <[email protected]> Co-authored-by: Gaurav Sood <[email protected]>
hmrc · Oct 11, 2024 · a116681 · a116681
1 parent 57ba287
commit a116681
Show file tree

Hide file tree

Showing 4 changed files with 270 additions and 180 deletions.
diff --git a/app/controllers/propertyDetails/PropertyDetailsDateOfRevalueController.scala b/app/controllers/propertyDetails/PropertyDetailsDateOfRevalueController.scala
@@ -19,15 +19,14 @@ package controllers.propertyDetails
 import config.ApplicationConfig
 import connectors.{BackLinkCacheConnector, DataCacheConnector}
 import controllers.auth.{AuthAction, ClientHelper}
+import forms.PropertyDetailsForms._
+import models._
+import play.api.i18n.{Messages, MessagesImpl}
 import play.api.mvc.{Action, AnyContent, MessagesControllerComponents}
 import services.{PropertyDetailsCacheSuccessResponse, PropertyDetailsService, ServiceInfoService}
 import uk.gov.hmrc.play.bootstrap.controller.WithUnsafeDefaultFormBinding
 import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendController
-import forms.PropertyDetailsForms._
-import models.DateOfRevalue
-import play.api.i18n.{Messages, MessagesImpl}
-import play.twirl.api.HtmlFormat
-import utils.AtedConstants.{DateOfRevalueConstant, SelectedPreviousReturn}
+import utils.AtedConstants._
 import utils.AtedUtils
 
 import javax.inject.Inject
@@ -47,6 +46,9 @@ class PropertyDetailsDateOfRevalueController @Inject()(mcc: MessagesControllerCo
 
   implicit val ec: ExecutionContext = mcc.executionContext
   val controllerId: String = "PropertyDetailsDateOfRevalueController"
+  val dateFields: (String, String) = ("dateOfRevalue", messages("ated.property-details-value.dateOfRevalue.messageKey"))
+
+  implicit lazy val messages: Messages = MessagesImpl(mcc.langs.availables.head, messagesApi)
 
   def view(id: String): Action[AnyContent] = Action.async { implicit request =>
     authAction.authorisedAction { implicit authContext =>
@@ -76,26 +78,40 @@ class PropertyDetailsDateOfRevalueController @Inject()(mcc: MessagesControllerCo
     }
   }
 
-  implicit lazy val messages: Messages = MessagesImpl(mcc.langs.availables.head, messagesApi)
-
-  val dateFields: (String, String) = ("dateOfRevalue", messages("ated.property-details-value.dateOfRevalue.messageKey"))
-
   def save(id: String, periodKey: Int, mode: Option[String]): Action[AnyContent] = Action.async { implicit request =>
     authAction.authorisedAction { implicit authContext =>
       ensureClientContext {
         if (appConfig.newRevaluedFeature) {
           serviceInfoService.getPartial.flatMap { serviceInfoContent =>
             validateDateOfRevalue(periodKey, propertyDetailsDateOfRevalueForm.bindFromRequest(), dateFields).fold(
               formWithError => {
-                currentBackLink.map(backLink => (BadRequest(template(id, periodKey, formWithError, None, HtmlFormat.empty, None))))
+                currentBackLink.map(backLink => BadRequest(template(id, periodKey, formWithError, mode, serviceInfoContent, backLink)))
               },
               dateOfRevalue => {
                 dataCacheConnector.saveFormData[DateOfRevalue](DateOfRevalueConstant, dateOfRevalue)
-                redirectWithBackLink(
-                  isFullTaxPeriodController.controllerId,
-                  controllers.propertyDetails.routes.IsFullTaxPeriodController.view(id),
-                  Some(controllers.propertyDetails.routes.PropertyDetailsDateOfRevalueController.view(id).url)
-                )
+
+                val propertyDetailsFuture: Future[PropertyDetailsRevalued] = for {
+                  hasPropertyBeenRevalued <- dataCacheConnector.fetchAndGetFormData[HasBeenRevalued](HasPropertyBeenRevalued)
+                  revaluedValue <- dataCacheConnector.fetchAndGetFormData[PropertyDetailsNewValuation](propertyDetailsNewValuationValue)
+                  dateOfChange <- dataCacheConnector.fetchAndGetFormData[DateOfChange](FortyThousandValueDateOfChange)
+                } yield {
+                  PropertyDetailsRevalued(
+                    isPropertyRevalued = hasPropertyBeenRevalued.flatMap(_.isPropertyRevalued),
+                    revaluedValue = revaluedValue.flatMap(_.revaluedValue),
+                    revaluedDate = dateOfRevalue.dateOfRevalue,
+                    partAcqDispDate = dateOfChange.flatMap(_.dateOfChange)
+                  )
+                }
+                propertyDetailsFuture.flatMap { propertyDetails =>
+                  for {
+                    _ <- propertyDetailsService.saveDraftPropertyDetailsRevalued(id, propertyDetails)
+                    result <- redirectWithBackLink(
+                      isFullTaxPeriodController.controllerId,
+                      controllers.propertyDetails.routes.IsFullTaxPeriodController.view(id),
+                      Some(controllers.propertyDetails.routes.PropertyDetailsDateOfRevalueController.view(id).url)
+                    )
+                  } yield result
+                }
               }
             )
           }