Skip to content

EmpRef regex was too loose #35

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

Open
OsricWilkinson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

EmpRef regex was too loose #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/main/scala/uk/gov/hmrc/domain/EmpRef.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017 HM Revenue & Customs
* Copyright 2018 HM Revenue & Customs
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -43,10 +43,10 @@ object EmpRef extends ((String, String) => EmpRef){
}

def fromIdentifiers(slashSeparatedIdentifiers: String): EmpRef = {
val empRefPattern = """([^/]*)/([^/]*)""".r
val empRefPattern = """(\d{3})/([a-zA-Z0-9]+)""".r
URLDecoder.decode(slashSeparatedIdentifiers, "UTF-8") match {
case empRefPattern(first, second) => EmpRef(first, second)
case _ => throw new IllegalArgumentException("EmpRef requires two identifiers separated by a slash")
case _ => throw new IllegalArgumentException("EmpRef is three numbers, a slash, and then numbers and letters")
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/test/scala/uk/gov/hmrc/domain/DomainTypeFormatsSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017 HM Revenue & Customs
* Copyright 2018 HM Revenue & Customs
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -164,15 +164,15 @@ class DomainTypeFormatsSpec extends WordSpec with Matchers {
"EmpRef reader" should {

"be able to read obsolete EmpRef structure from Mongo" in {
val dbStructure = JsObject(Seq("taxOfficeNumber" -> JsString("12345"), "taxOfficeReference" -> JsString("ref")))
val dbStructure = JsObject(Seq("taxOfficeNumber" -> JsString("123"), "taxOfficeReference" -> JsString("ref")))
val result = EmpRef.empRefRead.reads(dbStructure)
result.get shouldBe EmpRef("12345", "ref")
result.get shouldBe EmpRef("123", "ref")
}

"be able to read string representation of EmpRef" in {
val restStructure = JsString("12345/ref")
val restStructure = JsString("123/ref")
val result = EmpRef.empRefRead.reads(restStructure)
result.get shouldBe EmpRef("12345", "ref")
result.get shouldBe EmpRef("123", "ref")
}

}
Expand Down