diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-12-15 17:29:33 +0700 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-12-15 17:30:04 +0700 |
commit | 2456ac8336df69734890b325b0b2a5a1182e93e2 (patch) | |
tree | 816f15e0d0187b60304b98826118f3a38de682a6 /src/main/scala/xyz/driver/pdsuidomain/services/rest | |
parent | 9ee674a4798cf191a5833ff7703ad497db620fce (diff) | |
download | rest-query-2456ac8336df69734890b325b0b2a5a1182e93e2.tar.gz rest-query-2456ac8336df69734890b325b0b2a5a1182e93e2.tar.bz2 rest-query-2456ac8336df69734890b325b0b2a5a1182e93e2.zip |
PDSUI-2432 Make Option's reply for getById
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/rest')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala index 92a79a2..cc66142 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala @@ -41,13 +41,13 @@ class RestPatientCriterionService(transport: ServiceTransport, baseUri: Uri)( } def getById(patientId: UuidId[Patient], id: LongId[PatientCriterion])( - implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[RichPatientCriterion] = { + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Option[RichPatientCriterion]] = { val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/criterion/$id")) for { response <- transport.sendRequestGetResponse(requestContext)(request) entity <- apiResponse[RichPatientCriterion](response) } yield { - entity + Option(entity) } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala index 11fb4df..932e123 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala @@ -56,13 +56,13 @@ class RestPatientLabelService(transport: ServiceTransport, baseUri: Uri)( } def getByLabelIdOfPatient(patientId: UuidId[Patient], labelId: LongId[Label])( - implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[RichPatientLabel] = { + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Option[RichPatientLabel]] = { val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/label/$labelId")) for { response <- transport.sendRequestGetResponse(requestContext)(request) entity <- apiResponse[RichPatientLabel](response) } yield { - entity + Option(entity) } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala index 77f12f9..67f4e38 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala @@ -20,13 +20,13 @@ class RestPatientService(transport: ServiceTransport, baseUri: Uri)(implicit pro import xyz.driver.pdsuidomain.formats.json.patient._ def getById(id: UuidId[Patient])( - implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Patient] = { + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[Option[Patient]] = { val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$id")) for { response <- transport.sendRequestGetResponse(requestContext)(request) entity <- apiResponse[Patient](response) } yield { - entity + Option(entity) } } |