Merge branch 'date' into dal-improvements

2 files changed, 49 insertions, 0 deletions

diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 54518c5..3db9c9e 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -5,6 +5,7 @@ import scala.concurrent.Future
 import slick.backend.DatabaseConfig
 import slick.driver.JdbcProfile
 import xyz.driver.core.time.Time
+import xyz.driver.core.date.Date
 
 package database {
 
@@ -36,6 +37,9 @@ package database {
 
     implicit def `xyz.driver.core.time.Time.columnType`: BaseColumnType[Time] =
       MappedColumnType.base[Time, Long](_.millis, Time(_))
+
+    implicit def `xyz.driver.core.time.Date.columnType`: BaseColumnType[Date] =
+      MappedColumnType.base[Date, java.sql.Date](_.toJavaSqlDate, Date.fromJavaDate(_))
   }
 
   object ColumnTypes {
diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala
new file mode 100644
index 0000000..05d139d
--- /dev/null
+++ b/src/main/scala/xyz/driver/core/date.scala
@@ -0,0 +1,45 @@
+package xyz.driver.core
+
+import java.util.Calendar
+
+import scalaz.{@@, Tag}
+
+object date {
+
+  type Month = Int @@ Month.type
+  private[date] def tagMonth(value: Int): Month = Tag.of[Month.type](value)
+
+  object Month {
+    val JANUARY   = tagMonth(Calendar.JANUARY)
+    val FEBRUARY  = tagMonth(Calendar.FEBRUARY)
+    val MARCH     = tagMonth(Calendar.MARCH)
+    val APRIL     = tagMonth(Calendar.APRIL)
+    val MAY       = tagMonth(Calendar.MAY)
+    val JUNE      = tagMonth(Calendar.JUNE)
+    val JULY      = tagMonth(Calendar.JULY)
+    val AUGUST    = tagMonth(Calendar.AUGUST)
+    val SEPTEMBER = tagMonth(Calendar.SEPTEMBER)
+    val OCTOBER   = tagMonth(Calendar.OCTOBER)
+    val DECEMBER  = tagMonth(Calendar.DECEMBER)
+  }
+
+  final case class Date(year: Int, month: Month, day: Int) {
+    def iso8601: String = f"$year%04d-${Tag.unwrap(month) + 1}%02d-$day%02d"
+    def toJavaSqlDate = new java.sql.Date(toJavaDate.getTime)
+    def toJavaDate: java.util.Date = {
+      val cal = Calendar.getInstance()
+      cal.set(Calendar.YEAR, year - 1900)
+      cal.set(Calendar.MONTH, Tag.unwrap(month))
+      cal.set(Calendar.DAY_OF_MONTH, day)
+      cal.getTime
+    }
+  }
+
+  object Date {
+    def fromJavaDate(date: java.util.Date) = {
+      val cal = Calendar.getInstance()
+      cal.setTime(date)
+      Date(cal.get(Calendar.YEAR), tagMonth(cal.get(Calendar.MONTH)), cal.get(Calendar.DAY_OF_MONTH))
+    }
+  }
+}