diff options
author | vlad <vlad@driver.xyz> | 2017-10-09 12:49:02 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-10-09 12:49:02 -0700 |
commit | eeeb6d90f1c6882f0b3d765022b114d97e4dba40 (patch) | |
tree | 7fd813bcba7a3e44f5694bfbf0618ea93d64b5f8 /src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala | |
parent | 7d8712a62d30b412717e1b730c0ad267cd207aa4 (diff) | |
download | rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.tar.gz rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.tar.bz2 rest-query-eeeb6d90f1c6882f0b3d765022b114d97e4dba40.zip |
Getting rid of the FuzzyValues, Name as a string, and conditionv0.7.1
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala index cf55694..3a9434b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialWithLabels.scala @@ -4,13 +4,11 @@ import java.time.LocalDateTime import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ -import xyz.driver.pdsuidomain.entities.{RawTrialLabel, Trial} - -import scala.collection.breakOut +import xyz.driver.pdsuidomain.entities.Trial final case class ExportTrialWithLabels(nctId: StringId[Trial], trialId: UuidId[Trial], - condition: String, + disease: String, lastReviewed: LocalDateTime, labelVersion: Long, arms: List[ExportTrialArm], @@ -20,35 +18,7 @@ object ExportTrialWithLabels { implicit def toPhiString(x: ExportTrialWithLabels): PhiString = { import x._ - phi"TrialWithLabels(nctId=$nctId, trialId=$trialId, condition=${Unsafe(condition)}, " + + phi"TrialWithLabels(nctId=$nctId, trialId=$trialId, disease=${Unsafe(disease)}, " + phi"lastReviewed=$lastReviewed, labelVersion=${Unsafe(labelVersion)}, arms=$arms, criteria=$criteria)" } - - def fromRaw(rawData: List[RawTrialLabel]): ExportTrialWithLabels = { - val trials: Set[StringId[Trial]] = rawData.map(_.nctId)(breakOut) - - assert(trials.size == 1, "There are more than one trial in the rawData") - val trial = rawData.head - - ExportTrialWithLabels( - nctId = trial.nctId, - trialId = trial.trialId, - condition = trial.condition, - lastReviewed = trial.lastReviewed, - labelVersion = 1, // TODO It is needed to replace this mock label version. - arms = rawData - .groupBy(_.armId) - .map { - case (armId, rawTrials) => - ExportTrialArm(armId, rawTrials.head.armName) - }(breakOut), - criteria = rawData - .groupBy(x => (x.criterionId, x.labelId)) - .map { - case (_, rawTrialLabels) => - val armIds = rawTrialLabels.map(_.criterionArmId).toSet - ExportTrialLabelCriterion.fromRaw(rawTrialLabels.head, armIds) - }(breakOut) - ) - } } |