From 2165af34b96ab25d35e2a3c429da6d7142169fc4 Mon Sep 17 00:00:00 2001 From: timgushue Date: Mon, 25 Sep 2017 13:42:52 -0700 Subject: fixing imports for slot and eligibility arms --- .../json/eligibilityarm/ApiEligibilityArm.scala | 35 ++++++++++++++++++++++ .../eligibilityarm/ApiEligibilityCreateArm.scala | 21 +++++++++++++ .../eligibilityarm/ApiPartialEligibilityArm.scala | 14 +++++++++ .../eligibilityarm/slotarm/ApiEligibilityArm.scala | 33 -------------------- .../slotarm/ApiEligibilityCreateArm.scala | 19 ------------ .../slotarm/ApiPartialEligibilityArm.scala | 13 -------- 6 files changed, 70 insertions(+), 65 deletions(-) create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala create mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala delete mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala delete mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityCreateArm.scala delete mode 100644 src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiPartialEligibilityArm.scala (limited to 'src/main/scala/xyz/driver/pdsuidomain') diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala new file mode 100644 index 0000000..51821d8 --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala @@ -0,0 +1,35 @@ +package xyz.driver.pdsuidomain.formats.json.eligibilityarm + +import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import xyz.driver.pdsuidomain.entities.EligibilityArm +import play.api.libs.functional.syntax._ +import play.api.libs.json._ + +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/ApiEligibilityCreateArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala new file mode 100644 index 0000000..a31182f --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityCreateArm.scala @@ -0,0 +1,21 @@ +package xyz.driver.pdsuidomain.formats.json.eligibilityarm + +import xyz.driver.pdsuicommon.domain.{LongId, StringId} +import xyz.driver.pdsuidomain.entities.EligibilityArm +import play.api.libs.json.{Format, Json} + + +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/ApiPartialEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala new file mode 100644 index 0000000..cc3d460 --- /dev/null +++ b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala @@ -0,0 +1,14 @@ +package xyz.driver.pdsuidomain.formats.json.eligibilityarm + +import xyz.driver.pdsuidomain.entities.EligibilityArm +import play.api.libs.json.{Format, Json} + +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/eligibilityarm/slotarm/ApiEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala deleted file mode 100644 index d8ac34e..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityArm.scala +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 4d884f0..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiEligibilityCreateArm.scala +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 32b3291..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/slotarm/ApiPartialEligibilityArm.scala +++ /dev/null @@ -1,13 +0,0 @@ -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 -} -- cgit v1.2.3