diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-12 10:44:54 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-12 10:44:54 +0700 |
| commit | f525ab2604cc5d1366c852bdbcb4d912bbcea800 (patch) | |
| tree | 4fe4b35e1f474e2dc85a8885dc4c9002f3ea46c2 /src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala | |
| parent | 9198729ebf3d20b650b4467daa0d484a3148f01c (diff) | |
| parent | e15415d69ec990d5243e58704e232e619b80aa6f (diff) | |
| download | rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.gz rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.bz2 rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.zip | |
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala index 069d1f1..ade0115 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala @@ -1,14 +1,13 @@ package xyz.driver.pdsuidomain.fakes.entities import xyz.driver.entities.labels.{Label, LabelCategory} -import xyz.driver.entities.patient.CancerType import xyz.driver.pdsuicommon.domain.{LongId, User} import xyz.driver.pdsuidomain.entities._ import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion object trialcuration { - import xyz.driver.core.generators import common._ + import xyz.driver.core.generators import xyz.driver.pdsuidomain.entities.InterventionType._ def nextTrial(): Trial = Trial( @@ -20,7 +19,6 @@ object trialcuration { previousAssignee = Option(nextStringId[User]), lastActiveUserId = Option(nextStringId[User]), lastUpdate = nextLocalDateTime, - disease = generators.oneOf[CancerType](CancerType.Breast, CancerType.Lung, CancerType.Prostate), phase = generators.nextString(), hypothesisId = Option(nextUuidId[Hypothesis]), studyDesignId = Option(nextLongId[StudyDesign]), @@ -63,7 +61,7 @@ object trialcuration { val criterion = nextCriterion() RichCriterion( criterion = criterion, - armIds = Seq(nextLongId[Arm], nextLongId[Arm]), + armIds = Seq(nextLongId[EligibilityArm], nextLongId[EligibilityArm]), labels = Seq( nextCriterionLabel(criterion.id), nextCriterionLabel(criterion.id) @@ -86,7 +84,7 @@ object trialcuration { def nextInterventionArm(interventionId: LongId[Intervention]): InterventionArm = InterventionArm( interventionId = interventionId, - armId = nextLongId[Arm] + armId = nextLongId[SlotArm] ) def nextInterventionWithArms(): InterventionWithArms = { |