Merge branch 'main' into update/patches

dasch-swiss · Nov 3, 2023 · 690f574 · 690f574
2 parents 7579a45 + d81a88e
commit 690f574
Show file tree

Hide file tree

Showing 13 changed files with 396 additions and 475 deletions.
diff --git a/integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala b/integration/src/test/scala/org/knora/webapi/ITTestDataFactory.scala
@@ -44,8 +44,8 @@ object ITTestDataFactory {
       .make(name)
       .getOrElse(throw new IllegalArgumentException(s"Invalid Name $name."))
 
-  def projectDescription(description: Seq[V2.StringLiteralV2]): ProjectDescription =
-    ProjectDescription
+  def projectDescription(description: Seq[V2.StringLiteralV2]): Description =
+    Description
       .make(description)
       .getOrElse(throw new IllegalArgumentException(s"Invalid ProjectDescription $description."))
 

diff --git a/...i/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala b/...i/messages/util/search/gravsearch/prequery/GravsearchToCountPrequeryTransformerSpec.scala
@@ -7,8 +7,6 @@ package org.knora.webapi.messages.util.search.gravsearch.prequery
 
 import zio._
 
-import scala.collection.mutable.ArrayBuffer
-
 import dsp.errors.AssertionException
 import org.knora.webapi.CoreSpec
 import org.knora.webapi.core.MessageRelay
@@ -102,7 +100,7 @@ class GravsearchToCountPrequeryTransformerSpec extends CoreSpec {
       groupBy = Nil,
       orderBy = Nil,
       whereClause = WhereClause(
-        patterns = ArrayBuffer(
+        patterns = Vector(
           StatementPattern(
             subj = QueryVariable(variableName = "thing"),
             pred = IriRef(
@@ -201,7 +199,7 @@ class GravsearchToCountPrequeryTransformerSpec extends CoreSpec {
   val transformedQueryWithDecimalOptionalSortCriterionAndFilterComplex: SelectQuery =
     SelectQuery(
       fromClause = None,
-      variables = Vector(
+      variables = List(
         Count(
           outputVariableName = "count",
           distinct = true,
@@ -237,14 +235,6 @@ class GravsearchToCountPrequeryTransformerSpec extends CoreSpec {
           ),
           OptionalPattern(
             patterns = Vector(
-              StatementPattern(
-                subj = QueryVariable(variableName = "decimal"),
-                pred = IriRef(
-                  iri = "http://www.knora.org/ontology/knora-base#valueHasDecimal".toSmartIri,
-                  propertyPathOperator = None
-                ),
-                obj = QueryVariable(variableName = "decimalVal")
-              ),
               StatementPattern(
                 subj = QueryVariable(variableName = "thing"),
                 pred = IriRef(
@@ -264,6 +254,14 @@ class GravsearchToCountPrequeryTransformerSpec extends CoreSpec {
                   datatype = "http://www.w3.org/2001/XMLSchema#boolean".toSmartIri
                 )
               ),
+              StatementPattern(
+                subj = QueryVariable(variableName = "decimal"),
+                pred = IriRef(
+                  iri = "http://www.knora.org/ontology/knora-base#valueHasDecimal".toSmartIri,
+                  propertyPathOperator = None
+                ),
+                obj = QueryVariable(variableName = "decimalVal")
+              ),
               FilterPattern(expression =
                 CompareExpression(
                   leftArg = QueryVariable(variableName = "decimalVal"),