Merge pull request #92 from hmrc/DAC6-3305

DAC6-3305: Cleanup added to fetchedAddress
hmrc · Aug 29, 2024 · 2b0cc98 · 2b0cc98
2 parents b16f5ef + 347dff8
commit 2b0cc98
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/app/pages/addFinancialInstitution/IsRegisteredBusiness/FetchedRegisteredAddressPage.scala b/app/pages/addFinancialInstitution/IsRegisteredBusiness/FetchedRegisteredAddressPage.scala
@@ -16,12 +16,27 @@
 
 package pages.addFinancialInstitution.IsRegisteredBusiness
 
-import models.AddressResponse
+import models.{AddressResponse, UserAnswers}
 import pages.QuestionPage
+import pages.addFinancialInstitution.{NonUkAddressPage, SelectedAddressLookupPage, UkAddressPage}
 import play.api.libs.json.JsPath
 
+import scala.util.Try
+
 case object FetchedRegisteredAddressPage extends QuestionPage[AddressResponse] {
 
   override def path: JsPath = JsPath \ toString
 
+  override def cleanup(value: Option[AddressResponse], userAnswers: UserAnswers): Try[UserAnswers] =
+    value.fold(Try(userAnswers))(
+      _ =>
+        List(
+          SelectedAddressLookupPage,
+          UkAddressPage,
+          NonUkAddressPage
+        ).foldLeft(Try(userAnswers))(
+          (ua: Try[UserAnswers], page: QuestionPage[_]) => ua.flatMap(_.remove(page))
+        )
+    )
+
 }
diff --git a/app/viewmodels/checkAnswers/CheckYourAnswersViewModel.scala b/app/viewmodels/checkAnswers/CheckYourAnswersViewModel.scala
@@ -55,9 +55,8 @@ object CheckYourAnswersViewModel {
   def getAddressChangeRoute(answers: UserAnswers): String =
     answers
       .get(ReportForRegisteredBusinessPage) match {
-      case Some(true)  => controllers.addFinancialInstitution.registeredBusiness.routes.IsTheAddressCorrectController.onPageLoad(CheckMode).url
-      case Some(false) => controllers.addFinancialInstitution.routes.WhereIsFIBasedController.onPageLoad(CheckMode).url
-      case None        => controllers.routes.IndexController.onPageLoad().url
+      case Some(true) => controllers.addFinancialInstitution.registeredBusiness.routes.IsTheAddressCorrectController.onPageLoad(CheckMode).url
+      case _          => controllers.addFinancialInstitution.routes.WhereIsFIBasedController.onPageLoad(CheckMode).url
     }
 
   private def getGIINRows(ua: UserAnswers)(implicit messages: Messages): Seq[SummaryListRow] = {

diff --git a/test/pages/addFinancialInstitution/AddressPagesSpec.scala b/test/pages/addFinancialInstitution/AddressPagesSpec.scala
@@ -99,6 +99,31 @@ class AddressPagesSpec extends SpecBase {
       }
 
     }
+    "FetchedRegisteredAddressPage" - {
+      "must remove other address answers from UserAnswers" in {
+        val res1: UserAnswers = emptyUserAnswers
+          .withPage(SelectedAddressLookupPage, testAddressLookup)
+          .withPage(FetchedRegisteredAddressPage, testAddressResponse)
+
+        val res2: UserAnswers = emptyUserAnswers
+          .withPage(UkAddressPage, testAddress)
+          .withPage(FetchedRegisteredAddressPage, testAddressResponse)
+
+        val res3: UserAnswers = emptyUserAnswers
+          .withPage(NonUkAddressPage, testAddress)
+          .withPage(FetchedRegisteredAddressPage, testAddressResponse)
+
+        res1.get(FetchedRegisteredAddressPage) mustBe defined
+        res1.data.fields.size mustBe 1
+
+        res2.get(FetchedRegisteredAddressPage) mustBe defined
+        res2.data.fields.size mustBe 1
+
+        res3.get(FetchedRegisteredAddressPage) mustBe defined
+        res3.data.fields.size mustBe 1
+
+      }
+    }
 
   }
 

diff --git a/test/viewmodels/checkAnswers/CheckYourAnswersViewModelSpec.scala b/test/viewmodels/checkAnswers/CheckYourAnswersViewModelSpec.scala
@@ -87,6 +87,9 @@ class CheckYourAnswersViewModelSpec extends SpecBase {
     "getAddressChangeRoute" - {
       "must be WhereIsFIBased when adding another business" in {
         val answers = ua.withPage(ReportForRegisteredBusinessPage, false)
+
+        sut.getAddressChangeRoute(ua) mustBe
+          controllers.addFinancialInstitution.routes.WhereIsFIBasedController.onPageLoad(CheckMode).url
         sut.getAddressChangeRoute(answers) mustBe
           controllers.addFinancialInstitution.routes.WhereIsFIBasedController.onPageLoad(CheckMode).url
       }