diff options
author | Sergey Nastich <nastich@users.noreply.github.com> | 2018-09-20 13:43:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-20 13:43:28 -0400 |
commit | 388d631b75acec04440b8f285fd98d89bbd898db (patch) | |
tree | fddc1886d76c74956b26010e8b20c7670f475b7a /src/main/scala/xyz | |
parent | 3eb6a9e96bd8bf111490f390ea94a1c6d7677eff (diff) | |
download | driver-core-388d631b75acec04440b8f285fd98d89bbd898db.tar.gz driver-core-388d631b75acec04440b8f285fd98d89bbd898db.tar.bz2 driver-core-388d631b75acec04440b8f285fd98d89bbd898db.zip |
DFC-775 Improve PhoneNumber (backport from master without TN extensions) (#223)v1.14.4
Diffstat (limited to 'src/main/scala/xyz')
-rw-r--r-- | src/main/scala/xyz/driver/core/domain.scala | 38 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/json.scala | 27 |
2 files changed, 56 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/core/domain.scala b/src/main/scala/xyz/driver/core/domain.scala index 59bed54..459c804 100644 --- a/src/main/scala/xyz/driver/core/domain.scala +++ b/src/main/scala/xyz/driver/core/domain.scala @@ -1,13 +1,20 @@ package xyz.driver.core import com.google.i18n.phonenumbers.PhoneNumberUtil +import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat import scalaz.Equal import scalaz.std.string._ import scalaz.syntax.equal._ +import scala.util.Try +import scala.util.control.NonFatal + object domain { final case class Email(username: String, domain: String) { + + val value: String = toString + override def toString: String = username + "@" + domain } @@ -23,18 +30,39 @@ object domain { } } - final case class PhoneNumber(countryCode: String = "1", number: String) { + final case class PhoneNumber(countryCode: String, number: String) { + + /** This is a more human-friendly alias for #toE164String() */ + def toCompactString: String = s"+$countryCode$number" + + /** Outputs the phone number in a E.164-compliant way, e.g. +14151234567 */ + def toE164String: String = toCompactString + + /** + * Outputs the phone number in a "readable" way, e.g. "+1 415-123-45-67 ext. 1234" + * @throws IllegalStateException if the contents of this object is not a valid phone number + */ + @throws[IllegalStateException] + def toHumanReadableString: String = + try { + val phoneNumber = PhoneNumber.phoneUtil.parse(toE164String, "US") + PhoneNumber.phoneUtil.format(phoneNumber, PhoneNumberFormat.INTERNATIONAL) + } catch { + case NonFatal(e) => throw new IllegalStateException(s"$toString is not a valid number", e) + } + override def toString: String = s"+$countryCode $number" } object PhoneNumber { - private val phoneUtil = PhoneNumberUtil.getInstance() + private[PhoneNumber] val phoneUtil = PhoneNumberUtil.getInstance() def parse(phoneNumber: String): Option[PhoneNumber] = { - val validated = - util.Try(phoneUtil.parseAndKeepRawInput(phoneNumber, "US")).toOption.filter(phoneUtil.isValidNumber) - validated.map(pn => PhoneNumber(pn.getCountryCode.toString, pn.getNationalNumber.toString)) + val validated = Try(phoneUtil.parseAndKeepRawInput(phoneNumber, "US")).toOption.filter(phoneUtil.isValidNumber) + validated.map { pn => + PhoneNumber(pn.getCountryCode.toString, pn.getNationalNumber.toString) + } } } } diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala index d9319e9..d87e0c4 100644 --- a/src/main/scala/xyz/driver/core/json.scala +++ b/src/main/scala/xyz/driver/core/json.scala @@ -234,11 +234,30 @@ object json { } } + def PhoneInPath: PathMatcher1[PhoneNumber] = new PathMatcher1[PhoneNumber] { + def apply(path: Path) = path match { + case Path.Segment(segment, tail) => + PhoneNumber + .parse(segment) + .map(parsed => Matched(tail, Tuple1(parsed))) + .getOrElse(Unmatched) + case _ => Unmatched + } + } + implicit object phoneNumberFormat extends RootJsonFormat[PhoneNumber] { - private val basicFormat = jsonFormat2(PhoneNumber.apply) - override def write(obj: PhoneNumber): JsValue = basicFormat.write(obj) - override def read(json: JsValue): PhoneNumber = { - PhoneNumber.parse(basicFormat.read(json).toString).getOrElse(deserializationError("Invalid phone number")) + + private val basicFormat = jsonFormat2(PhoneNumber.apply) + + def write(obj: PhoneNumber): JsValue = basicFormat.write(obj) + + def read(json: JsValue): PhoneNumber = { + val maybePhone = json match { + case JsString(number) => PhoneNumber.parse(number) + case obj: JsObject => PhoneNumber.parse(basicFormat.read(obj).toString) + case _ => None + } + maybePhone.getOrElse(deserializationError("Invalid phone number")) } } |