1 files changed, 12 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/json.scala b/src/main/scala/xyz/driver/core/json.scala
index 4daf127..edc2347 100644
--- a/src/main/scala/xyz/driver/core/json.scala
+++ b/src/main/scala/xyz/driver/core/json.scala
@@ -181,10 +181,18 @@ object json extends PathMatchers with Unmarshallers {
   }
 
   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 = jsonFormat3(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"))
     }
   }