Validate phone numbers when parsing from JSON (#183)v1.11.8

* Validate phone numbers when parsing from JSON

* Change to intercept for test

1 files changed, 2 insertions, 8 deletions

diff --git a/src/main/scala/xyz/driver/core/domain.scala b/src/main/scala/xyz/driver/core/domain.scala
index fa3b5c4..59bed54 100644
--- a/src/main/scala/xyz/driver/core/domain.scala
+++ b/src/main/scala/xyz/driver/core/domain.scala
@@ -32,14 +32,8 @@ object domain {
     private val phoneUtil = PhoneNumberUtil.getInstance()
 
     def parse(phoneNumber: String): Option[PhoneNumber] = {
-      val phone = scala.util.Try(phoneUtil.parseAndKeepRawInput(phoneNumber, "US")).toOption
-
-      val validated = phone match {
-        case None => None
-        case Some(pn) =>
-          if (!phoneUtil.isValidNumber(pn)) None
-          else Some(pn)
-      }
+      val validated =
+        util.Try(phoneUtil.parseAndKeepRawInput(phoneNumber, "US")).toOption.filter(phoneUtil.isValidNumber)
       validated.map(pn => PhoneNumber(pn.getCountryCode.toString, pn.getNationalNumber.toString))
     }
   }