diff options
author | vlad <vlad@driver.xyz> | 2017-07-21 17:05:20 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-07-21 17:05:20 -0700 |
commit | ef8372d847d4d28922f6426830c31883c2a9c243 (patch) | |
tree | 46eb12d28d8c52dfa244839f3c76c5c1ce231cee /src | |
parent | a6cc13dfcc9334225712744d458b77de0a89dd7d (diff) | |
download | rest-query-ef8372d847d4d28922f6426830c31883c2a9c243.tar.gz rest-query-ef8372d847d4d28922f6426830c31883c2a9c243.tar.bz2 rest-query-ef8372d847d4d28922f6426830c31883c2a9c243.zip |
Moving export method to ExtractedDataService
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala | 17 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala | 15 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala index afb994e..9bcd921 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/ExtractedDataService.scala @@ -2,10 +2,11 @@ package xyz.driver.pdsuidomain.services import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext import xyz.driver.pdsuicommon.db.{Pagination, SearchFilterExpr, Sorting} -import xyz.driver.pdsuicommon.domain.LongId +import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuicommon.error.DomainError import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities._ +import xyz.driver.pdsuidomain.entities.export.patient.ExportPatientWithLabels import scala.concurrent.Future @@ -49,6 +50,17 @@ object ExtractedDataService { extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError } + sealed trait GetPatientLabelsReply + object GetPatientLabelsReply { + type Error = GetPatientLabelsReply with DomainError + + final case class Entity(x: ExportPatientWithLabels) extends GetPatientLabelsReply + + case object NotFoundError extends GetPatientLabelsReply with DomainError.NotFoundError { + def userMessage: String = "Patient not found" + } + } + sealed trait CreateReply object CreateReply { type Error = CreateReply with DomainError @@ -93,6 +105,9 @@ trait ExtractedDataService { def getById(id: LongId[ExtractedData])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] + def getPatientLabels(id: UuidId[Patient])( + implicit requestContext: AuthenticatedRequestContext): Future[GetPatientLabelsReply] + def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty, sorting: Option[Sorting] = None, pagination: Option[Pagination] = None)( diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala index 0164263..ce70934 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/PatientService.scala @@ -8,7 +8,6 @@ import xyz.driver.pdsuicommon.domain._ import xyz.driver.pdsuicommon.error.DomainError import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuidomain.entities._ -import xyz.driver.pdsuidomain.entities.export.patient.ExportPatientWithLabels import scala.concurrent.Future @@ -51,17 +50,6 @@ object PatientService { } } - sealed trait GetPatientWithLabelsReply - object GetPatientWithLabelsReply { - type Error = GetPatientWithLabelsReply with DomainError - - final case class Entity(x: ExportPatientWithLabels) extends GetPatientWithLabelsReply - - case object NotFoundError extends GetPatientWithLabelsReply with DomainError.NotFoundError { - def userMessage: String = "Patient not found" - } - } - sealed trait UpdateReply object UpdateReply { type Error = UpdateReply with DomainError @@ -88,9 +76,6 @@ trait PatientService { def getById(id: UuidId[Patient])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] - def getPatientWithLabels(id: UuidId[Patient])( - implicit requestContext: AuthenticatedRequestContext): Future[GetPatientWithLabelsReply] - def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty, sorting: Option[Sorting] = None, pagination: Option[Pagination] = None)( |