Merge pull request #90 from hmrc/NGR-3025_Report-a-Change-First-Rent-Period_Highlight-2-missed-date-fields

NGR-3025 First Rent Period: Highlight 2 missed date fields

Author: tumakha

app/uk/gov/hmrc/ngrraldfrontend/controllers/ProvideDetailsOfFirstRentPeriodController.scala

@@ -66,22 +66,12 @@ class ProvideDetailsOfFirstRentPeriodController @Inject()(view: ProvideDetailsOf
         .bindFromRequest()
         .fold(
           formWithErrors =>
-            val correctedFormErrors = formWithErrors.errors.map { formError =>
-              (formError.key, formError.messages) match
-                case (key, messages) if messages.head.contains("provideDetailsOfFirstRentPeriod.startDate") =>
-                  setCorrectKey(formError, "provideDetailsOfFirstRentPeriod", "startDate")
-                case (key, messages) if messages.head.contains("provideDetailsOfFirstRentPeriod.endDate") =>
-                  setCorrectKey(formError, "provideDetailsOfFirstRentPeriod", "endDate")
-                case _ =>
-                  formError
-            }
-            val formWithCorrectedErrors = formWithErrors.copy(errors = correctedFormErrors)
             Future.successful(BadRequest(view(
               request.property.addressFull,
-              formWithCorrectedErrors,
+              formWithErrors,
               startDateInput,
               endDateInput,
-              buildRadios(formWithCorrectedErrors, firstRentPeriodRadio(formWithCorrectedErrors, inputText)),
+              buildRadios(formWithErrors, firstRentPeriodRadio(formWithErrors, inputText)),
               mode
             ))),
           provideDetailsOfFirstRentPeriod =>

app/uk/gov/hmrc/ngrraldfrontend/models/forms/mappings/Mappings.scala

@@ -61,3 +61,6 @@ trait Mappings extends CommonFormValidators with Formatters:
 
   def conditionalMoney(errorKeyPrefix: String, requiredOnCondition: Map[String, String] => Boolean): FieldMapping[Option[BigDecimal]] =
     of(using ConditionalMoneyFormatter(errorKeyPrefix, requiredOnCondition))
+
+  def money(errorKeyPrefix: String): FieldMapping[Option[BigDecimal]] =
+    of(using ConditionalMoneyFormatter(errorKeyPrefix, _ => true))

app/uk/gov/hmrc/ngrraldfrontend/views/components/DateTextFields.scala.html

@@ -18,12 +18,26 @@
 @import uk.gov.hmrc.hmrcfrontend.views.html.components.implicits._
 
 @this(govukDateInput: GovukDateInput)
+
 @(form: Form[_], dateInput: DateInput)(implicit messages: Messages)
 
+@formWithCorrectedErrors = @{
+    val secondaryErrors = form.errors.flatMap { formError =>
+        if(formError.messages.head.contains("AndMonth.required.error")) {
+            val monthKey = formError.key.replace(".day", ".month")
+            Seq(formError.copy(key = monthKey))
+        } else if(formError.messages.head.contains("AndYear.required.error")) {
+            val yearKey = formError.key.replace(".day", ".year").replace(".month", ".year")
+            Seq(formError.copy(key = yearKey))
+        } else Seq.empty
+    }
+    form.copy(errors = form.errors ++ secondaryErrors)
+}
+
 @govukDateInput(DateInput(
     id = dateInput.id,
     namePrefix = None,
     fieldset = dateInput.fieldset,
     hint = dateInput.hint,
-    errorMessage = form(dateInput.id).error.map(e => ErrorMessage.errorMessageWithDefaultStringsTranslated(content = Text(messages(e.message, e.args:_*))))
-).withDayMonthYearFormField(form(dateInput.id)))
+    errorMessage = form(dateInput.id).error.map(e => ErrorMessage.errorMessageWithDefaultStringsTranslated(content = Text(messages(e.message, e.args: _*))))
+).withDayMonthYearFormField(formWithCorrectedErrors(dateInput.id)))