diff options
author | Jakob Odersky <jakob@driver.xyz> | 2017-11-20 20:41:50 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2017-11-20 20:47:35 -0800 |
commit | 92df74ed76b7a06dbe1405fc496f3f650709e75f (patch) | |
tree | fbef129d0bee9a3e23cb3e9d5fbdbd77f1484e87 /src/main/scala/xyz/driver/pdsuidomain | |
parent | 38a00385d1b11046cd33384e61ad59958f474c88 (diff) | |
download | rest-query-92df74ed76b7a06dbe1405fc496f3f650709e75f.tar.gz rest-query-92df74ed76b7a06dbe1405fc496f3f650709e75f.tar.bz2 rest-query-92df74ed76b7a06dbe1405fc496f3f650709e75f.zip |
Add formats for patient eligible trials
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain')
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala | 21 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientEligibleTrialService.scala | 85 |
2 files changed, 92 insertions, 14 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala index 4c006f9..11253fc 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patienteligibletrial.scala @@ -8,6 +8,8 @@ import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEl object patienteligibletrial { import DefaultJsonProtocol._ import common._ + import xyz.driver.pdsuidomain.formats.json.trial._ + import xyz.driver.pdsuidomain.formats.json.patientcriterion._ def applyUpdateToTrialArmGroup(json: JsValue, orig: PatientTrialArmGroupView): PatientTrialArmGroupView = json match { @@ -22,19 +24,10 @@ object patienteligibletrial { case _ => deserializationError(s"Expected Json Object as partial PatientTrialArmGroupView, but got $json") } - implicit val patientEligibleTrialWriter: RootJsonWriter[RichPatientEligibleTrial] = - new RootJsonWriter[RichPatientEligibleTrial] { - override def write(obj: RichPatientEligibleTrial) = - JsObject( - "id" -> obj.group.id.toJson, - "patientId" -> obj.group.patientId.toJson, - "trialId" -> obj.group.trialId.toJson, - "trialTitle" -> obj.trial.title.toJson, - "arms" -> obj.arms.map(_.armName).toJson, - "hypothesisId" -> obj.trial.hypothesisId.toJson, - "verifiedEligibilityStatus" -> obj.group.verifiedEligibilityStatus.toJson, - "isVerified" -> obj.group.isVerified.toJson - ) - } + implicit val patientEligibleArmGroupView: RootJsonFormat[PatientTrialArmGroupView] = + jsonFormat7(PatientTrialArmGroupView.apply) + + implicit val patientEligibleTrialFormat: RootJsonFormat[RichPatientEligibleTrial] = + jsonFormat3(RichPatientEligibleTrial.apply) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientEligibleTrialService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientEligibleTrialService.scala new file mode 100644 index 0000000..f1c5f54 --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientEligibleTrialService.scala @@ -0,0 +1,85 @@ +package xyz.driver.pdsuidomain.services.rest + +import akka.http.scaladsl.marshalling.Marshal +import akka.http.scaladsl.model._ +import akka.stream.Materializer +import xyz.driver.core.rest.{Pagination => _, _} +import xyz.driver.entities.labels.Label +import xyz.driver.entities.users.AuthUserInfo +import xyz.driver.pdsuicommon.db._ +import xyz.driver.pdsuicommon.domain._ +import xyz.driver.pdsuidomain.ListResponse +import xyz.driver.pdsuidomain.entities._ +import xyz.driver.pdsuidomain.services.PatientCriterionService.RichPatientCriterion +import xyz.driver.pdsuidomain.services.{PatientEligibleTrialService, PatientLabelService} + +import scala.concurrent.{ExecutionContext, Future} + +class RestPatientEligibleTrialService(transport: ServiceTransport, baseUri: Uri)( + implicit protected val materializer: Materializer, + protected val exec: ExecutionContext) + extends PatientEligibleTrialService with RestHelper { + + import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ + import xyz.driver.pdsuidomain.formats.json.listresponse._ + import xyz.driver.pdsuidomain.formats.json.patienteligibletrial._ + import xyz.driver.pdsuidomain.formats.json.patientcriterion._ + import PatientEligibleTrialService._ + + def getAll(patientId: UuidId[Patient], + filter: SearchFilterExpr = SearchFilterExpr.Empty, + sorting: Option[Sorting] = None, + pagination: Option[Pagination] = None)( + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetListReply] = { + val request = HttpRequest(HttpMethods.GET, + endpointUri(baseUri, + s"/v1/patient/$patientId/label", + filterQuery(filter) ++ sortingQuery(sorting) ++ paginationQuery(pagination))) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[RichPatientEligibleTrial]](response) + } yield { + GetListReply.EntityList(reply.items, reply.meta.itemsCount) + } + } + + + def getById(patientId: UuidId[Patient], id: LongId[PatientTrialArmGroup])( + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetByIdReply] = { + val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/trial/$id")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientEligibleTrial](response) + } yield { + GetByIdReply.Entity(reply) + } + } + + def getCriterionListByGroupId(patientId: UuidId[Patient], id: LongId[PatientTrialArmGroup])( + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[GetCriterionListOfGroupReply] = { + val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/trial/$id/criterion")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[RichPatientCriterion]](response) + } yield { + GetCriterionListOfGroupReply.EntityList(reply.items, reply.meta.itemsCount) + } + } + + def update(origEligibleTrialWithTrial: RichPatientEligibleTrial, + draftPatientTrialArmGroup: PatientTrialArmGroupView)( + implicit requestContext: AuthorizedServiceRequestContext[AuthUserInfo]): Future[UpdateReply] = { + for { + entity <- Marshal(draftPatientTrialArmGroup).to[RequestEntity] + request = HttpRequest( + HttpMethods.PATCH, + endpointUri(baseUri, s"/v1/patient/${origEligibleTrialWithTrial.group.patientId}/trial/${origEligibleTrialWithTrial.trial.id}")) + .withEntity(entity) + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientEligibleTrial](response) + } yield { + UpdateReply.Updated(reply) + } + } + +} |