From e2313321736520e6acaeb9aaa6ab426e6a8415ff Mon Sep 17 00:00:00 2001 From: Vyatcheslav Suharnikov Date: Wed, 12 Jul 2017 11:39:40 +0300 Subject: PDSUI-2018 Change user type from LongId to StringId --- .../xyz/driver/pdsuidomain/entities/UserHistory.scala | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala index 4abb205..9be26b9 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/UserHistory.scala @@ -7,7 +7,7 @@ import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils final case class UserHistory(id: LongId[UserHistory], - executor: LongId[User], + executor: StringId[User], recordId: Option[LongId[MedicalRecord]] = None, documentId: Option[LongId[Document]] = None, trialId: Option[StringId[Trial]] = None, @@ -18,7 +18,7 @@ final case class UserHistory(id: LongId[UserHistory], object UserHistory { - def forDocument(executor: LongId[User], + def forDocument(executor: StringId[User], documentId: LongId[Document], state: UserHistory.State, action: UserHistory.Action): UserHistory = UserHistory( @@ -29,7 +29,7 @@ object UserHistory { action = action ) - def forRecord(executor: LongId[User], + def forRecord(executor: StringId[User], recordId: LongId[MedicalRecord], state: UserHistory.State, action: UserHistory.Action): UserHistory = UserHistory( @@ -40,18 +40,7 @@ object UserHistory { action = action ) - def forTrial(executor: LongId[User], - trialId: StringId[Trial], - state: UserHistory.State, - action: UserHistory.Action): UserHistory = UserHistory( - id = LongId(0L), - executor = executor, - trialId = Some(trialId), - state = state, - action = action - ) - - def forPatient(executor: LongId[User], + def forPatient(executor: StringId[User], patientId: UuidId[Patient], state: UserHistory.State, action: UserHistory.Action): UserHistory = UserHistory( -- cgit v1.2.3