From e22a94604d6090d88801ec52c39f4eab500e80e1 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@driver.xyz>
Date: Mon, 24 Jul 2017 16:24:12 -0700
Subject: Implement ReP rest services

---
 .../xyz/driver/pdsuidomain/entities/Document.scala | 22 ++++++++++++----------
 .../pdsuidomain/entities/MedicalRecord.scala       | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 11 deletions(-)

(limited to 'src/main/scala/xyz/driver/pdsuidomain/entities')

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
index d324fcd..1f73184 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala
@@ -181,13 +181,14 @@ object Document {
     val All         = Set[Status](New, Organized, Extracted, Done, Flagged, Archived)
     val AllPrevious = Set[Status](Organized, Extracted)
 
-    val fromString: PartialFunction[String, Status] = {
-      case "New"       => Status.New
-      case "Organized" => Status.Organized
-      case "Extracted" => Status.Extracted
-      case "Done"      => Status.Done
-      case "Flagged"   => Status.Flagged
-      case "Archived"  => Status.Archived
+    def fromString(status: String): Option[Status] = status match {
+      case "New"       => Some(Status.New)
+      case "Organized" => Some(Status.Organized)
+      case "Extracted" => Some(Status.Extracted)
+      case "Done"      => Some(Status.Done)
+      case "Flagged"   => Some(Status.Flagged)
+      case "Archived"  => Some(Status.Archived)
+      case _           => None
     }
 
     def statusToString(x: Status): String = x match {
@@ -216,9 +217,10 @@ object Document {
 
     val All = Set[RequiredType](OPN, PN)
 
-    val fromString: PartialFunction[String, RequiredType] = {
-      case "OPN" => RequiredType.OPN
-      case "PN"  => RequiredType.PN
+    def fromString(tpe: String): Option[RequiredType] = tpe match {
+      case "OPN" => Some(RequiredType.OPN)
+      case "PN"  => Some(RequiredType.PN)
+      case _     => None
     }
 
     def requiredTypeToString(x: RequiredType): String = x match {
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
index 3b53945..9b33af4 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecord.scala
@@ -104,6 +104,21 @@ object MedicalRecord {
     case object Flagged       extends Status
     case object Archived      extends Status
 
+    def fromString(status: String): Option[Status] = status match {
+      case "Unprocessed"   => Some(Unprocessed)
+      case "PreCleaning"   => Some(PreCleaning)
+      case "New"           => Some(New)
+      case "Cleaned"       => Some(Cleaned)
+      case "PreOrganized"  => Some(PreOrganized)
+      case "PreOrganizing" => Some(PreOrganizing)
+      case "Reviewed"      => Some(Reviewed)
+      case "Organized"     => Some(Organized)
+      case "Done"          => Some(Done)
+      case "Flagged"       => Some(Flagged)
+      case "Archived"      => Some(Archived)
+      case _               => None
+    }
+
     val All = Set[Status](
       Unprocessed,
       PreCleaning,
@@ -150,7 +165,6 @@ final case class MedicalRecord(id: LongId[MedicalRecord],
                                disease: String,
                                caseId: Option[CaseId],
                                physician: Option[String],
-                               sourceName: String,
                                meta: Option[TextJson[List[Meta]]],
                                predictedMeta: Option[TextJson[List[Meta]]],
                                predictedDocuments: Option[TextJson[List[Document]]],
-- 
cgit v1.2.3