diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-03 16:21:14 +0600 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-08-03 16:21:14 +0600 |
commit | fc7c7063cafd7df8efe2c6c0dbc28e5ff0de06f6 (patch) | |
tree | e7f7eee73223e06080d22c2440839589d23cfb70 | |
parent | 98cecaebc650584f66d8c28c8424e8481c4814cc (diff) | |
download | rest-query-fc7c7063cafd7df8efe2c6c0dbc28e5ff0de06f6.tar.gz rest-query-fc7c7063cafd7df8efe2c6c0dbc28e5ff0de06f6.tar.bz2 rest-query-fc7c7063cafd7df8efe2c6c0dbc28e5ff0de06f6.zip |
PDSUI-2181 Apply scalafmt
3 files changed, 22 insertions, 40 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala index f21c165..f2a0ef0 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala @@ -85,11 +85,7 @@ object ACL extends PhiLogging { extends BaseACL( label = "extracted data", create = Set(DocumentExtractor, RecordAdmin), - read = Set(DocumentExtractor, - RecordAdmin, - RoutesCurator, - TreatmentMatchingAdmin, - ResearchOncologist), + read = Set(DocumentExtractor, RecordAdmin, RoutesCurator, TreatmentMatchingAdmin, ResearchOncologist), update = Set(DocumentExtractor, RecordAdmin), delete = Set(DocumentExtractor, RecordAdmin) ) @@ -155,11 +151,7 @@ object ACL extends PhiLogging { extends BaseACL( label = "criterion", create = Set(CriteriaCurator, TrialAdmin), - read = Set(CriteriaCurator, - TrialAdmin, - RoutesCurator, - TreatmentMatchingAdmin, - ResearchOncologist), + read = Set(CriteriaCurator, TrialAdmin, RoutesCurator, TreatmentMatchingAdmin, ResearchOncologist), update = Set(CriteriaCurator, TrialAdmin), delete = Set(CriteriaCurator, TrialAdmin) ) @@ -252,32 +244,26 @@ object ACL extends PhiLogging { update: AclCheck = Forbid, delete: AclCheck = Forbid) { - def isCreateAllow()( - implicit requestContext: AuthenticatedRequestContext): Boolean = { + def isCreateAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = { check("create", create)(requestContext.executor.roles) } - def isReadAllow()( - implicit requestContext: AuthenticatedRequestContext): Boolean = { + def isReadAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = { check("read", read)(requestContext.executor.roles) } - def isUpdateAllow()( - implicit requestContext: AuthenticatedRequestContext): Boolean = { + def isUpdateAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = { check("update", update)(requestContext.executor.roles) } - def isDeleteAllow()( - implicit requestContext: AuthenticatedRequestContext): Boolean = { + def isDeleteAllow()(implicit requestContext: AuthenticatedRequestContext): Boolean = { check("delete", delete)(requestContext.executor.roles) } - private def check(action: String, isAllowed: AclCheck)( - executorRoles: Set[Role]): Boolean = { + private def check(action: String, isAllowed: AclCheck)(executorRoles: Set[Role]): Boolean = { loggedError( executorRoles.exists(isAllowed), - phi"${Unsafe(executorRoles.mkString(", "))} has no access to ${Unsafe( - action)} a ${Unsafe(label)}" + phi"${Unsafe(executorRoles.mkString(", "))} has no access to ${Unsafe(action)} a ${Unsafe(label)}" ) } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala index e00a5f6..39817c4 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/entities/PatientHistory.scala @@ -16,25 +16,25 @@ object PatientHistory { sealed trait State object State { - case object Verify extends State + case object Verify extends State case object Curate extends State - case object Review extends State - case object Flag extends State + case object Review extends State + case object Flag extends State val All: Set[State] = Set[State](Verify, Curate, Review, Flag) val fromString: PartialFunction[String, State] = { - case "Verify" => State.Verify - case "Curate" => State.Curate - case "Review" => State.Review - case "Flag" => State.Flag + case "Verify" => State.Verify + case "Curate" => State.Curate + case "Review" => State.Review + case "Flag" => State.Flag } def stateToString(x: State): String = x match { - case State.Verify => "Verify" - case State.Curate => "Curate" - case State.Review => "Review" - case State.Flag => "Flag" + case State.Verify => "Verify" + case State.Curate => "Curate" + case State.Review => "Review" + case State.Flag => "Flag" } implicit def toPhiString(x: State): PhiString = diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHistoryService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHistoryService.scala index e312ca8..855eddc 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientHistoryService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientHistoryService.scala @@ -22,15 +22,11 @@ object PatientHistoryService { sealed trait GetListReply object GetListReply { - final case class EntityList(xs: Seq[PatientHistory], - totalFound: Int, - lastUpdate: Option[LocalDateTime]) + final case class EntityList(xs: Seq[PatientHistory], totalFound: Int, lastUpdate: Option[LocalDateTime]) extends GetListReply final case object AuthorizationError - extends GetListReply - with DomainError.AuthorizationError - with DefaultAccessDeniedError + extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } } @@ -43,6 +39,6 @@ trait PatientHistoryService { filter: SearchFilterExpr = SearchFilterExpr.Empty, sorting: Option[Sorting] = None, pagination: Option[Pagination] = None)( - implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] } |