diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-30 16:29:46 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 16:29:46 +0700 |
commit | 604fbf0a7a082bc440c0778abd6f90005b210c16 (patch) | |
tree | fd846d42448b2d3f432056898f0c3433475ea0da /src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm | |
parent | 8811d60442d060097027b33784ece9a704458e1d (diff) | |
parent | d92a2795a02b9711aa9aed92a770f85377b31460 (diff) | |
download | rest-query-604fbf0a7a082bc440c0778abd6f90005b210c16.tar.gz rest-query-604fbf0a7a082bc440c0778abd6f90005b210c16.tar.bz2 rest-query-604fbf0a7a082bc440c0778abd6f90005b210c16.zip |
Merge pull request #54 from drivergroup/PDSUI-2336v0.11.0
PDSUI-2336 Cleanup
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm')
3 files changed, 0 insertions, 113 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiCreateEligibilityArm.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiCreateEligibilityArm.scala deleted file mode 100644 index 087fed5..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiCreateEligibilityArm.scala +++ /dev/null @@ -1,33 +0,0 @@ -package xyz.driver.pdsuidomain.formats.json.eligibilityarm - -import play.api.libs.json.{Format, Json} -import xyz.driver.entities.patient.CancerType -import xyz.driver.pdsuicommon.domain.{LongId, StringId} -import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases} - -final case class ApiCreateEligibilityArm(name: String, trialId: String, diseases: Seq[String]) { - - def toDomain: EligibilityArmWithDiseases = { - val eligibilityArm = EligibilityArm( - id = LongId(0), - name = name, - trialId = StringId(trialId), - originalName = name - ) - - EligibilityArmWithDiseases( - eligibilityArm, - diseases.map { disease => - val condition = CancerType - .fromString(disease) - .getOrElse(throw new NoSuchElementException(s"unknown condition $disease")) - EligibilityArmDisease(eligibilityArm.id, condition) - } - ) - } -} - -object ApiCreateEligibilityArm { - - implicit val format: Format[ApiCreateEligibilityArm] = Json.format[ApiCreateEligibilityArm] -} 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 deleted file mode 100644 index 71423e8..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiEligibilityArm.scala +++ /dev/null @@ -1,57 +0,0 @@ -package xyz.driver.pdsuidomain.formats.json.eligibilityarm - -import play.api.libs.functional.syntax._ -import play.api.libs.json._ -import xyz.driver.entities.patient.CancerType -import xyz.driver.pdsuicommon.domain.{LongId, StringId} -import xyz.driver.pdsuidomain.entities.{EligibilityArm, EligibilityArmDisease, EligibilityArmWithDiseases} - -final case class ApiEligibilityArm(id: Long, - name: String, - originalName: String, - trialId: String, - diseases: Seq[String]) { - - def toDomain: EligibilityArmWithDiseases = { - val 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 - ) - - EligibilityArmWithDiseases( - eligibilityArm, - this.diseases.map { disease => - val condition = CancerType - .fromString(disease) - .getOrElse(throw new NoSuchElementException(s"unknown condition $disease")) - EligibilityArmDisease(eligibilityArm.id, condition) - } - ) - } -} - -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] and - (JsPath \ "diseases").format[Seq[String]] - )(ApiEligibilityArm.apply, unlift(ApiEligibilityArm.unapply)) - - def fromDomain(eligibilityArmWithDiseases: EligibilityArmWithDiseases): ApiEligibilityArm = { - import eligibilityArmWithDiseases.{eligibilityArm, eligibilityArmDiseases} - - ApiEligibilityArm( - id = eligibilityArm.id.id, - name = eligibilityArm.name, - originalName = eligibilityArm.originalName, - trialId = eligibilityArm.trialId.id, - diseases = eligibilityArmDiseases.map(_.disease.toString) - ) - } -} 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 deleted file mode 100644 index aca22ef..0000000 --- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/eligibilityarm/ApiPartialEligibilityArm.scala +++ /dev/null @@ -1,23 +0,0 @@ -package xyz.driver.pdsuidomain.formats.json.eligibilityarm - -import play.api.libs.json.{Format, Json} -import xyz.driver.entities.patient.CancerType -import xyz.driver.pdsuidomain.entities.{EligibilityArmDisease, EligibilityArmWithDiseases} - -final case class ApiPartialEligibilityArm(name: String, diseases: Seq[String]) { - - def applyTo(armWithDisease: EligibilityArmWithDiseases): EligibilityArmWithDiseases = { - val arm = armWithDisease.eligibilityArm.copy(name = name) - val armDiseases = diseases.map { disease => - EligibilityArmDisease( - armWithDisease.eligibilityArm.id, - CancerType.fromString(disease).getOrElse(throw new NoSuchElementException(s"unknown condition $disease"))) - } - EligibilityArmWithDiseases(arm, armDiseases) - } -} - -object ApiPartialEligibilityArm { - - implicit val format: Format[ApiPartialEligibilityArm] = Json.format -} |