diff options
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala | 34 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala | 72 |
2 files changed, 102 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala index 05a57e4..db430ae 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/patient/ApiPatient.scala @@ -1,8 +1,10 @@ package xyz.driver.pdsuidomain.formats.json.patient import java.time.{LocalDate, ZoneId, ZonedDateTime} +import java.util.UUID -import xyz.driver.pdsuidomain.entities.Patient +import xyz.driver.pdsuicommon.domain.{StringId, UuidId} +import xyz.driver.pdsuidomain.entities.{Patient, PatientOrderId} import play.api.libs.functional.syntax._ import play.api.libs.json.{Format, JsPath} @@ -15,7 +17,29 @@ final case class ApiPatient(id: String, previousAssignee: Option[String], lastActiveUser: Option[String], lastUpdate: ZonedDateTime, - condition: String) + condition: String, + orderId: UUID) { + + private def extractStatus(status: String): Patient.Status = + PatientStatus.statusFromString + .applyOrElse(status, (s: String) => throw new NoSuchElementException(s"Unknown status $s")) + + def toDomain = Patient( + id = UuidId(this.id), + status = extractStatus(this.status), + name = this.name, + dob = this.dob, + assignee = this.assignee.map(StringId(_)), + previousStatus = this.previousStatus.map(extractStatus), + previousAssignee = this.previousAssignee.map(StringId(_)), + lastActiveUserId = this.lastActiveUser.map(StringId(_)), + isUpdateRequired = false, + condition = this.condition, + orderId = PatientOrderId(this.orderId), + lastUpdate = this.lastUpdate.toLocalDateTime + ) + +} object ApiPatient { @@ -29,7 +53,8 @@ object ApiPatient { (JsPath \ "previousAssignee").formatNullable[String] and (JsPath \ "lastActiveUser").formatNullable[String] and (JsPath \ "lastUpdate").format[ZonedDateTime] and - (JsPath \ "condition").format[String] + (JsPath \ "condition").format[String] and + (JsPath \ "orderId").format[UUID] )(ApiPatient.apply, unlift(ApiPatient.unapply)) def fromDomain(patient: Patient) = ApiPatient( @@ -42,6 +67,7 @@ object ApiPatient { previousAssignee = patient.previousAssignee.map(_.id), lastActiveUser = patient.lastActiveUserId.map(_.id), lastUpdate = ZonedDateTime.of(patient.lastUpdate, ZoneId.of("Z")), - condition = patient.condition + condition = patient.condition, + orderId = patient.orderId.id ) } diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala new file mode 100644 index 0000000..b9cbec8 --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestPatientService.scala @@ -0,0 +1,72 @@ +package xyz.driver.pdsuidomain.services.rest + +import scala.concurrent.{ExecutionContext, Future} + +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.entities._ +import xyz.driver.pdsuidomain.formats.json.ListResponse +import xyz.driver.pdsuidomain.formats.json.patient.ApiPatient +import xyz.driver.pdsuidomain.services.PatientService + +class RestPatientService(transport: ServiceTransport, baseUri: Uri)(implicit protected val materializer: Materializer, + protected val exec: ExecutionContext) + extends PatientService with RestHelper { + + import xyz.driver.pdsuicommon.serialization.PlayJsonSupport._ + import xyz.driver.pdsuidomain.services.PatientService._ + + def getById(id: UuidId[Patient])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply] = { + val request = HttpRequest(HttpMethods.GET, endpointUri(baseUri, s"/v1/patient/$id")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ApiPatient](response) + } yield { + GetByIdReply.Entity(reply.toDomain) + } + } + + def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty, + sorting: Option[Sorting] = None, + pagination: Option[Pagination] = None)( + implicit requestContext: AuthenticatedRequestContext): Future[GetListReply] = { + val request = HttpRequest( + HttpMethods.GET, + endpointUri(baseUri, "/v1/patient", filterQuery(filter) ++ sortingQuery(sorting) ++ paginationQuery(pagination))) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ListResponse[ApiPatient]](response) + } yield { + GetListReply.EntityList(reply.items.map(_.toDomain), reply.meta.itemsCount, reply.meta.lastUpdate) + } + } + + private def editAction(orig: Patient, action: String)( + implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = { + val id = orig.id.toString + val request = HttpRequest(HttpMethods.POST, endpointUri(baseUri, s"/v1/patient/$id/$action")) + for { + response <- transport.sendRequestGetResponse(requestContext)(request) + reply <- apiResponse[ApiPatient](response) + } yield { + UpdateReply.Updated(reply.toDomain) + } + } + + def unassign(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "unassign") + def start(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "start") + def submit(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "submit") + def restart(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "restart") + def flag(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "flag") + def resolve(origPatient: Patient)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply] = + editAction(origPatient, "resolve") +} |