Tgp 2609/remove goods description question page (#490)

* TGP-2609: remove goods description question page in the create record journey and remove question row on the check your answers page
hmrc · Oct 4, 2024 · 680eb7d · 680eb7d
1 parent f92a873
commit 680eb7d
Show file tree

Hide file tree

Showing 27 changed files with 42 additions and 838 deletions.
diff --git a/app/controllers/CyaCreateRecordController.scala b/app/controllers/CyaCreateRecordController.scala
@@ -77,7 +77,6 @@ class CyaCreateRecordController @Inject() (
     val list = SummaryListViewModel(
       rows = Seq(
         TraderReferenceSummary.row(userAnswers),
-        UseTraderReferenceSummary.row(userAnswers),
         GoodsDescriptionSummary.row(userAnswers),
         CountryOfOriginSummary.row(userAnswers, countries),
         CommodityCodeSummary.row(userAnswers)

diff --git a/app/controllers/UseTraderReferenceController.scala b/app/controllers/UseTraderReferenceController.scala
diff --git a/app/factories/AuditEventFactory.scala b/app/factories/AuditEventFactory.scala
@@ -110,16 +110,18 @@ case class AuditEventFactory() {
   def createSubmitGoodsRecordEventForCreateRecord(
     affinityGroup: AffinityGroup,
     journey: Journey,
-    goodsRecord: GoodsRecord,
-    isUsingGoodsDescription: Boolean
+    goodsRecord: GoodsRecord
   )(implicit hc: HeaderCarrier): DataEvent = {
     val auditDetails = Map(
       "eori"                       -> goodsRecord.eori,
       "affinityGroup"              -> affinityGroup.toString,
       "journey"                    -> journey.toString,
+      "traderReference"            -> goodsRecord.traderRef,
+      "goodsDescription"           -> goodsRecord.goodsDescription,
+      "countryOfOrigin"            -> goodsRecord.countryOfOrigin,
+      "commodityCode"              -> goodsRecord.commodity.commodityCode,
       traderReferenceKey           -> goodsRecord.traderRef,
       goodsDescriptionKey          -> goodsRecord.goodsDescription,
-      "specifiedGoodsDescription"  -> isUsingGoodsDescription.toString,
       countryOfOriginKey           -> goodsRecord.countryOfOrigin,
       commodityCodeKey             -> goodsRecord.commodity.commodityCode,
       "commodityDescription"       -> goodsRecord.commodity.descriptions.headOption.getOrElse("null"),

diff --git a/app/forms/UseTraderReferenceFormProvider.scala b/app/forms/UseTraderReferenceFormProvider.scala
diff --git a/app/models/GoodsRecord.scala b/app/models/GoodsRecord.scala
@@ -40,7 +40,7 @@ object GoodsRecord {
       answers.getPageValue(TraderReferencePage),
       getCommodity(answers),
       answers.getPageValue(CountryOfOriginPage),
-      getGoodsDescription(answers)
+      answers.getPageValue(GoodsDescriptionPage)
     ).parMapN((eori, traderReference, commodity, countryOfOrigin, goodsDescription) =>
       GoodsRecord(
         eori,
@@ -51,13 +51,6 @@ object GoodsRecord {
       )
     )
 
-  private def getGoodsDescription(answers: UserAnswers): EitherNec[ValidationError, String] =
-    answers.getOppositeOptionalPageValue(answers, UseTraderReferencePage, GoodsDescriptionPage) match {
-      case Right(Some(data)) => Right(data)
-      case Right(None)       => answers.getPageValue(TraderReferencePage)
-      case Left(errors)      => Left(errors)
-    }
-
   private def getCommodity(answers: UserAnswers): EitherNec[ValidationError, Commodity] =
     answers.getPageValue(CommodityCodePage) match {
       case Right(code)  =>

diff --git a/app/models/UserAnswers.scala b/app/models/UserAnswers.scala
@@ -48,17 +48,6 @@ final case class UserAnswers(
       case Left(errors) => Left(errors)
     }
 
-  def getOppositeOptionalPageValue(
-    answers: UserAnswers,
-    questionPage: QuestionPage[Boolean],
-    optionalPage: QuestionPage[String]
-  ): EitherNec[ValidationError, Option[String]] =
-    getPageValue(questionPage) match {
-      case Right(false) => getPageValue(optionalPage).map(Some(_))
-      case Right(true)  => unexpectedValueDefined(answers, optionalPage)
-      case Left(errors) => Left(errors)
-    }
-
   def getOptionalPageValueForOptionalBooleanPage[A](
     answers: UserAnswers,
     questionPage: QuestionPage[Boolean],

diff --git a/app/models/helper/Journey.scala b/app/models/helper/Journey.scala
@@ -39,7 +39,6 @@ case object CreateRecordJourney extends Journey {
   val pages: Seq[String]        =
     Seq(
       traderReferencePage,
-      useTraderReferencePage,
       goodsDescriptionPage,
       countryOfOriginPage,
       commodityCodePage,

diff --git a/app/navigation/Navigator.scala b/app/navigation/Navigator.scala
@@ -50,9 +50,8 @@ class Navigator @Inject() (categorisationService: CategorisationService) {
     case RemoveNiphlPage                           => navigateFromRemoveNiphlPage
     case CyaMaintainProfilePage                    => _ => routes.ProfileController.onPageLoad()
     case CreateRecordStartPage                     => _ => routes.TraderReferenceController.onPageLoadCreate(NormalMode)
-    case TraderReferencePage                       => _ => routes.UseTraderReferenceController.onPageLoad(NormalMode)
+    case TraderReferencePage                       => _ => routes.GoodsDescriptionController.onPageLoadCreate(NormalMode)
     case p: TraderReferenceUpdatePage              => _ => routes.CyaUpdateRecordController.onPageLoadTraderReference(p.recordId)
-    case UseTraderReferencePage                    => navigateFromUseTraderReference
     case GoodsDescriptionPage                      => _ => routes.CountryOfOriginController.onPageLoadCreate(NormalMode)
     case p: GoodsDescriptionUpdatePage             => _ => routes.CyaUpdateRecordController.onPageLoadGoodsDescription(p.recordId)
     case CountryOfOriginPage                       => _ => routes.CommodityCodeController.onPageLoadCreate(NormalMode)
@@ -160,15 +159,6 @@ class Navigator @Inject() (categorisationService: CategorisationService) {
       .getOrElse(routes.JourneyRecoveryController.onPageLoad(Some(continueUrl)))
   }
 
-  private def navigateFromUseTraderReference(answers: UserAnswers): Call =
-    answers
-      .get(UseTraderReferencePage)
-      .map {
-        case false => routes.GoodsDescriptionController.onPageLoadCreate(NormalMode)
-        case true  => routes.CountryOfOriginController.onPageLoadCreate(NormalMode)
-      }
-      .getOrElse(routes.JourneyRecoveryController.onPageLoad())
-
   private def navigateFromHasCorrectGoods(answers: UserAnswers): Call =
     answers
       .get(HasCorrectGoodsPage)
@@ -465,7 +455,6 @@ class Navigator @Inject() (categorisationService: CategorisationService) {
     case UkimsNumberUpdatePage                     => _ => routes.CyaMaintainProfileController.onPageLoadUkimsNumber
     case TraderReferencePage                       => _ => routes.CyaCreateRecordController.onPageLoad
     case p: TraderReferenceUpdatePage              => _ => routes.CyaUpdateRecordController.onPageLoadTraderReference(p.recordId)
-    case UseTraderReferencePage                    => navigateFromUseTraderReferenceCheck
     case GoodsDescriptionPage                      => _ => routes.CyaCreateRecordController.onPageLoad
     case p: GoodsDescriptionUpdatePage             => _ => routes.CyaUpdateRecordController.onPageLoadGoodsDescription(p.recordId)
     case CountryOfOriginPage                       => _ => routes.CyaCreateRecordController.onPageLoad
@@ -520,20 +509,6 @@ class Navigator @Inject() (categorisationService: CategorisationService) {
       }
       .getOrElse(routes.JourneyRecoveryController.onPageLoad())
 
-  private def navigateFromUseTraderReferenceCheck(answers: UserAnswers): Call =
-    answers
-      .get(UseTraderReferencePage)
-      .map {
-        case false =>
-          if (answers.isDefined(GoodsDescriptionPage)) {
-            routes.CyaCreateRecordController.onPageLoad
-          } else {
-            routes.GoodsDescriptionController.onPageLoadCreate(CheckMode)
-          }
-        case true  => routes.CyaCreateRecordController.onPageLoad
-      }
-      .getOrElse(routes.JourneyRecoveryController.onPageLoad())
-
   private def navigateFromHasCorrectGoodsCheck(answers: UserAnswers): Call =
     answers
       .get(HasCorrectGoodsPage)

diff --git a/app/pages/UseTraderReferencePage.scala b/app/pages/UseTraderReferencePage.scala
diff --git a/app/services/AuditService.scala b/app/services/AuditService.scala
@@ -16,7 +16,7 @@
 
 package services
 
-import cats.implicits.catsSyntaxTuple4Parallel
+import cats.implicits.catsSyntaxTuple3Parallel
 import com.google.inject.Inject
 import factories.AuditEventFactory
 import models.audits.{AuditGetCategorisationAssessment, AuditValidateCommodityCode, OttAuditData}
@@ -25,7 +25,6 @@ import models.ott.CategorisationInfo
 import models.ott.response.OttResponse
 import models.{AdviceRequest, CategoryRecord, GoodsRecord, SupplementaryRequest, TraderProfile, UpdateGoodsRecord, UserAnswers}
 import org.apache.pekko.Done
-import pages.UseTraderReferencePage
 import play.api.Logging
 import uk.gov.hmrc.auth.core.AffinityGroup
 import uk.gov.hmrc.http.HeaderCarrier
@@ -105,8 +104,7 @@ class AuditService @Inject() (auditConnector: AuditConnector, auditEventFactory:
     val buildEvent = (
       Right(affinityGroup),
       Right(CreateRecordJourney),
-      GoodsRecord.build(userAnswers, eori),
-      userAnswers.getPageValue(UseTraderReferencePage).map(!_)
+      GoodsRecord.build(userAnswers, eori)
     ).parMapN(auditEventFactory.createSubmitGoodsRecordEventForCreateRecord)
 
     buildEvent match {

diff --git a/app/utils/SessionData.scala b/app/utils/SessionData.scala
@@ -39,7 +39,6 @@ case object SessionData {
   val nirmsNumberUpdatePage: String          = "NIRMS"
   val niphlNumberUpdatePage: String          = "NIPHL"
   val traderReferencePage: String            = traderReferenceKey
-  val useTraderReferencePage: String         = "useTraderReference"
   val goodsDescriptionPage: String           = goodsDescriptionKey
   val countryOfOriginPage: String            = countryOfOriginKey
   val commodityCodePage: String              = commodityCodeKey

diff --git a/app/viewmodels/checkAnswers/UseTraderReferenceSummary.scala b/app/viewmodels/checkAnswers/UseTraderReferenceSummary.scala