[PH][MIBM-126] tidy enums (#46)

hmrc · Oct 13, 2020 · a6dd0ef · a6dd0ef
1 parent a37ebee
commit a6dd0ef
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/Enum.scala b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/Enum.scala
@@ -45,7 +45,6 @@ trait EnumEntryRadioItemSupport {
   this: EnumEntry =>
 
   protected val baseMessageKeyForEntry: String = s"$baseMessageKey.$entryName"
-  protected val hintMessageKey: Option[String] = Some(s"$baseMessageKeyForEntry.hint")
   protected val maybeHintMessageKey: Option[String] = None
 
   def radioItem(form: Form[_])(implicit messages: Messages): RadioItem =

diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/core/Declaration.scala b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/core/Declaration.scala
@@ -292,7 +292,9 @@ object CustomsAgent {
   implicit val format: OFormat[CustomsAgent] = Json.format[CustomsAgent]
 }
 
-sealed trait YesNo extends EnumEntry
+sealed trait YesNo extends EnumEntry {
+  val messageKey = s"${YesNo.baseMessageKey}.$entryName"
+}
 
 object YesNo extends Enum[YesNo] {
   override val baseMessageKey: String = "enum"

diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/core/GoodsDestination.scala b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/model/core/GoodsDestination.scala
@@ -35,6 +35,6 @@ object GoodsDestinations extends Enum[GoodsDestination] with RadioSupport[GoodsD
   case object NorthernIreland extends GoodsDestination
 
   case object GreatBritain extends GoodsDestination {
-    override val maybeHintMessageKey: Option[String] = hintMessageKey
+    override val maybeHintMessageKey: Option[String] = Some(s"$baseMessageKeyForEntry.hint")
   }
 }
diff --git a/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html b/app/uk/gov/hmrc/merchandiseinbaggagefrontend/views/CheckYourAnswersPage.scala.html
@@ -113,7 +113,7 @@ <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.travellingByVehicle")</dt>
-   <dd class="govuk-summary-list__value" style="text-transform: capitalize">@declaration.travellingByVehicle</dd>
+   <dd class="govuk-summary-list__value" style="text-transform: capitalize">@messages(declaration.travellingByVehicle.messageKey)</dd>
   </div>
   @declaration.maybeRegistrationNumber.fold(Html("")) { registrationNumber =>
    <div class="govuk-summary-list__row">