fix merge conflictsv0.7.5

1 files changed, 2 insertions, 12 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
index 1f06e0d..8376e34 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/entities/export/trial/ExportTrialLabelCriterion.scala
@@ -3,12 +3,12 @@ package xyz.driver.pdsuidomain.entities.export.trial
 import xyz.driver.entities.labels.Label
 import xyz.driver.pdsuicommon.domain._
 import xyz.driver.pdsuicommon.logging._
-import xyz.driver.pdsuidomain.entities.{Arm, Criterion, RawTrialLabel}
+import xyz.driver.pdsuidomain.entities.{Criterion, EligibilityArm}
 
 final case class ExportTrialLabelCriterion(criterionId: LongId[Criterion],
                                            value: Option[Boolean],
                                            labelId: LongId[Label],
-                                           armIds: Set[LongId[Arm]],
+                                           armIds: Set[LongId[EligibilityArm]],
                                            criteria: String,
                                            isCompound: Boolean,
                                            isDefining: Boolean)
@@ -20,14 +20,4 @@ object ExportTrialLabelCriterion {
     phi"TrialLabelCriterion(criterionId=$criterionId, value=$value, labelId=$labelId, " +
       phi"criteria=${Unsafe(criteria)}, isCompound=$isCompound, isDefining=$isDefining)"
   }
-
-  def fromRaw(x: RawTrialLabel, armIds: Set[LongId[Arm]]) = ExportTrialLabelCriterion(
-    criterionId = x.criterionId,
-    value = x.value,
-    labelId = x.labelId,
-    armIds = armIds,
-    criteria = x.criteria,
-    isCompound = x.isCompound,
-    isDefining = x.isDefining
-  )
 }