[MG] [OPS-13580] Email content updates to remove if not in session (#34)

Author: michaelgroves90

app/uk/gov/hmrc/cardpaymentfrontend/controllers/CheckYourAnswersController.scala

@@ -53,8 +53,9 @@ class CheckYourAnswersController @Inject() (
     val referenceRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersReferenceRow(journeyRequest)(appConfig.payFrontendBaseUrl)
     val additionalReferenceRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersAdditionalReferenceRow(journeyRequest)
     val amountRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersAmountSummaryRow(journeyRequest)(appConfig.payFrontendBaseUrl)
-    val maybeEmailRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersEmailAddressRow(journeyRequest)
     val cardBillingAddressRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersCardBillingAddressRow(journeyRequest)
+    // If no email is present in the session, no Email Row is shown
+    val maybeEmailRow: Option[CheckYourAnswersRow] = extendedOrigin.checkYourAnswersEmailAddressRow(journeyRequest)
 
     val summaryListRows: Seq[SummaryListRow] = Seq(
       paymentDate,

app/uk/gov/hmrc/cardpaymentfrontend/controllers/PaymentCompleteController.scala

@@ -50,7 +50,7 @@ class PaymentCompleteController @Inject() (
   val renderPage: Action[AnyContent] = actions.journeyAction { implicit journeyRequest: JourneyRequest[AnyContent] =>
 
     val maybeEmailFromSession: Option[EmailAddress] =
-      journeyRequest.readFromSession[EmailAddress](journeyRequest.journeyId, Keys.email).map(email => EmailAddress(email.value))
+      journeyRequest.readFromSession[EmailAddress](journeyRequest.journeyId, Keys.email).filter(!_.value.isBlank).map(email => EmailAddress(email.value))
 
     val langIsEnglish: Boolean = journeyRequest.lang.code =!= "cy"
 

app/uk/gov/hmrc/cardpaymentfrontend/models/extendedorigins/ExtendedOrigin.scala

@@ -86,17 +86,18 @@ trait ExtendedOrigin {
 
   def checkYourAnswersEmailAddressRow(journeyRequest: JourneyRequest[AnyContent]): Option[CheckYourAnswersRow] = {
     val maybeEmail: Option[EmailAddress] = journeyRequest.readFromSession[EmailAddress](journeyRequest.journeyId, Keys.email)
-    maybeEmail.map { email =>
-      CheckYourAnswersRow(
-        titleMessageKey = "check-your-details.email-address",
-        value           = Seq(email.value),
-        changeLink      = Some(Link(
-          href       = uk.gov.hmrc.cardpaymentfrontend.controllers.routes.EmailAddressController.renderPage,
-          linkId     = "check-your-details-email-address-change-link",
-          messageKey = "check-your-details.change"
-        ))
-      )
-    }
+    maybeEmail.filter(!_.value.isBlank)
+      .map { email =>
+        CheckYourAnswersRow(
+          titleMessageKey = "check-your-details.email-address",
+          value           = Seq(email.value),
+          changeLink      = Some(Link(
+            href       = uk.gov.hmrc.cardpaymentfrontend.controllers.routes.EmailAddressController.renderPage,
+            linkId     = "check-your-details-email-address-change-link",
+            messageKey = "check-your-details.change"
+          ))
+        )
+      }
   }
 
   // TODO: Update tests to not include country - check doesn't show country

project/AppDependencies.scala

@@ -15,7 +15,7 @@ object AppDependencies {
 
   val compile: Seq[ModuleID] = Seq[ModuleID](
     "uk.gov.hmrc"  %% "bootstrap-frontend-play-30"       % bootstrapVersion,
-    "uk.gov.hmrc"  %% "play-frontend-hmrc-play-30"       % "12.0.0",
+    "uk.gov.hmrc"  %% "play-frontend-hmrc-play-30"       % "12.1.0",
     "com.beachape" %% "enumeratum"                       % "1.7.6",
     "com.beachape" %% "enumeratum-play"                  % "1.8.2",
     "uk.gov.hmrc"  %% "pay-api-cor-card-payment-journey" % payApiCorVersion excludeAll(payApiExclusionRules: _*)

test/uk/gov/hmrc/cardpaymentfrontend/models/extendedorigins/ExtendedOriginSpec.scala

@@ -20,18 +20,18 @@ import payapi.corcommon.model.{AmountInPence, FutureDatedPayment}
 import play.api.mvc.{AnyContent, Call}
 import play.api.test.FakeRequest
 import uk.gov.hmrc.cardpaymentfrontend.actions.JourneyRequest
-import uk.gov.hmrc.cardpaymentfrontend.models.CheckYourAnswersRow
+import uk.gov.hmrc.cardpaymentfrontend.models.{CheckYourAnswersRow, Link}
 import uk.gov.hmrc.cardpaymentfrontend.testsupport.ItSpec
 import uk.gov.hmrc.cardpaymentfrontend.testsupport.TestOps.FakeRequestOps
 import uk.gov.hmrc.cardpaymentfrontend.testsupport.stubs.PayApiStub
 import uk.gov.hmrc.cardpaymentfrontend.testsupport.testdata.TestJourneys
-import uk.gov.hmrc.cardpaymentfrontend.models.Link
 
 import java.time.LocalDate
 
 class ExtendedOriginSpec extends ItSpec {
   private val systemUnderTest = ExtendedBtaSa //ExtendedBtaSa is a concrete reification of the trait ExtendedOrigin, we use it as a substitute here.
   private val fakeGetRequest = FakeRequest("GET", "/cya0").withSessionId()
+
   private val testJourney = TestJourneys.BtaSa.journeyBeforeBeginWebPayment
   private val testJourneyNoDueDate = TestJourneys.BtaSa.journeyBeforeBeginWebPayment.copy(journeySpecificData = testJourney.journeySpecificData.copy(dueDate = None))
   private val testJourneyOverdue = TestJourneys.BtaSa.journeyBeforeBeginWebPayment.copy(journeySpecificData = testJourneyNoDueDate.journeySpecificData.copy(dueDate = Some(LocalDate.of(2023, 12, 12))))
@@ -81,4 +81,30 @@ class ExtendedOriginSpec extends ItSpec {
       result shouldBe (None)
     }
   }
+
+  "checkYourAnswersEmailAddressRow" - {
+
+    val jsonSessionWithEmail =
+      """
+        |{
+        | "email" : "email@gmail.com"
+        |}
+        |""".stripMargin
+
+    val sessionMapWithEmail = ("TestJourneyId-44f9-ad7f-01e1d3d8f151", jsonSessionWithEmail)
+    val fakeGetRequestWithEmail = FakeRequest("GET", "/cya0").withSession(sessionMapWithEmail)
+
+    "return Some[CheckYourAnswersRow] when showEmailAddress returns true" in {
+      val fakeJourneyRequest: JourneyRequest[AnyContent] = new JourneyRequest(testJourney, fakeGetRequestWithEmail)
+      val result: Option[CheckYourAnswersRow] = systemUnderTest.checkYourAnswersEmailAddressRow(fakeJourneyRequest)
+      result shouldBe Some(CheckYourAnswersRow("check-your-details.email-address", List("email@gmail.com"), Some(Link(Call("GET", "/pay-by-card/email-address"), "check-your-details-email-address-change-link", "check-your-details.change", None))))
+
+    }
+    "return None when showEmailAddress returns false" in {
+      val testJourneyEmailAddress = TestJourneys.BtaSa.journeyAfterBeginWebPayment
+      val fakeJourneyRequest: JourneyRequest[AnyContent] = new JourneyRequest(testJourneyEmailAddress, fakeGetRequest)
+      val result: Option[CheckYourAnswersRow] = systemUnderTest.checkYourAnswersEmailAddressRow(fakeJourneyRequest)
+      result shouldBe (None)
+    }
+  }
 }