Merge branch 'master' into add-slot-eligibility-arms

2 files changed, 8 insertions, 10 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala
index 8b4974f..22bea6b 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiDocumentType.scala
@@ -2,15 +2,14 @@ package xyz.driver.pdsuidomain.formats.json.document
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, JsPath}
-import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.DocumentType
 
 final case class ApiDocumentType(id: Long, name: String) {
 
-  def toDomain = DocumentType(
-    id = LongId(this.id),
-    name = this.name
-  )
+  def toDomain: DocumentType =
+    DocumentType
+      .fromString(name)
+      .getOrElse(throw new IllegalArgumentException(s"Unknown document type name $name"))
 
 }
 
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala
index c0eddad..9c0c216 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/document/ApiProviderType.scala
@@ -2,15 +2,14 @@ package xyz.driver.pdsuidomain.formats.json.document
 
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, JsPath}
-import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.ProviderType
 
 final case class ApiProviderType(id: Long, name: String) {
 
-  def toDomain = ProviderType(
-    id = LongId(this.id),
-    name = this.name
-  )
+  def toDomain: ProviderType =
+    ProviderType
+      .fromString(name)
+      .getOrElse(throw new IllegalArgumentException(s"Unknown provider type name $name"))
 
 }