diff options
author | Aleksandr <ognelisar@gmail.com> | 2017-11-14 15:45:50 +0700 |
---|---|---|
committer | Aleksandr <ognelisar@gmail.com> | 2017-11-14 15:45:50 +0700 |
commit | add98e1a1100d5b0fb666ac4669d0a90272959ca (patch) | |
tree | 4e32e92e7bc3a6373f95f04bd28f946b5b100234 /src/main/scala/xyz/driver/pdsuidomain/fakes/entities | |
parent | 2afec69b277c031eb52e1a05e57ff7bb0079f8d1 (diff) | |
parent | 29ee5de759374ceed9c856a51443a3f7c2cec029 (diff) | |
download | rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.gz rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.tar.bz2 rest-query-add98e1a1100d5b0fb666ac4669d0a90272959ca.zip |
Merge branch 'master' into PDSUI-2345
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/fakes/entities')
3 files changed, 10 insertions, 9 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala index 5903dc8..d3d76b8 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/recordprocessing.scala @@ -264,7 +264,7 @@ object recordprocessing { ) } - def nextExtractedDataLabel(dataId: LongId[ExtractedData]): ExtractedDataLabel = { + def nextExtractedDataLabel(): ExtractedDataLabel = { ExtractedDataLabel( id = nextLongId[ExtractedDataLabel], dataId = nextLongId[ExtractedData], @@ -280,7 +280,7 @@ object recordprocessing { extractedData = extractedData, labels = List.fill( nextInt(maxItemsInCollectionNumber) - )(nextExtractedDataLabel(extractedData.id)) + )(nextExtractedDataLabel()) ) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala index 441c1db..f2d6a1b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/treatmentmatching.scala @@ -62,8 +62,8 @@ object treatmentmatching { patientId = nextUuidId[Patient], labelId = nextLongId[Label], score = generators.nextInt(100), - primaryValue = generators.nextOption(fakes.entities.labels.nextLabelValue()), - verifiedPrimaryValue = generators.nextOption(fakes.entities.labels.nextLabelValue()), + primaryValue = fakes.entities.labels.nextLabelValue(), + verifiedPrimaryValue = fakes.entities.labels.nextLabelValue(), isImplicitMatch = generators.nextBoolean(), isVisible = generators.nextBoolean() ) @@ -82,8 +82,8 @@ object treatmentmatching { criterionText = generators.nextString(), criterionValue = generators.nextOption(generators.nextBoolean()), criterionIsDefining = generators.nextBoolean(), - eligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()), - verifiedEligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()), + eligibilityStatus = fakes.entities.labels.nextLabelValue(), + verifiedEligibilityStatus = fakes.entities.labels.nextLabelValue(), isVerified = generators.nextBoolean(), isVisible = generators.nextBoolean(), lastUpdate = nextLocalDateTime, @@ -139,8 +139,8 @@ object treatmentmatching { patientId = nextUuidId[Patient], trialId = trialId, hypothesisId = nextUuidId[Hypothesis], - eligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()), - verifiedEligibilityStatus = generators.nextOption(fakes.entities.labels.nextLabelValue()), + eligibilityStatus = fakes.entities.labels.nextLabelValue(), + verifiedEligibilityStatus = fakes.entities.labels.nextLabelValue(), isVerified = generators.nextBoolean() ) 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 94bc27a..1e4ad51 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala @@ -123,7 +123,8 @@ object trialcuration { trialId = nextStringId[Trial], state = nextTrialState, action = nextTrialAction, - created = nextLocalDateTime + created = nextLocalDateTime, + comment = generators.nextOption(generators.nextString()) ) def nextHypothesis(): Hypothesis = Hypothesis( |