Fix date histogram cache miss: replace now with cacheable date bounds

build.sbt

@@ -17,7 +17,7 @@ lazy val root = (project in file("."))
   .settings(
     inThisBuild(List(
       organization    := "dpla",
-      scalaVersion    := "2.13.4"
+      scalaVersion    := "2.13.16"
     )),
     Defaults.itSettings,
 
@@ -54,3 +54,4 @@ ThisBuild / assemblyMergeStrategy := {
   case "META-INF/MANIFEST.MF" => MergeStrategy.discard
   case x => MergeStrategy.first
 }
+ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % "always"

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.10.0

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1")

src/main/scala/dpla/api/v2/search/queryBuilders/QueryBuilder.scala

@@ -334,16 +334,16 @@ trait QueryBuilder extends FieldDefinitions with DefaultJsonProtocol {
             }
 
             val gte = facet.split("\\.").lastOption match {
-              case Some("month") => "now-416y"
-              case _ => "now-2000y"
+              case Some("month") => "1600-01-01"
+              case _ => "0001-01-01"
             }
 
             val dateHistogram = JsObject(
               "filter" -> JsObject(
                 "range" -> JsObject(
                   esField -> JsObject(
                     "gte" -> gte.toJson,
-                    "lte" -> "now".toJson
+                    "lte" -> "now/d".toJson
                   )
                 )
               ),

src/test/scala/dpla/api/v2/search/queryBuilders/QueryBuilderTest.scala

@@ -635,15 +635,15 @@ class QueryBuilderTest extends AnyWordSpec with Matchers
     }
 
     "specify default filter gte" in {
-      val expected = Some("now-2000y")
+      val expected = Some("0001-01-01")
       val traversed = readString(dateFacetQuery, "aggs",
         "sourceResource.date.begin", "filter", "range",
         "sourceResource.date.begin", "gte")
       assert(traversed == expected)
     }
 
     "specify year gte" in {
-      val expected = Some("now-2000y")
+      val expected = Some("0001-01-01")
       val params = minSearchParams
         .copy(facets = Some(Seq("sourceResource.date.end.year")))
       val query = getJsSearchQuery(params)
@@ -654,7 +654,7 @@ class QueryBuilderTest extends AnyWordSpec with Matchers
     }
 
     "specify month gte" in {
-      val expected = Some("now-416y")
+      val expected = Some("1600-01-01")
       val params = minSearchParams
         .copy(facets = Some(Seq("sourceResource.date.end.month")))
       val query = getJsSearchQuery(params)
@@ -665,7 +665,7 @@ class QueryBuilderTest extends AnyWordSpec with Matchers
     }
 
     "specify filter lte" in {
-      val expected = Some("now")
+      val expected = Some("now/d")
       val traversed = readString(dateFacetQuery, "aggs",
         "sourceResource.date.begin", "filter", "range",
         "sourceResource.date.begin", "lte")
@@ -786,4 +786,4 @@ class QueryBuilderTest extends AnyWordSpec with Matchers
       assert(traversed == expected)
     }
   }
-}
+}