Merge branch 'master' into dal-improvements

2 files changed, 11 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/core.scala b/src/main/scala/xyz/driver/core/core.scala
index 2b61689..8c13aeb 100644
--- a/src/main/scala/xyz/driver/core/core.scala
+++ b/src/main/scala/xyz/driver/core/core.scala
@@ -37,6 +37,10 @@ package core {
   object Id {
     implicit def idEqual[T]: Equal[Id[T]]       = Equal.equal[Id[T]](_ == _)
     implicit def idOrdering[T]: Ordering[Id[T]] = Ordering.by[Id[T], String](_.value)
+
+    object Mapper {
+      def apply[A, B]: (Id[A] => Id[B]) = (id: Id[A]) => Id[B](id.value)
+    }
   }
 
   final case class Name[+Tag](value: String) extends AnyVal {
diff --git a/src/main/scala/xyz/driver/core/time.scala b/src/main/scala/xyz/driver/core/time.scala
index cdeb3a6..5dc16a0 100644
--- a/src/main/scala/xyz/driver/core/time.scala
+++ b/src/main/scala/xyz/driver/core/time.scala
@@ -21,9 +21,9 @@ object time {
 
   final case class Time(millis: Long) extends AnyVal {
 
-    def isBefore(anotherTime: Time): Boolean = millis < anotherTime.millis
+    def isBefore(anotherTime: Time): Boolean = implicitly[Ordering[Time]].lt(this, anotherTime)
 
-    def isAfter(anotherTime: Time): Boolean = millis > anotherTime.millis
+    def isAfter(anotherTime: Time): Boolean = implicitly[Ordering[Time]].gt(this, anotherTime)
 
     def advanceBy(duration: Duration): Time = Time(millis + duration.toMillis)
 
@@ -34,12 +34,15 @@ object time {
     }
   }
 
+  object Time {
+
+    implicit def timeOrdering: Ordering[Time] = Ordering.by(_.millis)
+  }
+
   final case class TimeRange(start: Time, end: Time) {
     def duration: Duration = FiniteDuration(end.millis - start.millis, MILLISECONDS)
   }
 
-  implicit def timeOrdering: Ordering[Time] = Ordering.by(_.millis)
-
   def startOfMonth(time: Time) = {
     Time(make(new GregorianCalendar()) { cal =>
       cal.setTime(new Date(time.millis))