diff --git a/src/main/scala/model/package.scala b/src/main/scala/model/package.scala index 475da12..3280c35 100644 --- a/src/main/scala/model/package.scala +++ b/src/main/scala/model/package.scala @@ -1,5 +1,6 @@ package object model { - import scala.slick.lifted.MappedTypeMapper + import scala.slick.driver.BasicDriver.Implicit._ + import scala.slick.lifted.{Column, MappedTypeMapper} // java.util.Date TypeMapper implicit val dateTypeMapper = MappedTypeMapper.base[java.util.Date, java.sql.Timestamp]( @@ -7,6 +8,10 @@ t => new java.util.Date(t.getTime) ) + implicit class RichColumn(c1: Column[Boolean]){ + def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1 + } + /** * Returns system date. */ diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index aef6436..33a8496 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -6,8 +6,6 @@ import Q.interpolation import model._ -import util.StringUtil._ -import util.Implicits._ trait IssuesService { import IssuesService._ @@ -241,6 +239,7 @@ object IssuesService { import javax.servlet.http.HttpServletRequest + import util.StringUtil._ val IssueLimit = 30 diff --git a/src/main/scala/util/Implicits.scala b/src/main/scala/util/Implicits.scala index c475136..388f9f6 100644 --- a/src/main/scala/util/Implicits.scala +++ b/src/main/scala/util/Implicits.scala @@ -1,6 +1,5 @@ package util -import scala.slick.driver.H2Driver.simple._ import scala.util.matching.Regex /** @@ -25,11 +24,6 @@ } } - // TODO Should this implicit conversion move to model.Functions? - implicit class RichColumn(c1: Column[Boolean]){ - def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1 - } - implicit class RichString(value: String){ def replaceBy(regex: Regex)(replace: Regex.MatchData => Option[String]): String = { val sb = new StringBuilder()