diff options
author | Jakob Odersky <jakob@driver.xyz> | 2017-10-30 17:06:11 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@driver.xyz> | 2017-10-30 17:06:11 -0700 |
commit | ff8729639c7067aee7dca130c0a0fc3f425488f0 (patch) | |
tree | b8384f4ef79fe7c57f2ad4033b1cb98d7296166d /src/main/scala/xyz/driver/pdsuidomain | |
parent | 18c226b95abbb1c86067bc62cd5c0260bf3af6d1 (diff) | |
parent | 91b33aaeb61160da4395e6093e23a947688e12c5 (diff) | |
download | rest-query-ff8729639c7067aee7dca130c0a0fc3f425488f0.tar.gz rest-query-ff8729639c7067aee7dca130c0a0fc3f425488f0.tar.bz2 rest-query-ff8729639c7067aee7dca130c0a0fc3f425488f0.zip |
Merge branch 'PDSUI-2360'v0.12.0
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain')
4 files changed, 198 insertions, 32 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala index fbefd33..b5696f7 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientcriterion.scala @@ -1,8 +1,9 @@ package xyz.driver.pdsuidomain.formats.json import spray.json._ -import xyz.driver.entities.labels.LabelValue +import xyz.driver.entities.labels.{Label, LabelValue} import xyz.driver.formats.json.labels._ +import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities._ import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion} @@ -36,28 +37,28 @@ object patientcriterion { override def read(json: JsValue) = json.convertTo[List[JsValue]].map(_.convertTo[DraftPatientCriterion]) } - implicit val patientCriterionWriter: RootJsonWriter[RichPatientCriterion] = - new RootJsonWriter[RichPatientCriterion] { + implicit val patientCriterionFormat: RootJsonFormat[PatientCriterion] = jsonFormat14(PatientCriterion.apply) + implicit val patientCriterionArmFormat: RootJsonFormat[PatientCriterionArm] = jsonFormat3(PatientCriterionArm.apply) + + implicit val richPatientCriterionFormat: RootJsonFormat[RichPatientCriterion] = + new RootJsonFormat[RichPatientCriterion] { + override def read(json: JsValue): RichPatientCriterion = { + val fields = json.asJsObject.fields + val labelId = fields.getOrElse("labelId", deserializationError("field 'labelId' is missing")) + val arms = fields.getOrElse("armList", deserializationError("field 'arms' is missing")) + RichPatientCriterion( + json.convertTo[PatientCriterion], + labelId.convertTo[LongId[Label]], + arms.convertTo[List[PatientCriterionArm]] + ) + } override def write(obj: RichPatientCriterion): JsValue = { JsObject( - "id" -> obj.patientCriterion.id.toJson, - "labelId" -> obj.labelId.toJson, - "nctId" -> obj.patientCriterion.nctId.toJson, - "criterionId" -> obj.patientCriterion.criterionId.toJson, - "criterionText" -> obj.patientCriterion.criterionText.toJson, - "criterionValue" -> obj.patientCriterion.criterionValue.map { - case true => "Yes" - case false => "No" - }.toJson, - "criterionIsDefining" -> obj.patientCriterion.criterionIsDefining.toJson, - "criterionIsCompound" -> obj.patientCriterion.criterionValue.isEmpty.toJson, - "arms" -> obj.armList.map(_.armName).toJson, - "eligibilityStatus" -> obj.patientCriterion.eligibilityStatus.toJson, - "verifiedEligibilityStatus" -> obj.patientCriterion.verifiedEligibilityStatus.toJson, - "isVerified" -> obj.patientCriterion.isVerified.toJson, - "isVisible" -> obj.patientCriterion.isVisible.toJson, - "lastUpdate" -> obj.patientCriterion.lastUpdate.toJson, - "inclusion" -> obj.patientCriterion.inclusion.toJson + obj.patientCriterion.toJson.asJsObject.fields ++ + Map( + "labelId" -> obj.labelId.toJson, + "armList" -> obj.armList.toJson + ) ) } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala index 15fec45..d944e42 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patientlabel.scala @@ -33,18 +33,17 @@ object patientlabel { case _ => deserializationError(s"Expected Json Object as PatientLabel, but got $json") } - implicit val richPatientLabelWriter: RootJsonWriter[RichPatientLabel] = new RootJsonWriter[RichPatientLabel] { + implicit val patientLabelFormat: RootJsonFormat[PatientLabel] = jsonFormat8(PatientLabel.apply) + + implicit val richPatientLabelFormat: RootJsonFormat[RichPatientLabel] = new RootJsonFormat[RichPatientLabel] { + override def read(json: JsValue): RichPatientLabel = { + val isVerified = + json.asJsObject.fields.getOrElse("isVerified", deserializationError("isVerified field is missing")) + RichPatientLabel(json.convertTo[PatientLabel], isVerified.convertTo[Boolean]) + } override def write(obj: RichPatientLabel): JsValue = { - JsObject( - "id" -> obj.patientLabel.id.toJson, - "labelId" -> obj.patientLabel.labelId.toJson, - "primaryValue" -> obj.patientLabel.primaryValue.toJson, - "verifiedPrimaryValue" -> obj.patientLabel.verifiedPrimaryValue.toJson, - "score" -> obj.patientLabel.score.toJson, - "isImplicitMatch" -> obj.patientLabel.isImplicitMatch.toJson, - "isVisible" -> obj.patientLabel.isVisible.toJson, - "isVerified" -> obj.isVerified.toJson - ) + val labelFields = obj.patientLabel.toJson.asJsObject.fields + JsObject(labelFields ++ Map("isVerified" -> obj.isVerified.toJson)) } } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala new file mode 100644 index 0000000..82c522f --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientCriterionService.scala @@ -0,0 +1,82 @@ +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.pdsuicommon.auth._ +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 + +import scala.concurrent.{ExecutionContext, Future} + +class RestPatientCriterionService(transport: ServiceTransport, baseUri: Uri)( + implicit protected val materializer: Materializer, + protected val exec: ExecutionContext) + extends PatientCriterionService with RestHelper { + + import spray.json.DefaultJsonProtocol._ + import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ + import xyz.driver.pdsuidomain.formats.json.patientcriterion._ + import xyz.driver.pdsuidomain.formats.json.listresponse._ + import xyz.driver.pdsuidomain.services.PatientCriterionService._ + + def getAll(patientId: UuidId[Patient], + filter: SearchFilterExpr = SearchFilterExpr.Empty, + sorting: Option[Sorting] = None, + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] = { + val request = HttpRequest(HttpMethods.GET, + endpointUri(baseUri, + s"/v1/patient/$patientId/criterion", + filterQuery(filter) ++ sortingQuery(sorting) ++ paginationQuery(pagination))) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[RichPatientCriterion]](response) + } yield { + GetListReply.EntityList(reply.items, reply.meta.itemsCount, reply.meta.lastUpdate) + } + } + + def getById(patientId: UuidId[Patient], id: LongId[PatientCriterion])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] = { + val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/criterion/$id")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientCriterion](response) + } yield { + GetByIdReply.Entity(reply) + } + } + + def updateList(patientId: UuidId[Patient], draftEntities: List[DraftPatientCriterion])( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = { + for { + entity <- Marshal(draftEntities).to[RequestEntity] + request = HttpRequest(HttpMethods.PATCH, endpointUri(baseUri, s"/v1/patient/$patientId/criterion")) + .withEntity(entity) + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientCriterion](response) + } yield { + UpdateReply.Updated(reply) + } + } + + def update(origEntity: PatientCriterion, draftEntity: PatientCriterion, patientId: UuidId[Patient])( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = { + for { + entity <- Marshal(draftEntity).to[RequestEntity] + request = HttpRequest( + HttpMethods.PATCH, + endpointUri(baseUri, s"/v1/patient/$patientId/criterion/${origEntity.criterionId}")).withEntity(entity) + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientCriterion](response) + } yield { + UpdateReply.Updated(reply) + } + } + +} diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala new file mode 100644 index 0000000..335d662 --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientLabelService.scala @@ -0,0 +1,84 @@ +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.pdsuicommon.auth._ +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.PatientLabelService + +import scala.concurrent.{ExecutionContext, Future} + +class RestPatientLabelService(transport: ServiceTransport, baseUri: Uri)( + implicit protected val materializer: Materializer, + protected val exec: ExecutionContext) + extends PatientLabelService with RestHelper { + + import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._ + import xyz.driver.pdsuidomain.formats.json.listresponse._ + import xyz.driver.pdsuidomain.formats.json.patientlabel._ + import xyz.driver.pdsuidomain.services.PatientLabelService._ + + def getAll(patientId: UuidId[Patient], + filter: SearchFilterExpr = SearchFilterExpr.Empty, + sorting: Option[Sorting] = None, + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] = { + val request = HttpRequest(HttpMethods.GET, + endpointUri(baseUri, + s"/v1/patient/$patientId/labels", + filterQuery(filter) ++ sortingQuery(sorting) ++ paginationQuery(pagination))) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[RichPatientLabel]](response) + } yield { + GetListReply.EntityList(reply.items, reply.meta.itemsCount) + } + } + + def getDefiningCriteriaList(patientId: UuidId[Patient], + hypothesisId: UuidId[Hypothesis], + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetDefiningCriteriaListReply] = { + val request = HttpRequest(HttpMethods.GET, + endpointUri(baseUri, s"/patient/$patientId/hypothesis", paginationQuery(pagination))) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[PatientLabel]](response) + } yield { + GetDefiningCriteriaListReply.EntityList(reply.items, reply.meta.itemsCount) + } + } + + def getByLabelIdOfPatient(patientId: UuidId[Patient], labelId: LongId[Label])( + implicit requestContext: AuthenticatedRequestContext): Future[GetByLabelIdReply] = { + val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$patientId/label/$labelId")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientLabel](response) + } yield { + GetByLabelIdReply.Entity(reply) + } + } + + def update(origPatientLabel: PatientLabel, draftPatientLabel: PatientLabel)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = { + for { + entity <- Marshal(draftPatientLabel).to[RequestEntity] + request = HttpRequest( + HttpMethods.PATCH, + endpointUri(baseUri, s"/v1/patient/${origPatientLabel.patientId}/label/${origPatientLabel.labelId}")) + .withEntity(entity) + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[RichPatientLabel](response) + } yield { + UpdateReply.Updated(reply) + } + } + +} |