Migrate from joda-time to java.time

Fixes #226

Author: Orhideous

build.sbt

@@ -34,7 +34,6 @@ lazy val scalajvmSettings = Seq(
     "org.scalikejdbc" %% "scalikejdbc" % "3.5.0",
     "org.scalikejdbc" %% "scalikejdbc-config" % "3.5.0",
     "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.8.0-scalikejdbc-3.5",
-    "org.scalikejdbc" %% "scalikejdbc-joda-time" % "3.5.0",
     "org.postgresql" % "postgresql" % "9.3-1104-jdbc41",
     "jakarta.mail" % "jakarta.mail-api" % "1.6.5",
     "com.sun.mail" % "smtp" % "1.6.5",

scalajvm/app/controllers/api/Quotes.scala

@@ -50,7 +50,7 @@ class Quotes @Inject()(implicit cc: ControllerComponents, configuration: Configu
     }
 
   private def buildQuoteDto(quote: Quote): QuoteDTO =
-    QuoteDTO(quote.id, quote.source, quote.sourceUrl.orNull, quote.time.getMillis, quote.content.getOrElse(""), quote.rating)
+    QuoteDTO(quote.id, quote.source, quote.sourceUrl.orNull, quote.time.toInstant.toEpochMilli, quote.content.getOrElse(""), quote.rating)
 
   private def json(text: String) = Ok(text).as("application/json; charset=utf-8")
 }

scalajvm/app/models/data/FeedItem.scala

@@ -1,6 +1,5 @@
 package models.data
 
-import org.joda.time.DateTime
-import scala.xml._
+import java.time.ZonedDateTime
 
-case class FeedItem(time: DateTime, title: String, description: String, link: String, guid: String)
+case class FeedItem(time: ZonedDateTime, title: String, description: String, link: String, guid: String)

scalajvm/app/models/data/Quote.scala

@@ -1,10 +1,10 @@
 package models.data
 
-import org.joda.time.DateTime
+import java.time.ZonedDateTime
+
 import scalikejdbc._
-import scalikejdbc.jodatime.JodaTypeBinder._
 
-case class Quote(id: Long, source: String, sourceUrl: Option[String], time: DateTime, content: Option[String], rating: Int)
+case class Quote(id: Long, source: String, sourceUrl: Option[String], time: ZonedDateTime, content: Option[String], rating: Int)
 object Quote extends SQLSyntaxSupport[Quote] {
   override val tableName = "quote"
 

scalajvm/app/models/data/SuggestedQuote.scala

@@ -1,10 +1,10 @@
 package models.data
 
-import org.joda.time.DateTime
+import java.time.ZonedDateTime
+
 import scalikejdbc._
-import scalikejdbc.jodatime.JodaTypeBinder._
 
-case class SuggestedQuote(id: Long, source: String, time: DateTime,
+case class SuggestedQuote(id: Long, source: String, time: ZonedDateTime,
                           content: String, submitterIp: Option[String],
                           token: String)
 

scalajvm/app/models/queries/QuoteQueries.scala

@@ -1,12 +1,12 @@
 package models.queries
 
+import java.time.{LocalDate, ZonedDateTime, ZoneOffset}
+
 import scala.util.Random
 import scala.math._
 import helpers.BindableEnumeration
 import models.data.Quote
-import org.joda.time.{DateTime, DateTimeZone}
 import scalikejdbc._
-import scalikejdbc.jodatime.JodaParameterBinderFactory._
 
 object QuoteOrdering extends BindableEnumeration {
   val Time, Rating = Value
@@ -25,12 +25,12 @@ object QuoteFilter extends BindableEnumeration {
 
   def toSQL(provider: QuerySQLSyntaxProvider[SQLSyntaxSupport[Quote], Quote],
             value: QuoteFilter.Value): Option[SQLSyntax] = {
-    val today = DateTime.now(DateTimeZone.UTC).withTimeAtStartOfDay()
+    val today = LocalDate.now(ZoneOffset.UTC).atStartOfDay(ZoneOffset.UTC)
     val periodStart = value match {
-      case QuoteFilter.None => Option.empty[DateTime]
+      case QuoteFilter.None => Option.empty[ZonedDateTime]
       case QuoteFilter.Year => Some(today.withDayOfYear(1))
       case QuoteFilter.Month => Some(today.withDayOfMonth(1))
-      case QuoteFilter.Week => Some(today.withDayOfWeek(1))
+      case QuoteFilter.Week => Some(today.minusDays(today.getDayOfWeek.ordinal()))
       case QuoteFilter.Day => Some(today)
     }
 
@@ -88,7 +88,7 @@ case class QuoteQueries()(implicit session: DBSession) {
   def insertQuote(content: String, source: String): Long = {
     val q = Quote.column
     withSQL {
-      insert.into(Quote).columns(q.content, q.time, q.source).values(content, DateTime.now(), source)
+      insert.into(Quote).columns(q.content, q.time, q.source).values(content, ZonedDateTime.now(ZoneOffset.UTC), source)
     }.updateAndReturnGeneratedKey().apply()
   }
 

scalajvm/app/models/queries/SuggestedQuoteQueries.scala

@@ -1,15 +1,16 @@
 package models.queries
 
+import java.time.{ZonedDateTime, ZoneOffset}
+
 import models.data.SuggestedQuote
-import org.joda.time.DateTime
 import scalikejdbc._
 
 case class SuggestedQuoteQueries()(implicit session: DBSession) {
 
   def insertSuggestedQuote(content: String, submitterIp: String, source: String): Long = {
     val q = SuggestedQuote.column
     withSQL {
-      insert.into(SuggestedQuote).columns(q.time, q.content, q.submitterIp, q.source).values(DateTime.now(), content, submitterIp, source)
+      insert.into(SuggestedQuote).columns(q.time, q.content, q.submitterIp, q.source).values(ZonedDateTime.now(ZoneOffset.UTC), content, submitterIp, source)
     }.updateAndReturnGeneratedKey().apply()
   }