Skip to content

NGR-3023 - Resolved 12 digits with incorrect error message issue #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2025
Merged

NGR-3023 - Resolved 12 digits with incorrect error message issue #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3bd0d
NGR-3023 - Resolved 12 digits with incorrect error message issue
peterdrobinson Sep 24, 2025
ecbd6cd
NGR-3023 - Added test for work
peterdrobinson Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/uk/gov/hmrc/ngrraldfrontend/models/forms/WhatYourRentIncludesForm.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ object WhatYourRentIncludesForm extends CommonFormValidators with Mappings {
if (whatYourRentIncludesForm.livingAccommodationRadio.equals("livingAccommodationYes")) {
if (bedroomNumber.isEmpty)
Invalid("whatYourRentIncludes.bedroom.number.required.error")
else if (Try(Integer.parseInt(bedroomNumber.get)).isFailure)
else if (Try(bedroomNumber.get.toLong).isFailure)
Invalid("whatYourRentIncludes.bedroom.number.invalid.error")
else if (Integer.parseInt(bedroomNumber.get) < 1)
else if (bedroomNumber.get.toLong < 1)
Invalid("whatYourRentIncludes.bedroom.number.minimum.error")
else if (Integer.parseInt(bedroomNumber.get) > 99)
else if (bedroomNumber.get.toLong > 99)
Invalid("whatYourRentIncludes.bedroom.number.maximum.error")
else
Valid
Expand Down
15 changes: 15 additions & 0 deletions test/uk/gov/hmrc/ngrraldfrontend/models/forms/WhatYourRentIncludesFormSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,21 @@ class WhatYourRentIncludesFormSpec extends AnyWordSpec with Matchers {
)
val boundForm = WhatYourRentIncludesForm.form.bind(data)

boundForm.hasErrors shouldBe true
boundForm.errors should contain(FormError("", List("whatYourRentIncludes.bedroom.number.maximum.error")))
}
"fail to bind when bedroomNumbers input is 12 digits long" in {
val data = Map(
"livingAccommodationRadio" -> "livingAccommodationYes",
"rentPartAddressRadio" -> "Yes",
"rentEmptyShellRadio" -> "Yes",
"rentIncBusinessRatesRadio" -> "Yes",
"rentIncWaterChargesRadio" -> "Yes",
"rentIncServiceRadio" -> "Yes",
"bedroomNumbers" -> "123123123123"
)
val boundForm = WhatYourRentIncludesForm.form.bind(data)

boundForm.hasErrors shouldBe true
boundForm.errors should contain(FormError("", List("whatYourRentIncludes.bedroom.number.maximum.error")))
}
Expand Down