diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-10-10 16:41:33 +0700 |
commit | 4c22afe6a34641f5b35ff4953a5821a2bc940255 (patch) | |
tree | 4f77275d4460a184cf64085e9d7597841a50fbc9 /src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala | |
parent | c32f965212481e4d26c2ae1ae5616f2d4b3e22ae (diff) | |
parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
download | rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.gz rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.tar.bz2 rest-query-4c22afe6a34641f5b35ff4953a5821a2bc940255.zip |
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala index db4def2..7584e9c 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala @@ -2,10 +2,11 @@ package xyz.driver.pdsuidomain.entities import java.time.LocalDateTime +import xyz.driver.entities.patient.CancerType import xyz.driver.pdsuicommon.domain.{LongId, StringId, User, UuidId} import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils -import xyz.driver.pdsuidomain.entities.Trial.{Condition, Status} +import xyz.driver.pdsuidomain.entities.Trial.Status final case class StudyDesign(id: LongId[StudyDesign], name: String) @@ -58,24 +59,6 @@ object Trial { } final case class Locations(locations: List[String]) - - sealed trait Condition - - object Condition { - - case object Breast extends Condition - case object Lung extends Condition - case object Prostate extends Condition - - def fromString(condition: String): Option[Condition] = condition match { - case "Breast" => Some(Breast) - case "Lung" => Some(Lung) - case "Prostate" => Some(Prostate) - case _ => None - } - - val All: Set[Condition] = Set(Breast, Lung, Prostate) - } } final case class Trial(id: StringId[Trial], @@ -86,7 +69,7 @@ final case class Trial(id: StringId[Trial], previousAssignee: Option[StringId[User]], lastActiveUserId: Option[StringId[User]], lastUpdate: LocalDateTime, - condition: Condition, + disease: CancerType, phase: String, hypothesisId: Option[UuidId[Hypothesis]], studyDesignId: Option[LongId[StudyDesign]], |