From 17a936b05ce7c7ca62fa3f1b3761c7859dad1624 Mon Sep 17 00:00:00 2001
From: Paul Hodgson <paul.hodgson073@gmail.com>
Date: Mon, 28 Sep 2020 16:20:33 +0100
Subject: [PATCH] [PH][MIBM-77] correct copy on check-your-answers

---
 .../testonly/TestOnlyController.scala         |  4 ++--
 .../model/declaration/Declaration.scala       | 24 ++++++++++++-------
 .../views/CheckYourAnswersPage.scala.html     | 15 ++++++++----
 conf/messages                                 |  2 +-
 .../CoreTestData.scala                        |  6 ++---
 .../CheckYourAnswersControllerSpec.scala      | 15 +++++++-----
 6 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/testonly/TestOnlyController.scala b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/testonly/TestOnlyController.scala
index 420bce886..572b37339 100644
--- a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/testonly/TestOnlyController.scala
+++ b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/testonly/TestOnlyController.scala
@@ -49,12 +49,12 @@ class TestOnlyController @Inject()(mcc: MessagesControllerComponents,
           GoodsEntry(
             "wine",
             Some("France"),
-            Some(PriceOfGoods(CurrencyAmount(BigDecimal(100.00)), "EUR")),
+            Some(PriceOfGoods(CurrencyAmount(BigDecimal(100.00)), Currency("Euros", "EUR"))),
             Some(CurrencyAmount(BigDecimal(10.00)))),
           GoodsEntry(
             "cheese",
             Some("France"),
-            Some(PriceOfGoods(CurrencyAmount(BigDecimal(200.00)), "EUR")),
+            Some(PriceOfGoods(CurrencyAmount(BigDecimal(200.00)), Currency("Euros", "EUR"))),
             Some(CurrencyAmount(BigDecimal(20.00))))),
         maybeName = Some(Name("Terry", "Test")),
         maybeAddress = Some(Address("1 Terry Terrace", "Terry Town", "T11 11T")),
diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/declaration/Declaration.scala b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/declaration/Declaration.scala
index 242dc0557..f809775c8 100644
--- a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/declaration/Declaration.scala
+++ b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/declaration/Declaration.scala
@@ -17,6 +17,7 @@
 package uk.gov.hmrc.merchandiseinbaggagefrontend.model.declaration
 
 import java.time.LocalDate
+import java.time.format.DateTimeFormatter
 import java.util.UUID.randomUUID
 
 import play.api.libs.json.{Format, Json, OFormat}
@@ -38,8 +39,16 @@ object CurrencyAmount {
   implicit val format: OFormat[CurrencyAmount] = Json.format[CurrencyAmount]
 }
 
