Dac6 3164: Add FI check-answers - change link journeys and cleanup

app/navigation/Navigator.scala

@@ -173,7 +173,14 @@ class Navigator @Inject() () {
   }
 
   private val checkRouteMap: Page => UserAnswers => Call = {
-
+    case ReportForRegisteredBusinessPage =>
+      userAnswers =>
+        yesNoPage(
+          userAnswers,
+          ReportForRegisteredBusinessPage,
+          redirectToCheckYouAnswers(userAnswers),
+          controllers.routes.IndexController.onPageLoad()
+        )
     case HaveUniqueTaxpayerReferencePage =>
       userAnswers =>
         yesNoPage(
@@ -182,20 +189,14 @@ class Navigator @Inject() () {
           routes.WhatIsUniqueTaxpayerReferenceController.onPageLoad(CheckMode),
           redirectToCheckYouAnswers(userAnswers)
         )
-    case FirstContactNamePage =>
-      userAnswers => resolveNextRoute(userAnswers, routes.FirstContactEmailController.onPageLoad(CheckMode))
-    case FirstContactEmailPage =>
-      userAnswers => resolveNextRoute(userAnswers, routes.FirstContactHavePhoneController.onPageLoad(CheckMode))
     case FirstContactHavePhonePage =>
       userAnswers =>
         yesNoPage(
           userAnswers,
           FirstContactHavePhonePage,
           routes.FirstContactPhoneNumberController.onPageLoad(CheckMode),
-          resolveNextRoute(userAnswers, routes.SecondContactExistsController.onPageLoad(CheckMode))
+          redirectToCheckYouAnswers(userAnswers)
         )
-    case FirstContactPhoneNumberPage =>
-      userAnswers => resolveNextRoute(userAnswers, routes.SecondContactExistsController.onPageLoad(CheckMode))
     case SecondContactExistsPage =>
       userAnswers =>
         yesNoPage(
@@ -217,7 +218,6 @@ class Navigator @Inject() () {
           routes.SecondContactPhoneNumberController.onPageLoad(CheckMode),
           redirectToCheckYouAnswers(userAnswers)
         )
-    case SecondContactPhoneNumberPage => redirectToCheckYouAnswers
     case IsTheAddressCorrectPage =>
       userAnswers =>
         yesNoPage(
@@ -242,10 +242,7 @@ class Navigator @Inject() () {
           redirectToCheckYouAnswers(userAnswers),
           routes.UkAddressController.onPageLoad(CheckMode)
         )
-    case PostcodePage      => addressLookupNavigation(CheckMode)
-    case NonUkAddressPage  => redirectToCheckYouAnswers
-    case UkAddressPage     => redirectToCheckYouAnswers
-    case SelectAddressPage => redirectToCheckYouAnswers
+    case PostcodePage => addressLookupNavigation(CheckMode)
     case HaveGIINPage =>
       userAnswers =>
         yesNoPage(

app/pages/QuestionPage.scala

@@ -16,6 +16,16 @@
 
 package pages
 
+import models.UserAnswers
 import queries.{Gettable, Settable}
 
-trait QuestionPage[A] extends Page with Gettable[A] with Settable[A]
+import scala.util.Try
+
+trait QuestionPage[A] extends Page with Gettable[A] with Settable[A] {
+
+  def removePages(pages: Seq[Settable[_]], userAnswers: UserAnswers): Try[UserAnswers] =
+    pages.foldLeft(Try(userAnswers))(
+      (ua, page) => ua.flatMap(_.remove(page))
+    )
+
+}

app/pages/addFinancialInstitution/HaveUniqueTaxpayerReferencePage.scala

@@ -30,8 +30,13 @@ case object HaveUniqueTaxpayerReferencePage extends QuestionPage[Boolean] {
 
   override def cleanup(value: Option[Boolean], userAnswers: UserAnswers): Try[UserAnswers] =
     value match {
-      case Some(false) => userAnswers.remove(WhatIsUniqueTaxpayerReferencePage)
-      case _           => super.cleanup(value, userAnswers)
+      case Some(false) =>
+        val pagesToRemove = Seq(WhatIsUniqueTaxpayerReferencePage, IsThisAddressPage)
+        removePages(pagesToRemove, userAnswers)
+
+      case Some(true) => userAnswers.remove(IsThisAddressPage)
+
+      case _ => super.cleanup(value, userAnswers)
     }
 
 }

app/pages/addFinancialInstitution/IsRegisteredBusiness/IsTheAddressCorrectPage.scala

@@ -16,12 +16,40 @@
 
 package pages.addFinancialInstitution.IsRegisteredBusiness
 
+import models.UserAnswers
 import pages.QuestionPage
+import pages.addFinancialInstitution._
 import play.api.libs.json.JsPath
 
+import scala.util.Try
+
 case object IsTheAddressCorrectPage extends QuestionPage[Boolean] {
 
   override def path: JsPath = JsPath \ toString
 
   override def toString: String = "isTheAddressCorrect"
+
+  override def cleanup(value: Option[Boolean], userAnswers: UserAnswers): Try[UserAnswers] =
+    value match {
+      case Some(false) =>
+        val pagesToRemove = Seq(
+          FetchedRegisteredAddressPage
+        )
+
+        removePages(pagesToRemove, userAnswers)
+
+      case Some(true) =>
+        val pagesToRemove = Seq(
+          WhereIsFIBasedPage,
+          NonUkAddressPage,
+          PostcodePage,
+          SelectedAddressLookupPage,
+          IsThisAddressPage,
+          UkAddressPage
+        )
+        removePages(pagesToRemove, userAnswers)
+
+      case _ => super.cleanup(value, userAnswers)
+    }
+
 }

app/pages/addFinancialInstitution/IsRegisteredBusiness/IsThisYourBusinessNamePage.scala

@@ -16,12 +16,26 @@
 
 package pages.addFinancialInstitution.IsRegisteredBusiness
 
+import models.UserAnswers
 import pages.QuestionPage
+import pages.addFinancialInstitution._
 import play.api.libs.json.JsPath
 
+import scala.util.Try
+
 case object IsThisYourBusinessNamePage extends QuestionPage[Boolean] {
 
   override def path: JsPath = JsPath \ toString
 
   override def toString: String = "isThisYourBusinessName"
+
+  override def cleanup(value: Option[Boolean], userAnswers: UserAnswers): Try[UserAnswers] =
+    value match {
+      case Some(false) =>
+        val pagesToRemove = Seq(NameOfFinancialInstitutionPage)
+        removePages(pagesToRemove, userAnswers)
+
+      case _ => super.cleanup(value, userAnswers)
+    }
+
 }

app/pages/addFinancialInstitution/IsRegisteredBusiness/ReportForRegisteredBusinessPage.scala

@@ -16,12 +16,45 @@
 
 package pages.addFinancialInstitution.IsRegisteredBusiness
 
+import models.UserAnswers
 import pages.QuestionPage
+import pages.addFinancialInstitution._
 import play.api.libs.json.JsPath
 
+import scala.util.Try
+
 case object ReportForRegisteredBusinessPage extends QuestionPage[Boolean] {
 
   override def path: JsPath = JsPath \ toString
 
   override def toString: String = "reportForRegisteredBusiness"
+
+  override def cleanup(value: Option[Boolean], userAnswers: UserAnswers): Try[UserAnswers] =
+    value match {
+      case Some(true) =>
+        val pagesToRemove = Seq(
+          HaveUniqueTaxpayerReferencePage,
+          WhatIsUniqueTaxpayerReferencePage,
+          FirstContactNamePage,
+          FirstContactEmailPage,
+          FirstContactHavePhonePage,
+          FirstContactPhoneNumberPage,
+          SecondContactExistsPage,
+          SecondContactNamePage,
+          SecondContactEmailPage,
+          SecondContactCanWePhonePage,
+          SecondContactPhoneNumberPage
+        )
+        removePages(pagesToRemove, userAnswers)
+
+      case Some(false) =>
+        val pagesToRemove = Seq(
+          IsThisYourBusinessNamePage,
+          IsTheAddressCorrectPage
+        )
+        removePages(pagesToRemove, userAnswers)
+
+      case _ => super.cleanup(value, userAnswers)
+    }
+
 }

app/pages/addFinancialInstitution/WhereIsFIBasedPage.scala

@@ -16,12 +16,36 @@
 
 package pages.addFinancialInstitution
 
+import models.UserAnswers
 import pages.QuestionPage
+import pages.addFinancialInstitution.IsRegisteredBusiness.FetchedRegisteredAddressPage
 import play.api.libs.json.JsPath
 
+import scala.util.Try
+
 case object WhereIsFIBasedPage extends QuestionPage[Boolean] {
 
   override def path: JsPath = JsPath \ toString
 
   override def toString: String = "whereIsFIBased"
+
+  override def cleanup(value: Option[Boolean], userAnswers: UserAnswers): Try[UserAnswers] =
+    value match {
+      case Some(false) =>
+        val pagesToRemove = Seq(
+          PostcodePage,
+          SelectAddressPage,
+          SelectedAddressLookupPage,
+          AddressLookupPage,
+          UkAddressPage,
+          FetchedRegisteredAddressPage,
+          IsThisAddressPage
+        )
+        removePages(pagesToRemove, userAnswers)
+
+      case Some(true) => userAnswers.remove(NonUkAddressPage)
+
+      case _ => super.cleanup(value, userAnswers)
+    }
+
 }

app/viewmodels/checkAnswers/CheckYourAnswersViewModel.scala

@@ -26,7 +26,7 @@ object CheckYourAnswersViewModel {
   def getFinancialInstitutionSummaries(ua: UserAnswers)(implicit messages: Messages): Seq[SummaryListRow] =
     Seq(
       ReportForRegisteredBusinessSummary.row(ua, CheckAnswers),
-      IsThisYourBusinessNameSummary.row(ua, CheckAnswers),
+      NameOfFinancialInstitutionSummary.row(ua, CheckAnswers),
       HaveUniqueTaxpayerReferenceSummary.row(ua, CheckAnswers),
       WhatIsUniqueTaxpayerReferenceSummary.row(ua, CheckAnswers),
       getGIINRows(ua, CheckAnswers),

test/base/SpecBase.scala

@@ -19,11 +19,13 @@ package base
 import controllers.actions._
 import models.FinancialInstitutions.TINType.GIIN
 import models.FinancialInstitutions.{AddressDetails, ContactDetails, FIDetail, TINDetails}
-import models.{Address, AddressLookup, AddressResponse, Country, UserAnswers}
+import models.{Address, AddressLookup, AddressResponse, Country, GIINumber, UniqueTaxpayerReference, UserAnswers}
 import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures}
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.must.Matchers
 import org.scalatest.{OptionValues, TryValues}
+import pages.addFinancialInstitution.IsRegisteredBusiness.{IsTheAddressCorrectPage, IsThisYourBusinessNamePage}
+import pages.addFinancialInstitution._
 import play.api.Application
 import play.api.i18n.{Messages, MessagesApi}
 import play.api.inject.bind
@@ -209,6 +211,32 @@ trait SpecBase extends AnyFreeSpec with Matchers with TryValues with OptionValue
   val testAddressResponse: AddressResponse = AddressResponse("value 1", Some("value 2"), Some("value 3"), Some("value 4"), Some("XX9 9XX"), Country.GB.code)
   val testAddressLookup: AddressLookup     = AddressLookup(Some("1 Address line 1"), None, None, None, "Town", None, "ZZ1 1ZZ", Some(Country.GB))
 
+  val userAnswersForAddFI: UserAnswers = emptyUserAnswers
+    .withPage(NameOfFinancialInstitutionPage, "testfi")
+    .withPage(HaveUniqueTaxpayerReferencePage, true)
+    .withPage(WhatIsUniqueTaxpayerReferencePage, UniqueTaxpayerReference("222333444"))
+    .withPage(HaveGIINPage, true)
+    .withPage(WhatIsGIINPage, GIINumber("98096B.00000.LE.350"))
+    .withPage(WhereIsFIBasedPage, true)
+    .withPage(SelectedAddressLookupPage, testAddressLookup)
+    .withPage(IsThisAddressPage, true)
+    .withPage(FirstContactNamePage, "MrTest")
+    .withPage(FirstContactEmailPage, "[email protected]")
+    .withPage(FirstContactHavePhonePage, true)
+    .withPage(FirstContactPhoneNumberPage, "0123456789")
+    .withPage(SecondContactExistsPage, true)
+    .withPage(SecondContactNamePage, "MrsTest")
+    .withPage(SecondContactEmailPage, "[email protected]")
+    .withPage(SecondContactCanWePhonePage, true)
+    .withPage(SecondContactPhoneNumberPage, "0234567891")
+
+  val userAnswersForAddUserAsFI: UserAnswers = emptyUserAnswers
+    .withPage(IsThisYourBusinessNamePage, true)
+    .withPage(HaveGIINPage, true)
+    .withPage(WhatIsGIINPage, GIINumber("98096B.00000.LE.350"))
+    .withPage(WhereIsFIBasedPage, true)
+    .withPage(IsTheAddressCorrectPage, true)
+
   implicit val hc: HeaderCarrier    = HeaderCarrier()
   def emptyUserAnswers: UserAnswers = UserAnswers(userAnswersId)