From f4a3b7aad2075eee91433a000be19cddcb32c7ad Mon Sep 17 00:00:00 2001 From: Aleksandr Date: Thu, 9 Nov 2017 15:18:41 +0700 Subject: Added Actions to MedicalRecordHistory object --- .../entities/MedicalRecordHistory.scala | 48 ++++++++++++++-------- 1 file changed, 30 insertions(+), 18 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala index 4259737..65c2731 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala @@ -52,32 +52,44 @@ object MedicalRecordHistory { } object Action { - case object Start extends Action - case object Submit extends Action - case object Unassign extends Action - case object Resolve extends Action - case object Flag extends Action - case object Archive extends Action + case object Start extends Action + case object Submit extends Action + case object Unassign extends Action + case object Resolve extends Action + case object Flag extends Action + case object Archive extends Action + case object Duplicate extends Action + case object Reorder extends Action + case object Rotation extends Action + case object Clean extends Action val All: Set[Action] = Set[Action](Start, Submit, Unassign, Resolve, Flag, Archive) val fromString: PartialFunction[String, Action] = { - case "Start" => Action.Start - case "Submit" => Action.Submit - case "Unassign" => Action.Unassign - case "Resolve" => Action.Resolve - case "Flag" => Action.Flag - case "Archive" => Action.Archive + case "Start" => Action.Start + case "Submit" => Action.Submit + case "Unassign" => Action.Unassign + case "Resolve" => Action.Resolve + case "Flag" => Action.Flag + case "Archive" => Action.Archive + case "Duplicate" => Action.Duplicate + case "Reorder" => Action.Reorder + case "Rotate" => Action.Rotation + case "Clean" => Action.Clean } def actionToString(x: Action): String = x match { - case Action.Start => "Start" - case Action.Submit => "Submit" - case Action.Unassign => "Unassign" - case Action.Resolve => "Resolve" - case Action.Flag => "Flag" - case Action.Archive => "Archive" + case Action.Start => "Start" + case Action.Submit => "Submit" + case Action.Unassign => "Unassign" + case Action.Resolve => "Resolve" + case Action.Flag => "Flag" + case Action.Archive => "Archive" + case Action.Duplicate => "Duplicate" + case Action.Reorder => "Reorder" + case Action.Rotation => "Rotate" + case Action.Clean => "Clean" } implicit def toPhiString(x: Action): PhiString = -- cgit v1.2.3 From 2afec69b277c031eb52e1a05e57ff7bb0079f8d1 Mon Sep 17 00:00:00 2001 From: Aleksandr Date: Tue, 14 Nov 2017 15:44:43 +0700 Subject: Implemented Actions for DocumentHistoryService and MedicalRecordHistoryService --- .../pdsuidomain/entities/DocumentHistory.scala | 85 +++++++-------- .../entities/MedicalRecordHistory.scala | 114 ++++++++++----------- 2 files changed, 102 insertions(+), 97 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala index 0a8480b..a1404a7 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala @@ -6,7 +6,9 @@ import xyz.driver.core.auth.User import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils -import xyz.driver.pdsuidomain.entities.DocumentHistory._ +import xyz.driver.pdsuidomain.entities.DocumentHistory.{Action, _} + +import scala.collection.immutable object DocumentHistory { @@ -21,20 +23,21 @@ object DocumentHistory { case object Extract extends State case object Review extends State case object Flag extends State + case object New extends State + + private val stateToName = immutable.Map[State, String]( + State.Extract -> "Extract", + State.Review -> "Review", + State.Flag -> "Flag", + State.New -> "New" + ) - val All: Set[State] = Set[State](Extract, Review, Flag) + val All: Set[State] = stateToName.keySet - val fromString: PartialFunction[String, State] = { - case "Extract" => State.Extract - case "Review" => State.Review - case "Flag" => State.Flag - } + val fromString: PartialFunction[String, State] = + for ((k, v) <- stateToName) yield (v, k) - def stateToString(x: State): String = x match { - case State.Extract => "Extract" - case State.Review => "Review" - case State.Flag => "Flag" - } + def stateToString: State => String = stateToName implicit def toPhiString(x: State): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) @@ -49,38 +52,40 @@ object DocumentHistory { } object Action { - case object Start extends Action - case object Submit extends Action - case object Unassign extends Action - case object Resolve extends Action - case object Flag extends Action - case object Archive extends Action - - val All: Set[Action] = - Set[Action](Start, Submit, Unassign, Resolve, Flag, Archive) - - val fromString: PartialFunction[String, Action] = { - case "Start" => Action.Start - case "Submit" => Action.Submit - case "Unassign" => Action.Unassign - case "Resolve" => Action.Resolve - case "Flag" => Action.Flag - case "Archive" => Action.Archive - } - - def actionToString(x: Action): String = x match { - case Action.Start => "Start" - case Action.Submit => "Submit" - case Action.Unassign => "Unassign" - case Action.Resolve => "Resolve" - case Action.Flag => "Flag" - case Action.Archive => "Archive" - } + case object Start extends Action + case object Submit extends Action + case object Unassign extends Action + case object Resolve extends Action + case object Flag extends Action + case object Archive extends Action + case object PostedEvidence extends Action + case object CreatedDocument extends Action + case object ReadDocument extends Action + case object DeletedDocument extends Action + + private val actionToName = immutable.Map[Action, String]( + Action.Start -> "Start", + Action.Submit -> "Submit", + Action.Unassign -> "Unassign", + Action.Resolve -> "Resolve", + Action.Flag -> "Flag", + Action.Archive -> "Archive", + Action.PostedEvidence -> "PostedEvidence", + Action.CreatedDocument -> "CreatedDocument", + Action.DeletedDocument -> "DeletedDocument", + Action.ReadDocument -> "ReadDocument" + ) + + val All: Set[Action] = actionToName.keySet + + val fromString: PartialFunction[String, Action] = + for ((k, v) <- actionToName) yield (v, k) + + def actionToString: Action => String = actionToName implicit def toPhiString(x: Action): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } - } final case class DocumentHistory(id: LongId[DocumentHistory], diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala index 65c2731..b97120b 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala @@ -8,6 +8,8 @@ import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.utils.Utils import xyz.driver.pdsuidomain.entities.MedicalRecordHistory._ +import scala.collection.immutable + object MedicalRecordHistory { implicit def toPhiString(x: MedicalRecordHistory): PhiString = { @@ -17,85 +19,83 @@ object MedicalRecordHistory { } sealed trait State + object State { case object Clean extends State case object Organize extends State case object Review extends State case object Flag extends State - val All: Set[State] = Set[State](Clean, Organize, Review, Flag) + private val stateToName = immutable.Map[State, String]( + State.Clean -> "Clean", + State.Organize -> "Organize", + State.Review -> "Review", + State.Flag -> "Flag" + ) - val fromString: PartialFunction[String, State] = { - case "Clean" => State.Clean - case "Organize" => State.Organize - case "Review" => State.Review - case "Flag" => State.Flag - } + val All: Set[State] = stateToName.keySet - def stateToString(x: State): String = x match { - case State.Clean => "Clean" - case State.Organize => "Organize" - case State.Review => "Review" - case State.Flag => "Flag" - } + val fromString: PartialFunction[String, State] = + for ((k, v) <- stateToName) yield (v, k) + + def stateToString: State => String = stateToName implicit def toPhiString(x: State): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } sealed trait Action extends Product with Serializable { - - def oneOf(xs: Action*): Boolean = xs.contains(this) - + def oneOf(xs: Action*): Boolean = xs.contains(this) def oneOf(xs: Set[Action]): Boolean = xs.contains(this) - } object Action { - case object Start extends Action - case object Submit extends Action - case object Unassign extends Action - case object Resolve extends Action - case object Flag extends Action - case object Archive extends Action - case object Duplicate extends Action - case object Reorder extends Action - case object Rotation extends Action - case object Clean extends Action - - val All: Set[Action] = - Set[Action](Start, Submit, Unassign, Resolve, Flag, Archive) - - val fromString: PartialFunction[String, Action] = { - case "Start" => Action.Start - case "Submit" => Action.Submit - case "Unassign" => Action.Unassign - case "Resolve" => Action.Resolve - case "Flag" => Action.Flag - case "Archive" => Action.Archive - case "Duplicate" => Action.Duplicate - case "Reorder" => Action.Reorder - case "Rotate" => Action.Rotation - case "Clean" => Action.Clean - } - - def actionToString(x: Action): String = x match { - case Action.Start => "Start" - case Action.Submit => "Submit" - case Action.Unassign => "Unassign" - case Action.Resolve => "Resolve" - case Action.Flag => "Flag" - case Action.Archive => "Archive" - case Action.Duplicate => "Duplicate" - case Action.Reorder => "Reorder" - case Action.Rotation => "Rotate" - case Action.Clean => "Clean" - } + case object Start extends Action + case object Submit extends Action + case object Unassign extends Action + case object Resolve extends Action + case object Flag extends Action + case object Archive extends Action + case object SavedDuplicate extends Action + case object SavedReorder extends Action + case object SavedRotation extends Action + case object DeletedDuplicate extends Action + case object DeletedReorder extends Action + case object DeletedRotation extends Action + case object CreatedDocument extends Action + case object DeletedDocument extends Action + case object CreatedRecord extends Action + case object ReadRecord extends Action + + private val actionToName = immutable.Map[Action, String]( + Action.Start -> "Start", + Action.Submit -> "Submit", + Action.Unassign -> "Unassign", + Action.Resolve -> "Resolve", + Action.Flag -> "Flag", + Action.Archive -> "Archive", + Action.SavedDuplicate -> "SavedDuplicate", + Action.SavedReorder -> "SavedReorder", + Action.SavedRotation -> "SavedRotate", + Action.DeletedDuplicate -> "DeletedDuplicate", + Action.DeletedReorder -> "DeletedReorder", + Action.DeletedRotation -> "DeletedRotation", + Action.CreatedDocument -> "CreatedDocument", + Action.DeletedDocument -> "DeletedDocument", + Action.CreatedRecord -> "CreatedRecord", + Action.ReadRecord -> "ReadRecord" + ) + + val fromString: PartialFunction[String, Action] = + for ((k, v) <- actionToName) yield (v, k) + + val All: Set[Action] = actionToName.keySet + + def actionToString: Action => String = actionToName implicit def toPhiString(x: Action): PhiString = Unsafe(Utils.getClassSimpleName(x.getClass)) } - } final case class MedicalRecordHistory(id: LongId[MedicalRecordHistory], -- cgit v1.2.3 From 579951fa5fe2f518cb0281e6dcee346ae6dace74 Mon Sep 17 00:00:00 2001 From: Aleksandr Date: Tue, 14 Nov 2017 17:14:10 +0700 Subject: Improved DocumentHistory and MedicalRecordHistory --- .../xyz/driver/pdsuidomain/entities/Document.scala | 4 +- .../pdsuidomain/entities/DocumentHistory.scala | 36 +++++++++------- .../entities/MedicalRecordHistory.scala | 50 +++++++++++++--------- 3 files changed, 53 insertions(+), 37 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala index 95710be..0669baf 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/Document.scala @@ -428,8 +428,8 @@ object Document { }).right areDatesInThePast <- { - val dates = List(input.startDate, input.endDate).flatten - val now = LocalDate.now() + val dates = List(input.startDate, input.endDate).flatten + val now = LocalDate.now() val hasInvalid = dates.exists(_.isAfter(now)) if (hasInvalid) Validators.fail("Dates should be in the past") diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala index a1404a7..81fa240 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/DocumentHistory.scala @@ -25,11 +25,15 @@ object DocumentHistory { case object Flag extends State case object New extends State + private implicit def stateToName(state: State): (State, String) = { + state -> state.getClass.getSimpleName + } + private val stateToName = immutable.Map[State, String]( - State.Extract -> "Extract", - State.Review -> "Review", - State.Flag -> "Flag", - State.New -> "New" + State.Extract, + State.Review, + State.Flag, + State.New ) val All: Set[State] = stateToName.keySet @@ -61,19 +65,21 @@ object DocumentHistory { case object PostedEvidence extends Action case object CreatedDocument extends Action case object ReadDocument extends Action - case object DeletedDocument extends Action + + private implicit def stateToName(action: Action): (Action, String) = { + action -> action.getClass.getSimpleName + } private val actionToName = immutable.Map[Action, String]( - Action.Start -> "Start", - Action.Submit -> "Submit", - Action.Unassign -> "Unassign", - Action.Resolve -> "Resolve", - Action.Flag -> "Flag", - Action.Archive -> "Archive", - Action.PostedEvidence -> "PostedEvidence", - Action.CreatedDocument -> "CreatedDocument", - Action.DeletedDocument -> "DeletedDocument", - Action.ReadDocument -> "ReadDocument" + Action.Start, + Action.Submit, + Action.Unassign, + Action.Resolve, + Action.Flag, + Action.Archive, + Action.PostedEvidence, + Action.CreatedDocument, + Action.ReadDocument ) val All: Set[Action] = actionToName.keySet diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala index b97120b..66fd5b0 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/MedicalRecordHistory.scala @@ -21,16 +21,22 @@ object MedicalRecordHistory { sealed trait State object State { + case object New extends State case object Clean extends State case object Organize extends State case object Review extends State case object Flag extends State + private implicit def stateToName(state: State): (State, String) = { + state -> state.getClass.getSimpleName + } + private val stateToName = immutable.Map[State, String]( - State.Clean -> "Clean", - State.Organize -> "Organize", - State.Review -> "Review", - State.Flag -> "Flag" + State.New, + State.Clean, + State.Organize, + State.Review, + State.Flag ) val All: Set[State] = stateToName.keySet @@ -67,23 +73,27 @@ object MedicalRecordHistory { case object CreatedRecord extends Action case object ReadRecord extends Action + private implicit def stateToName(action: Action): (Action, String) = { + action -> action.getClass.getSimpleName + } + private val actionToName = immutable.Map[Action, String]( - Action.Start -> "Start", - Action.Submit -> "Submit", - Action.Unassign -> "Unassign", - Action.Resolve -> "Resolve", - Action.Flag -> "Flag", - Action.Archive -> "Archive", - Action.SavedDuplicate -> "SavedDuplicate", - Action.SavedReorder -> "SavedReorder", - Action.SavedRotation -> "SavedRotate", - Action.DeletedDuplicate -> "DeletedDuplicate", - Action.DeletedReorder -> "DeletedReorder", - Action.DeletedRotation -> "DeletedRotation", - Action.CreatedDocument -> "CreatedDocument", - Action.DeletedDocument -> "DeletedDocument", - Action.CreatedRecord -> "CreatedRecord", - Action.ReadRecord -> "ReadRecord" + Action.Start, + Action.Submit, + Action.Unassign, + Action.Resolve, + Action.Flag, + Action.Archive, + Action.SavedDuplicate, + Action.SavedReorder, + Action.SavedRotation, + Action.DeletedDuplicate, + Action.DeletedReorder, + Action.DeletedRotation, + Action.CreatedDocument, + Action.DeletedDocument, + Action.CreatedRecord, + Action.ReadRecord ) val fromString: PartialFunction[String, Action] = -- cgit v1.2.3