Added slot and eligibility arms to entities, json and services

10 files changed, 424 insertions, 0 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/EligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/EligibilityArm.scala
new file mode 100644
index 0000000..2f5924c
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/EligibilityArm.scala
@@ -0,0 +1,20 @@
+package xyz.driver.pdsuidomain.entities
+
+import java.time.LocalDateTime
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuicommon.logging._
+
+final case class EligibilityArm(id: LongId[EligibilityArm],
+                                name: String,
+                                originalName: String,
+                                trialId: StringId[Trial],
+                                deleted: Option[LocalDateTime] = None)
+
+object EligibilityArm {
+
+  implicit def toPhiString(x: EligibilityArm): PhiString = {
+    import x._
+    phi"Arm(id=$id, name=${Unsafe(x.name)}, trialId=${Unsafe(x.trialId)})"
+  }
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala
new file mode 100644
index 0000000..8363c7e
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/SlotArms.scala
@@ -0,0 +1,21 @@
+package xyz.driver.pdsuidomain.entities
+
+import java.time.LocalDateTime
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuicommon.logging._
+
+final case class SlotArm(id: LongId[SlotArm],
+                         name: String,
+                         originalName: String,
+                         trialId: StringId[Trial],
+                         deleted: Option[LocalDateTime] = None)
+
+object SlotArm {
+
+  implicit def toPhiString(x: SlotArm): PhiString = {
+    import x._
+    phi"Arm(id=$id, name=${Unsafe(x.name)}, trialId=${Unsafe(x.trialId)})"
+  }
+}
+
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala
new file mode 100644
index 0000000..d8ac34e
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala
@@ -0,0 +1,33 @@
+package xyz.driver.pdsuidomain.formats.json.eligibilityarm
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.EligibilityArm
+
+final case class ApiEligibilityArm(id: Long, name: String, originalName: String, trialId: String) {
+
+  def toDomain: EligibilityArm = EligibilityArm(
+    id = LongId(this.id),
+    name = this.name,
+    originalName = this.originalName,
+    trialId = StringId(this.trialId),
+    deleted = None // if we have an ApiEligibilityArm object, the EligibilityArm itself has not been deleted
+  )
+
+}
+
+object ApiEligibilityArm {
+
+  implicit val format: Format[ApiEligibilityArm] = (
+    (JsPath \ "id").format[Long] and
+      (JsPath \ "name").format[String] and
+      (JsPath \ "originalName").format[String] and
+      (JsPath \ "trialId").format[String]
+    )(ApiEligibilityArm.apply, unlift(ApiEligibilityArm.unapply))
+
+  def fromDomain(arm: EligibilityArm): ApiEligibilityArm = ApiEligibilityArm(
+    id = arm.id.id,
+    name = arm.name,
+    originalName = arm.originalName,
+    trialId = arm.trialId.id
+  )
+}
\ No newline at end of file
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityCreateArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityCreateArm.scala
new file mode 100644
index 0000000..4d884f0
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityCreateArm.scala
@@ -0,0 +1,19 @@
+package xyz.driver.pdsuidomain.formats.json.eligibilityarm
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.EligibilityArm
+
+final case class ApiCreateEligibilityArm(name: String, trialId: String) {
+
+  def toDomain = EligibilityArm(
+    id = LongId(0),
+    name = name,
+    trialId = StringId(trialId),
+    originalName = name
+  )
+}
+
+object ApiCreateEligibilityArm {
+
+  implicit val format: Format[ApiCreateEligibilityArm] = Json.format[ApiCreateEligibilityArm]
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiPartialEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiPartialEligibilityArm.scala
new file mode 100644
index 0000000..32b3291
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiPartialEligibilityArm.scala
@@ -0,0 +1,13 @@
+package xyz.driver.pdsuidomain.formats.json.eligibilityarm
+
+import xyz.driver.pdsuidomain.entities.EligibilityArm
+
+final case class ApiPartialEligibilityArm(name: String) {
+
+  def applyTo(arm: EligibilityArm): EligibilityArm = arm.copy(name = name)
+}
+
+object ApiPartialEligibilityArm {
+
+  implicit val format: Format[ApiPartialEligibilityArm] = Json.format
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala
new file mode 100644
index 0000000..06696fd
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiPartialSlotArm.scala
@@ -0,0 +1,15 @@
+package xyz.driver.pdsuidomain.formats.json.slotarm
+
+
+import xyz.driver.pdsuidomain.entities.SlotArm
+import play.api.libs.json.{Format, Json}
+
+final case class ApiPartialSlotArm(name: String) {
+
+  def applyTo(arm: SlotArm): SlotArm = arm.copy(name = name)
+}
+
+object ApiPartialSlotArm {
+
+  implicit val format: Format[ApiPartialSlotArm] = Json.format
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala
new file mode 100644
index 0000000..2e26a01
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotArm.scala
@@ -0,0 +1,35 @@
+package xyz.driver.pdsuidomain.formats.json.slotarm
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.SlotArm
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+final case class ApiSlotArm(id: Long, name: String, originalName: String, trialId: String) {
+
+  def toDomain: SlotArm = SlotArm(
+    id = LongId(this.id),
+    name = this.name,
+    originalName = this.originalName,
+    trialId = StringId(this.trialId),
+    deleted = None // if we have an ApiSlotArm object, the SlotArm itself has not been deleted
+  )
+
+}
+
+object ApiSlotArm {
+
+  implicit val format: Format[ApiSlotArm] = (
+    (JsPath \ "id").format[Long] and
+      (JsPath \ "name").format[String] and
+      (JsPath \ "originalName").format[String] and
+      (JsPath \ "trialId").format[String]
+    )(ApiSlotArm.apply, unlift(ApiSlotArm.unapply))
+
+  def fromDomain(arm: SlotArm): ApiSlotArm = ApiSlotArm(
+    id = arm.id.id,
+    name = arm.name,
+    originalName = arm.originalName,
+    trialId = arm.trialId.id
+  )
+}
\ No newline at end of file
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotCreateArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotCreateArm.scala
new file mode 100644
index 0000000..3e52c13
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/slotarm/ApiSlotCreateArm.scala
@@ -0,0 +1,20 @@
+package xyz.driver.pdsuidomain.formats.json.slotarm
+
+import xyz.driver.pdsuicommon.domain.{LongId, StringId}
+import xyz.driver.pdsuidomain.entities.SlotArm
+import play.api.libs.json.{Format, Json}
+
+final case class ApiCreateSlotArm(name: String, trialId: String) {
+
+  def toDomain = SlotArm(
+    id = LongId(0),
+    name = name,
+    trialId = StringId(trialId),
+    originalName = name
+  )
+}
+
+object ApiCreateSlotArm {
+
+  implicit val format: Format[ApiCreateSlotArm] = Json.format[ApiCreateSlotArm]
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala
new file mode 100644
index 0000000..fc28e5f
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/EligibilityArmService.scala
@@ -0,0 +1,124 @@
+package xyz.driver.pdsuidomain.services
+
+import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
+import xyz.driver.pdsuicommon.db._
+import xyz.driver.pdsuicommon.domain.LongId
+import xyz.driver.pdsuicommon.error.DomainError
+import xyz.driver.pdsuicommon.logging._
+import xyz.driver.pdsuidomain.entities.EligibilityArm
+
+import scala.concurrent.Future
+
+object EligibilityArmService {
+
+  trait DefaultAccessDeniedError {
+    def userMessage: String = "Access denied"
+  }
+
+  trait DefaultNotFoundError {
+    def userMessage: String = "EligibilityArm not found"
+  }
+
+  sealed trait GetByIdReply
+  object GetByIdReply {
+
+    final case class Entity(x: EligibilityArm) extends GetByIdReply
+
+    type Error = GetByIdReply with DomainError
+
+    case object NotFoundError extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+
+    final case class CommonError(userMessage: String)(implicit requestContext: AuthenticatedRequestContext)
+        extends GetByIdReply with DomainError
+  }
+
+  sealed trait GetListReply
+  object GetListReply {
+    type Error = GetListReply with DomainError
+
+    final case class EntityList(xs: Seq[EligibilityArm], totalFound: Int) extends GetListReply
+
+    case object AuthorizationError
+        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+  }
+
+  sealed trait UpdateReply
+  object UpdateReply {
+
+    final case class Updated(updated: EligibilityArm) extends UpdateReply
+
+    type Error = UpdateReply with DomainError
+
+    case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends UpdateReply with DomainError
+
+    final case class AlreadyExistsError(x: EligibilityArm) extends UpdateReply with DomainError {
+      val userMessage = s"The arm with such name of trial already exists."
+    }
+
+    implicit def toPhiString(reply: UpdateReply): PhiString = reply match {
+      case Updated(x) => phi"Updated($x)"
+      case x: Error   => DomainError.toPhiString(x)
+    }
+  }
+
+  sealed trait CreateReply
+  object CreateReply {
+    final case class Created(x: EligibilityArm) extends CreateReply
+
+    type Error = CreateReply with DomainError
+
+    case object AuthorizationError
+        extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends CreateReply with DomainError
+
+    final case class AlreadyExistsError(x: EligibilityArm) extends CreateReply with DomainError {
+      val userMessage = s"The arm with this name of trial already exists."
+    }
+
+    implicit def toPhiString(reply: CreateReply): PhiString = reply match {
+      case Created(x) => phi"Created($x)"
+      case x: Error   => DomainError.toPhiString(x)
+    }
+  }
+
+  sealed trait DeleteReply
+  object DeleteReply {
+    case object Deleted extends DeleteReply
+
+    type Error = DeleteReply with DomainError
+
+    case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends DeleteReply with DomainError
+  }
+}
+
+trait EligibilityArmService {
+
+  import EligibilityArmService._
+
+  def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
+             sorting: Option[Sorting] = None,
+             pagination: Option[Pagination] = None)(
+          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
+
+  def getById(armId: LongId[EligibilityArm])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
+
+  def create(draftEligibilityArm: EligibilityArm)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
+
+  def update(origEligibilityArm: EligibilityArm, draftEligibilityArm: EligibilityArm)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
+
+  def delete(id: LongId[EligibilityArm])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
+}
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala
new file mode 100644
index 0000000..3c55909
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/SlotArmService.scala
@@ -0,0 +1,124 @@
+package xyz.driver.pdsuidomain.services
+
+import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
+import xyz.driver.pdsuicommon.db._
+import xyz.driver.pdsuicommon.domain.LongId
+import xyz.driver.pdsuicommon.error.DomainError
+import xyz.driver.pdsuicommon.logging._
+import xyz.driver.pdsuidomain.entities.SlotArm
+
+import scala.concurrent.Future
+
+object SlotArmService {
+
+  trait DefaultAccessDeniedError {
+    def userMessage: String = "Access denied"
+  }
+
+  trait DefaultNotFoundError {
+    def userMessage: String = "SlotArm not found"
+  }
+
+  sealed trait GetByIdReply
+  object GetByIdReply {
+
+    final case class Entity(x: SlotArm) extends GetByIdReply
+
+    type Error = GetByIdReply with DomainError
+
+    case object NotFoundError extends GetByIdReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+
+    final case class CommonError(userMessage: String)(implicit requestContext: AuthenticatedRequestContext)
+        extends GetByIdReply with DomainError
+  }
+
+  sealed trait GetListReply
+  object GetListReply {
+    type Error = GetListReply with DomainError
+
+    final case class EntityList(xs: Seq[SlotArm], totalFound: Int) extends GetListReply
+
+    case object AuthorizationError
+        extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError
+  }
+
+  sealed trait UpdateReply
+  object UpdateReply {
+
+    final case class Updated(updated: SlotArm) extends UpdateReply
+
+    type Error = UpdateReply with DomainError
+
+    case object NotFoundError extends UpdateReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends UpdateReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends UpdateReply with DomainError
+
+    final case class AlreadyExistsError(x: SlotArm) extends UpdateReply with DomainError {
+      val userMessage = s"The arm with such name of trial already exists."
+    }
+
+    implicit def toPhiString(reply: UpdateReply): PhiString = reply match {
+      case Updated(x) => phi"Updated($x)"
+      case x: Error   => DomainError.toPhiString(x)
+    }
+  }
+
+  sealed trait CreateReply
+  object CreateReply {
+    final case class Created(x: SlotArm) extends CreateReply
+
+    type Error = CreateReply with DomainError
+
+    case object AuthorizationError
+        extends CreateReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends CreateReply with DomainError
+
+    final case class AlreadyExistsError(x: SlotArm) extends CreateReply with DomainError {
+      val userMessage = s"The arm with this name of trial already exists."
+    }
+
+    implicit def toPhiString(reply: CreateReply): PhiString = reply match {
+      case Created(x) => phi"Created($x)"
+      case x: Error   => DomainError.toPhiString(x)
+    }
+  }
+
+  sealed trait DeleteReply
+  object DeleteReply {
+    case object Deleted extends DeleteReply
+
+    type Error = DeleteReply with DomainError
+
+    case object NotFoundError extends DeleteReply with DefaultNotFoundError with DomainError.NotFoundError
+
+    case object AuthorizationError
+        extends DeleteReply with DefaultAccessDeniedError with DomainError.AuthorizationError
+
+    final case class CommonError(userMessage: String) extends DeleteReply with DomainError
+  }
+}
+
+trait SlotArmService {
+
+  import SlotArmService._
+
+  def getAll(filter: SearchFilterExpr = SearchFilterExpr.Empty,
+             sorting: Option[Sorting] = None,
+             pagination: Option[Pagination] = None)(
+          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
+
+  def getById(armId: LongId[SlotArm])(implicit requestContext: AuthenticatedRequestContext): Future[GetByIdReply]
+
+  def create(draftSlotArm: SlotArm)(implicit requestContext: AuthenticatedRequestContext): Future[CreateReply]
+
+  def update(origSlotArm: SlotArm, draftSlotArm: SlotArm)(implicit requestContext: AuthenticatedRequestContext): Future[UpdateReply]
+
+  def delete(id: LongId[SlotArm])(implicit requestContext: AuthenticatedRequestContext): Future[DeleteReply]
+}