aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-10-12 10:44:54 +0700
committerAleksandr <ognelisar@gmail.com>2017-10-12 10:44:54 +0700
commitf525ab2604cc5d1366c852bdbcb4d912bbcea800 (patch)
tree4fe4b35e1f474e2dc85a8885dc4c9002f3ea46c2 /src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
parent9198729ebf3d20b650b4467daa0d484a3148f01c (diff)
parente15415d69ec990d5243e58704e232e619b80aa6f (diff)
downloadrest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.gz
rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.bz2
rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.zip
All merge conflicts are resolved
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala')
-rw-r--r--src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
index fd9268b..7dbf0d9 100644
--- a/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
+++ b/src/main/scala/xyz/driver/pdsuidomain/services/CriterionService.scala
@@ -21,7 +21,9 @@ object CriterionService {
def userMessage: String = "Access denied"
}
- final case class RichCriterion(criterion: Criterion, armIds: Seq[LongId[Arm]], labels: Seq[CriterionLabel])
+ final case class RichCriterion(criterion: Criterion,
+ armIds: Seq[LongId[EligibilityArm]],
+ labels: Seq[CriterionLabel])
object RichCriterion {
implicit def toPhiString(x: RichCriterion): PhiString = {
import x._