diff options
author | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
commit | 5279d01cedb35a759347f194c0e8adb21d19e88e (patch) | |
tree | e340bb2eaba41d917bbca8c5e42b0b76bd164e37 /src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala | |
parent | d9c3283c307105e03253c621b9b25a6308ac3b94 (diff) | |
parent | 7f7bd651122754a3df47894b64ddb0456561bbe7 (diff) | |
download | rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.gz rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.bz2 rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.zip |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# build.sbt
# src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
# src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
# src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala index 3fe8176..2f90820 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Trial.scala @@ -52,16 +52,15 @@ object Trial { implicit def toPhiString(x: Status): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } - case class PdfSource(path: Path) extends AnyVal + final case class PdfSource(path: Path) extends AnyVal implicit def toPhiString(x: Trial): PhiString = { import x._ phi"Trial(id=$id, externalId=$externalId, status=$status, previousStatus=$previousStatus, " + - phi"lastActiveUserId=$lastActiveUserId, assignee=$assignee, previousAssignee=$previousAssignee, " + - phi"isSummaryReviewed=$isSummaryReviewed, isCriteriaReviewed=$isCriteriaReviewed)" + phi"lastActiveUserId=$lastActiveUserId, assignee=$assignee, previousAssignee=$previousAssignee, " } - case class Locations(locations: List[String]) + final case class Locations(locations: List[String]) sealed trait Condition @@ -71,7 +70,14 @@ object Trial { case object Lung extends Condition case object Prostate extends Condition - val All = Set(Breast, Lung, Prostate) + 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) } } @@ -93,14 +99,7 @@ final case class Trial(id: StringId[Trial], overviewTemplate: String, isUpdated: Boolean, title: String, - originalTitle: String, - isSummaryReviewed: Boolean, - isCriteriaReviewed: Boolean, - eligibilityCriteriaChecksum: String, - briefSummaryChecksum: String, - detailedDescriptionChecksum: String, - armDescriptionChecksum: String) { - + originalTitle: String) { import Trial.Status._ if (previousStatus.nonEmpty) { |