diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-10-18 12:00:44 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-10-18 12:00:44 +0700 |
commit | 1b1bac0a5cb1f83f3caf9c262fb83916c4a8c222 (patch) | |
tree | b1562c4ee366c373f15b07ff6f566a3a94c2eee1 | |
parent | cd6a7ab54c2bf28e33e2fe01c29f59c959acc1d9 (diff) | |
parent | 2a9bada86658ef15793f99f1867e23f3b31e7032 (diff) | |
download | rest-query-1b1bac0a5cb1f83f3caf9c262fb83916c4a8c222.tar.gz rest-query-1b1bac0a5cb1f83f3caf9c262fb83916c4a8c222.tar.bz2 rest-query-1b1bac0a5cb1f83f3caf9c262fb83916c4a8c222.zip |
Merge branch 'master' into PDSUI-rep-spray
-rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala | 24 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala | 9 |
2 files changed, 15 insertions, 18 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala index 004a914..d2e70f2 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/utils/CustomSwaggerJsonFormats.scala @@ -48,6 +48,8 @@ object CustomSwaggerJsonFormats { import xyz.driver.pdsuidomain.fakes.entities.export import xyz.driver.pdsuidomain.formats.json.sprayformats.export._ import xyz.driver.pdsuidomain.formats.json.sprayformats.arm._ + import xyz.driver.pdsuidomain.formats.json.sprayformats.slotarm._ + import xyz.driver.pdsuidomain.formats.json.sprayformats.eligibilityarm._ import xyz.driver.pdsuidomain.formats.json.sprayformats.criterion._ import xyz.driver.pdsuidomain.formats.json.sprayformats.intervention._ import xyz.driver.pdsuidomain.formats.json.sprayformats.hypothesis._ @@ -63,16 +65,18 @@ object CustomSwaggerJsonFormats { ) ++ customCommonProperties val customTrialCurationObjectsExamples = immutable.Map[Class[_], JsValue]( - classOf[Trial] -> trialWriter.write(nextTrial()), - classOf[Arm] -> armFormat.write(nextArm()), - classOf[TrialHistory] -> trialHistoryFormat.write(nextTrialHistory()), - classOf[TrialIssue] -> trialIssueWriter.write(nextTrialIssue()), - classOf[RichCriterion] -> richCriterionFormat.write(nextRichCriterion()), - classOf[InterventionWithArms] -> interventionFormat.write(nextInterventionWithArms()), - classOf[InterventionType] -> interventionTypeFormat.write(nextInterventionType()), - classOf[Hypothesis] -> hypothesisFormat.write(nextHypothesis()), - classOf[StudyDesign] -> studyDesignFormat.write(nextStudyDesign()), - classOf[ExportTrialWithLabels] -> trialWithLabelsFormat.write(export.nextExportTrialWithLabels()) + classOf[Trial] -> trialWriter.write(nextTrial()), + classOf[Arm] -> armFormat.write(nextArm()), + classOf[TrialHistory] -> trialHistoryFormat.write(nextTrialHistory()), + classOf[TrialIssue] -> trialIssueWriter.write(nextTrialIssue()), + classOf[RichCriterion] -> richCriterionFormat.write(nextRichCriterion()), + classOf[InterventionWithArms] -> interventionFormat.write(nextInterventionWithArms()), + classOf[InterventionType] -> interventionTypeFormat.write(nextInterventionType()), + classOf[Hypothesis] -> hypothesisFormat.write(nextHypothesis()), + classOf[StudyDesign] -> studyDesignFormat.write(nextStudyDesign()), + classOf[ExportTrialWithLabels] -> trialWithLabelsFormat.write(export.nextExportTrialWithLabels()), + classOf[EligibilityArmWithDiseases] -> eligibilityArmWithDiseasesWriter.write(nextEligibilityArmWithDiseases()), + classOf[SlotArm] -> slotArmFormat.write(nextSlotArm()) ) } 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 5bcf84f..84dcb88 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala @@ -2,7 +2,6 @@ package xyz.driver.pdsuidomain.fakes.entities import xyz.driver.core.generators._ 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 @@ -156,15 +155,9 @@ object trialcuration { trialId = nextStringId ) - def nextPatientCancerType(): CancerType = generators.oneOf[CancerType]( - CancerType.Lung, - CancerType.Breast, - CancerType.Prostate - ) - def nextEligibilityArmDisease(): EligibilityArmDisease = EligibilityArmDisease( eligibilityArmId = nextLongId, - disease = nextPatientCancerType() + disease = nextCancerType ) private def nextEligibilityArmDiseaseCollection(count: Int): Seq[EligibilityArmDisease] = |