add timezone to time => date conversion

3 files changed, 7 insertions, 2 deletions

diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index 2041b85..7d9aecb 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -7,6 +7,7 @@ import date.{Date, javaDateToDate}
 import slick.dbio.{DBIOAction, NoStream}
 
 package object database {
+
   type Schema = {
     def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
     def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
diff --git a/src/main/scala/xyz/driver/core/generators.scala b/src/main/scala/xyz/driver/core/generators.scala
index 0db18a1..d532ae3 100644
--- a/src/main/scala/xyz/driver/core/generators.scala
+++ b/src/main/scala/xyz/driver/core/generators.scala
@@ -56,7 +56,7 @@ object generators {
               Time(scala.math.max(oneTime.millis, anotherTime.millis)))
   }
 
-  def nextDate(): Date = nextTime.toDate
+  def nextDate(): Date = nextTime.toDate(java.util.TimeZone.getTimeZone("UTC"))
 
   def nextBigDecimal(multiplier: Double = 1000000.00, precision: Int = 2): BigDecimal =
     BigDecimal(multiplier * nextDouble, new MathContext(precision))
diff --git a/src/main/scala/xyz/driver/core/time.scala b/src/main/scala/xyz/driver/core/time.scala
index 6d76939..cdeb3a6 100644
--- a/src/main/scala/xyz/driver/core/time.scala
+++ b/src/main/scala/xyz/driver/core/time.scala
@@ -27,7 +27,11 @@ object time {
 
     def advanceBy(duration: Duration): Time = Time(millis + duration.toMillis)
 
-    def toDate: date.Date = date.javaDateToDate(new java.util.Date(millis))
+    def toDate(timezone: TimeZone): date.Date = {
+      val cal = java.util.Calendar.getInstance(timezone)
+      cal.setTimeInMillis(millis)
+      date.javaDateToDate(cal.getTime())
+    }
   }
 
   final case class TimeRange(start: Time, end: Time) {