Merge branch 'master' of ssh://github.com/drivergroup/pds-ui-common into PDSUI-rep-fixtures

1 files changed, 0 insertions, 55 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/formats/json/export/ApiExportTrialLabelCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/formats/json/export/ApiExportTrialLabelCriterion.scala
deleted file mode 100644
index df1ebb4..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/formats/json/export/ApiExportTrialLabelCriterion.scala
+++ /dev/null
@@ -1,55 +0,0 @@
-package xyz.driver.pdsuidomain.formats.json.export
-
-import play.api.libs.functional.syntax._
-import play.api.libs.json._
-import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId}
-import xyz.driver.pdsuidomain.entities.export.trial.ExportTrialLabelCriterion
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, Label}
-
-final case class ApiExportTrialLabelCriterion(value: String,
-                                              labelId: String,
-                                              criterionId: String,
-                                              criterionText: String,
-                                              armIds: List[String],
-                                              isCompound: Boolean,
-                                              isDefining: Boolean) {
-
-  def toDomain: ExportTrialLabelCriterion = {
-    ExportTrialLabelCriterion(
-      LongId[Criterion](criterionId.toLong),
-      FuzzyValue.fromString.lift(value).map(_ == FuzzyValue.Yes),
-      LongId[Label](labelId.toLong),
-      armIds.map(armId => LongId[Arm](armId.toLong)).toSet,
-      criterionText,
-      isCompound,
-      isDefining
-    )
-  }
-}
-
-object ApiExportTrialLabelCriterion {
-
-  implicit val format: Format[ApiExportTrialLabelCriterion] = (
-    (JsPath \ "value").format[String](Writes[String](x => JsString(x.toUpperCase))) and
-      (JsPath \ "labelId").format[String] and
-      (JsPath \ "criterionId").format[String] and
-      (JsPath \ "criterionText").format[String] and
-      (JsPath \ "armIds").format[List[String]] and
-      (JsPath \ "isCompound").format[Boolean] and
-      (JsPath \ "isDefining").format[Boolean]
-  )(ApiExportTrialLabelCriterion.apply, unlift(ApiExportTrialLabelCriterion.unapply))
-
-  def fromDomain(x: ExportTrialLabelCriterion) = ApiExportTrialLabelCriterion(
-    value = x.value
-      .map { x =>
-        FuzzyValue.valueToString(FuzzyValue.fromBoolean(x))
-      }
-      .getOrElse("Unknown"),
-    labelId = x.labelId.toString,
-    criterionId = x.criterionId.toString,
-    criterionText = x.criteria,
-    armIds = x.armIds.map(_.toString).toList,
-    isCompound = x.isCompound,
-    isDefining = x.isDefining
-  )
-}