diff --git a/src/main/scala/model/Activity.scala b/src/main/scala/model/Activity.scala index 6ad1bdb..7977047 100644 --- a/src/main/scala/model/Activity.scala +++ b/src/main/scala/model/Activity.scala @@ -1,29 +1,29 @@ -package model - -trait ActivityComponent extends TemplateComponent { self: Profile => - import profile.simple._ - import self._ - - lazy val Activities = TableQuery[Activities] - - class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate { - val activityId = column[Int]("ACTIVITY_ID", O AutoInc) - val activityUserName = column[String]("ACTIVITY_USER_NAME") - val activityType = column[String]("ACTIVITY_TYPE") - val message = column[String]("MESSAGE") - val additionalInfo = column[String]("ADDITIONAL_INFO") - val activityDate = column[java.util.Date]("ACTIVITY_DATE") - def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply) - } - - case class Activity( - userName: String, - repositoryName: String, - activityUserName: String, - activityType: String, - message: String, - additionalInfo: Option[String], - activityDate: java.util.Date, - activityId: Int = 0 - ) -} +package model + +trait ActivityComponent extends TemplateComponent { self: Profile => + import profile.simple._ + import self._ + + lazy val Activities = TableQuery[Activities] + + class Activities(tag: Tag) extends Table[Activity](tag, "ACTIVITY") with BasicTemplate { + val activityId = column[Int]("ACTIVITY_ID", O AutoInc) + val activityUserName = column[String]("ACTIVITY_USER_NAME") + val activityType = column[String]("ACTIVITY_TYPE") + val message = column[String]("MESSAGE") + val additionalInfo = column[String]("ADDITIONAL_INFO") + val activityDate = column[java.util.Date]("ACTIVITY_DATE") + def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply) + } + + case class Activity( + userName: String, + repositoryName: String, + activityUserName: String, + activityType: String, + message: String, + additionalInfo: Option[String], + activityDate: java.util.Date, + activityId: Int = 0 + ) +} diff --git a/src/main/scala/model/Profile.scala b/src/main/scala/model/Profile.scala index 8b67c6e..20ff24b 100644 --- a/src/main/scala/model/Profile.scala +++ b/src/main/scala/model/Profile.scala @@ -1,19 +1,19 @@ -package model - -import slick.driver.JdbcProfile - -trait Profile { - val profile: JdbcProfile - import profile.simple._ - - // java.util.Date Mapped Column Types - implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp]( - d => new java.sql.Timestamp(d.getTime), - 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 - } - -} +package model + +import slick.driver.JdbcProfile + +trait Profile { + val profile: JdbcProfile + import profile.simple._ + + // java.util.Date Mapped Column Types + implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp]( + d => new java.sql.Timestamp(d.getTime), + 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 + } + +}