diff --git a/build.sbt b/build.sbt index ac3c498..fa608db 100644 --- a/build.sbt +++ b/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" diff --git a/project/build.properties b/project/build.properties index d91c272..b485f62 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.6 +sbt.version=1.10.0 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index b4d3aa5..7aef9a2 100644 --- a/project/plugins.sbt +++ b/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") \ No newline at end of file +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") \ No newline at end of file diff --git a/src/main/scala/dpla/api/v2/search/queryBuilders/QueryBuilder.scala b/src/main/scala/dpla/api/v2/search/queryBuilders/QueryBuilder.scala index 4e40e40..fdb47f8 100644 --- a/src/main/scala/dpla/api/v2/search/queryBuilders/QueryBuilder.scala +++ b/src/main/scala/dpla/api/v2/search/queryBuilders/QueryBuilder.scala @@ -334,8 +334,8 @@ 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( @@ -343,7 +343,7 @@ trait QueryBuilder extends FieldDefinitions with DefaultJsonProtocol { "range" -> JsObject( esField -> JsObject( "gte" -> gte.toJson, - "lte" -> "now".toJson + "lte" -> "now/d".toJson ) ) ), diff --git a/src/test/scala/dpla/api/v2/search/queryBuilders/QueryBuilderTest.scala b/src/test/scala/dpla/api/v2/search/queryBuilders/QueryBuilderTest.scala index b8b29de..b0e2a94 100644 --- a/src/test/scala/dpla/api/v2/search/queryBuilders/QueryBuilderTest.scala +++ b/src/test/scala/dpla/api/v2/search/queryBuilders/QueryBuilderTest.scala @@ -635,7 +635,7 @@ 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") @@ -643,7 +643,7 @@ class QueryBuilderTest extends AnyWordSpec with Matchers } "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) } } -} +} \ No newline at end of file