diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-11-02 20:40:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-02 20:40:31 -0700 |
commit | aedb5274932db81a32f9d89938636df114dc9a44 (patch) | |
tree | 13a0a8a51f477a4fce2bb8f4d5cd8248de54a73b /src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala | |
parent | 4583af5213b9f7b1e8a06f58321813556763f2d1 (diff) | |
parent | 5515c834853cbe3ce60460a4819a94805cfe24f7 (diff) | |
download | rest-query-aedb5274932db81a32f9d89938636df114dc9a44.tar.gz rest-query-aedb5274932db81a32f9d89938636df114dc9a44.tar.bz2 rest-query-aedb5274932db81a32f9d89938636df114dc9a44.zip |
Merge pull request #59 from drivergroup/common-contextsv0.13.1
Using common request contexts and user objects
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 | 13 |
1 files changed, 7 insertions, 6 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 eeec577..94bc27a 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/fakes/entities/trialcuration.scala @@ -1,8 +1,9 @@ package xyz.driver.pdsuidomain.fakes.entities +import xyz.driver.core.auth.User import xyz.driver.core.generators._ import xyz.driver.entities.labels.{Label, LabelCategory} -import xyz.driver.pdsuicommon.domain.{LongId, User} +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.ListResponse import xyz.driver.pdsuidomain.entities._ import xyz.driver.pdsuidomain.services.CriterionService.RichCriterion @@ -19,10 +20,10 @@ object trialcuration { id = nextStringId[Trial], externalId = nextUuidId[Trial], status = nextTrialStatus, - assignee = Option(nextStringId[User]), + assignee = Option(generators.nextId[User]), previousStatus = Option(nextPreviousTrialStatus), - previousAssignee = Option(nextStringId[User]), - lastActiveUserId = Option(nextStringId[User]), + previousAssignee = Option(generators.nextId[User]), + lastActiveUserId = Option(generators.nextId[User]), lastUpdate = nextLocalDateTime, phase = generators.nextString(), hypothesisId = Option(nextUuidId[Hypothesis]), @@ -106,7 +107,7 @@ object trialcuration { def nextTrialIssue(): TrialIssue = TrialIssue( id = nextLongId[TrialIssue], - userId = nextStringId[User], + userId = generators.nextId[User], trialId = nextStringId[Trial], lastUpdate = nextLocalDateTime, isDraft = generators.nextBoolean(), @@ -118,7 +119,7 @@ object trialcuration { def nextTrialHistory(): TrialHistory = TrialHistory( id = nextLongId[TrialHistory], - executor = nextStringId[User], + executor = generators.nextId[User], trialId = nextStringId[Trial], state = nextTrialState, action = nextTrialAction, |