-case class PriceOfGoods(amount: CurrencyAmount, currency: String) {
-  override val toString = s"$amount $currency"
+case class Currency(name: String, code: String) {
+  override val toString = s"$name ($code)"
+}
+
+object Currency {
+  implicit val format: OFormat[Currency] = Json.format[Currency]
+}
+
+case class PriceOfGoods(amount: CurrencyAmount, currency: Currency) {
+  override val toString = s"$amount, $currency"
 }
 
 object PriceOfGoods {
@@ -68,12 +77,7 @@ case class Address(maybeLine1: Option[String],
                    maybeTown: Option[String] = None,
                    maybeCounty: Option[String] = None,
                    postCode: String) {
-
-  override val toString: String = {
-    def lineString(maybeLine: Option[String]) = maybeLine.fold("")(line => s"$line, ")
-
-    s"${lineString(maybeLine1)}${lineString(maybeLine2)}${lineString(maybeTown)}${lineString(maybeCounty)}$postCode"
-  }
+  val populatedAddressLines: Seq[String] = Seq(maybeLine1, maybeLine2, maybeTown, maybeCounty).flatten
 }
 
 object Address {
@@ -90,7 +94,9 @@ object Eori {
   implicit val format: OFormat[Eori] = Json.format[Eori]
 }
 
-case class JourneyDetails(placeOfArrival: String, dateOfArrival: LocalDate)
+case class JourneyDetails(placeOfArrival: String, dateOfArrival: LocalDate) {
+  val formattedDateOfArrival: String = DateTimeFormatter.ofPattern("dd MMM yyyy").format(dateOfArrival)
+}
 
 object JourneyDetails {
   implicit val format: OFormat[JourneyDetails] = Json.format[JourneyDetails]
diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html
index ce141b702..98e13d1f2 100644
--- a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html
+++ b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html
@@ -42,7 +42,7 @@ <h2 class="govuk-heading-m" id="main-message">@messages("checkYourAnswers.detail
     </div>
     <div class="govuk-summary-list__row">
      <dt class="govuk-summary-list__key">@messages("checkYourAnswers.detailsOfTheGoods.taxDue")</dt>
-     <dd class="govuk-summary-list__value" style="text-transform: capitalize">@goods.taxDue</dd>
+     <dd class="govuk-summary-list__value" style="text-transform: capitalize">£@goods.taxDue</dd>
     </div>
    </dl>
   }
@@ -56,7 +56,14 @@ <h2 class="govuk-heading-m" id="main-message">@messages("checkYourAnswers.person
   </div>
   <div class="govuk-summary-list__row">
    <dt class="govuk-summary-list__key">@messages("checkYourAnswers.personalDetails.address")</dt>
-   <dd class="govuk-summary-list__value" style="text-transform: capitalize">@declaration.address</dd>
+   <dd class="govuk-summary-list__value" style="text-transform: capitalize">
+     @for(addressLine <- declaration.address.populatedAddressLines) {
+       @addressLine
+       <br>
+     }
+
+     @declaration.address.postCode
+   </dd>
   </div>
   <div class="govuk-summary-list__row">
    <dt class="govuk-summary-list__key">@messages("checkYourAnswers.personalDetails.eori")</dt>
@@ -73,13 +80,13 @@ <h2 class="govuk-heading-m" id="main-message">@messages("checkYourAnswers.journe
   </div>
   <div class="govuk-summary-list__row">
    <dt class="govuk-summary-list__key">@messages("checkYourAnswers.journeyDetails.dateOfArrival")</dt>
-   <dd class="govuk-summary-list__value" style="text-transform: capitalize">@declaration.journeyDetails.dateOfArrival</dd>
+   <dd class="govuk-summary-list__value" style="text-transform: capitalize">@declaration.journeyDetails.formattedDateOfArrival</dd>
   </div>
  </dl>
 
  <h2 class="govuk-heading-m" id="main-message">@messages("checkYourAnswers.sendDeclaration")</h2>
 
- <p>@messages("checkYourAnswers.sendDeclaration.acknowledgement")</p>
+ <p class="govuk-!-font-size-19">@messages("checkYourAnswers.sendDeclaration.acknowledgement")</p>
 
  <ul class="govuk-list govuk-list--bullet">
   <li>@messages("checkYourAnswers.sendDeclaration.acknowledgement.1")</li>
diff --git a/conf/messages b/conf/messages
index e8374e8fa..560780a19 100644
--- a/conf/messages
+++ b/conf/messages
@@ -104,7 +104,7 @@ checkYourAnswers.journeyDetails.placeOfArrival = Place of arrival
 checkYourAnswers.journeyDetails.dateOfArrival = Date of arrival
 checkYourAnswers.sendDeclaration = Now send your declaration
 checkYourAnswers.sendDeclaration.acknowledgement = I understand that:
-checkYourAnswers.sendDeclaration.acknowledgement.1 = I must pay Customs Duty and VAT on goods I bring them into the UK for trade or business use.
+checkYourAnswers.sendDeclaration.acknowledgement.1 = I must pay Customs Duty and VAT on goods I bring into the UK for trade or business use.
 checkYourAnswers.sendDeclaration.acknowledgement.2 = I will need to show my declaration and invoices if I am stopped by Border Force.
 checkYourAnswers.sendDeclaration.warning = Warning
 checkYourAnswers.sendDeclaration.warning.message = If you do not declare all your goods before entering the UK you may be fined a penalty and have your goods detained by Border Force.
diff --git a/test/uk/gov/hmrc/merchandiseinbaggagefrontend/CoreTestData.scala b/test/uk/gov/hmrc/merchandiseinbaggagefrontend/CoreTestData.scala
index 26deaed20..4822ac6f9 100644
--- a/test/uk/gov/hmrc/merchandiseinbaggagefrontend/CoreTestData.scala
+++ b/test/uk/gov/hmrc/merchandiseinbaggagefrontend/CoreTestData.scala
@@ -19,7 +19,7 @@ package uk.gov.hmrc.merchandiseinbaggagefrontend
 import java.time.LocalDate.now
 
 import uk.gov.hmrc.merchandiseinbaggagefrontend.model.api.{AmountInPence, MerchandiseDetails, MibReference, PayApitRequest, TraderDetails}
-import uk.gov.hmrc.merchandiseinbaggagefrontend.model.declaration.{Address, CurrencyAmount, Declaration, DeclarationJourney, Eori, GoodsEntry, JourneyDetails, Name, PriceOfGoods, SessionId}
+import uk.gov.hmrc.merchandiseinbaggagefrontend.model.declaration.{Address, Currency, CurrencyAmount, Declaration, DeclarationJourney, Eori, GoodsEntry, JourneyDetails, Name, PriceOfGoods, SessionId}
 
 trait CoreTestData {
 
@@ -40,7 +40,7 @@ trait CoreTestData {
     GoodsEntry(
       "wine",
       Some("France"),
-      Some(PriceOfGoods(CurrencyAmount(BigDecimal(100.00)), "EUR")),
+      Some(PriceOfGoods(CurrencyAmount(BigDecimal(100.00)), Currency("Euros", "EUR"))),
       Some(CurrencyAmount(BigDecimal(10.00))))
 
   val completedDeclarationJourney: DeclarationJourney =
@@ -52,7 +52,7 @@ trait CoreTestData {
         GoodsEntry(
           "cheese",
           Some("France"),
-          Some(PriceOfGoods(CurrencyAmount(BigDecimal(200.00)), "EUR")),
+          Some(PriceOfGoods(CurrencyAmount(BigDecimal(200.00)), Currency("Euros", "EUR"))),
           Some(CurrencyAmount(BigDecimal(20.00))))),
       maybeName = Some(Name("Terry", "Test")),
       maybeAddress = Some(Address("1 Terry Terrace", "Terry Town", "T11 11T")),
diff --git a/test/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/CheckYourAnswersControllerSpec.scala b/test/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/CheckYourAnswersControllerSpec.scala
index 560a0cad2..34e7b7412 100644
--- a/test/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/CheckYourAnswersControllerSpec.scala
+++ b/test/uk/gov/hmrc/merchandiseinbaggagefrontend/controllers/CheckYourAnswersControllerSpec.scala
@@ -45,17 +45,19 @@ class CheckYourAnswersControllerSpec extends DeclarationJourneyControllerSpec {
         content must include("Country")
         content must include("France")
         content must include("Price")
-        content must include("100.00 EUR")
-        content must include("200.00 EUR")
+        content must include("100.00, Euros (EUR)")
+        content must include("200.00, Euros (EUR)")
         content must include("Tax due")
-        content must include("10.00")
-        content must include("20.00")
+        content must include("£10.00")
+        content must include("£20.00")
 
         content must include("Personal details")
         content must include("Name")
         content must include("Terry Test")
         content must include("Address")
-        content must include("1 Terry Terrace, Terry Town, T11 11T")
+        content must include("1 Terry Terrace")
+        content must include("Terry Town")
+        content must include("T11 11T")
         content must include("EORI number")
         content must include("TerrysEori")
 
@@ -63,10 +65,11 @@ class CheckYourAnswersControllerSpec extends DeclarationJourneyControllerSpec {
         content must include("Place of arrival")
         content must include("Dover")
         content must include("Date of arrival")
+        content must include("28 Sep 2020")
 
         content must include("Now send your declaration")
         content must include("I understand that:")
-        content must include("I must pay Customs Duty and VAT on goods I bring them into the UK for trade or business use.")
+        content must include("I must pay Customs Duty and VAT on goods I bring into the UK for trade or business use.")
         content must include("I will need to show my declaration and invoices if I am stopped by Border Force.")
         content must include("Warning")
         content must include("If you do not declare all your goods before entering the UK you may be fined a penalty and have your goods detained by Border Force.")