TAV-170: Bug: Handle badly formed ids in requests.

hmrc · Dec 17, 2020 · f7f8092 · f7f8092
1 parent 062c505
commit f7f8092
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/osgb/AddressLookupIdController.scala b/app/osgb/AddressLookupIdController.scala
@@ -25,6 +25,7 @@ import uk.gov.hmrc.address.v2.AddressRecord
 import uk.gov.hmrc.logging.SimpleLogger
 
 import scala.concurrent.{ExecutionContext, Future}
+import scala.util.Try
 
 class AddressLookupIdController @Inject()(addressSearch: AddressSearcher, responseProcessor: ResponseProcessor,
  logger: SimpleLogger, ec: ExecutionContext, cc: ControllerComponents)
@@ -44,7 +45,7 @@ class AddressLookupIdController @Inject()(addressSearch: AddressSearcher, respon
 
  private[osgb] def findByIdRequest[A](request: Request[A], id: String, marshall: AddressRecord => JsValue): Future[Result] = {
  val origin = getOriginHeaderIfSatisfactory(request.headers)
- addressSearch.findID(id).map {
+ Try(addressSearch.findID(id).map {
  a =>
  val list = a.toList
  logEvent("LOOKUP", "origin" -> origin, "id" -> id, "matches" -> list.size.toString)
@@ -55,6 +56,6 @@ class AddressLookupIdController @Inject()(addressSearch: AddressSearcher, respon
  else {
  NotFound(s"id matched nothing")
  }
- }
+ }).getOrElse(Future.successful(BadRequest(s"Check the id supplied: $id")))
  }
 }
diff --git a/app/repositories/AddressLookupRepository.scala b/app/repositories/AddressLookupRepository.scala
@@ -20,6 +20,7 @@ import cats.effect.IO
 import doobie.Transactor
 import doobie.implicits._
 import doobie.util.fragment
+
 import javax.inject.Inject
 import osgb.SearchParameters
 import osgb.services.AddressSearcher
@@ -35,11 +36,11 @@ class AddressLookupRepository @Inject()(transactor: Transactor[IO]) extends Addr
  import AddressLookupRepository._
 
 
- override def findID(id: String): Future[Option[DbAddress]] = findUprn(id).map(_.headOption)
+ override def findID(id: String): Future[Option[DbAddress]] = findUprn(cleanUprn(id)).map(_.headOption)
 
  override def findUprn(uprn: String): Future[List[DbAddress]] = {
  val queryFragment = baseQuery ++
- sql""" WHERE uprn = ${cleanUprn(uprn).toInt}"""
+ sql""" WHERE uprn = ${uprn.toInt}"""
 
  queryFragment.query[SqlDbAddress].to[List].transact(transactor).unsafeToFuture().map(l => l.map(mapToDbAddress))
  }