Migrate the fulltext search to tapir

integration/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala

@@ -34,7 +34,6 @@ import org.knora.webapi.messages.util.rdf.JsonLDUtil
 import org.knora.webapi.messages.util.search.SparqlQueryConstants
 import org.knora.webapi.routing.UnsafeZioRun
 import org.knora.webapi.routing.v2.ResourcesRouteV2
-import org.knora.webapi.routing.v2.SearchRouteV2
 import org.knora.webapi.routing.v2.StandoffRouteV2
 import org.knora.webapi.routing.v2.ValuesRouteV2
 import org.knora.webapi.sharedtestdata.SharedTestDataADM
@@ -54,13 +53,9 @@ import pekko.http.scaladsl.model.headers.BasicHttpCredentials
  */
 class SearchRouteV2R2RSpec extends R2RSpec {
   private implicit val stringFormatter: StringFormatter = StringFormatter.getGeneralInstance
-  private val searchPathNew = UnsafeZioRun
+  private val searchPath = UnsafeZioRun
     .runOrThrow(ZIO.serviceWith[SearchApiRoutes](_.routes))
     .reduce(_ ~ _)
-  private val searchPathOld = DSPApiDirectives.handleErrors(appConfig)(
-    SearchRouteV2(routeData.appConfig.v2.fulltextSearch.searchValueMinLength).makeRoute
-  )
-  private val searchPath = searchPathNew ~ searchPathOld
 
   private val resourcePath =
     DSPApiDirectives.handleErrors(appConfig)(ResourcesRouteV2(appConfig).makeRoute)

webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala

@@ -251,6 +251,10 @@ final case class SearchResponderV2Live(
     limitToStandoffClass: Option[SmartIri]
   ): Task[ResourceCountV2] =
     for {
+      _                    <- ensureIsFulltextSearch(searchValue)
+      searchValue          <- validateSearchString(searchValue)
+      limitToResourceClass <- ZIO.foreach(limitToResourceClass)(ensureResourceClassIri)
+      limitToStandoffClass <- ZIO.foreach(limitToStandoffClass)(ensureStandoffClass)
       countSparql <- ZIO.attempt(
                        sparql.v2.txt
                          .searchFulltext(
@@ -300,6 +304,10 @@ final case class SearchResponderV2Live(
   ): Task[ReadResourcesSequenceV2] = {
     import org.knora.webapi.messages.util.search.FullTextMainQueryGenerator.FullTextSearchConstants
     for {
+      _                    <- ensureIsFulltextSearch(searchValue)
+      searchValue          <- validateSearchString(searchValue)
+      limitToResourceClass <- ZIO.foreach(limitToResourceClass)(ensureResourceClassIri)
+      limitToStandoffClass <- ZIO.foreach(limitToStandoffClass)(ensureStandoffClass)
       searchSparql <-
         ZIO.attempt(
           sparql.v2.txt
@@ -856,7 +864,7 @@ final case class SearchResponderV2Live(
   ): Task[ResourceCountV2] =
     for {
       searchValue          <- validateSearchString(searchValue)
-      _                    <- ensureIsNotFullTextSearch(searchValue)
+      _                    <- ensureIsFulltextSearch(searchValue)
       limitToResourceClass <- ZIO.foreach(limitToResourceClass)(ensureResourceClassIri)
       searchTerm            = MatchStringWhileTyping(searchValue).generateLiteralForLuceneIndexWithoutExactSequence
       countSparql =
@@ -882,7 +890,14 @@ final case class SearchResponderV2Live(
     } else { ZIO.fail(BadRequestException(errMsg)) }
   }
 
-  private def ensureIsNotFullTextSearch(searchStr: String) =
+  private def ensureStandoffClass(standoffClassIri: SmartIri): Task[SmartIri] = {
+    val errMsg = s"Invalid standoff class IRI: $standoffClassIri"
+    if (standoffClassIri.isApiV2ComplexSchema) {
+      iriConverter.asInternalSmartIri(standoffClassIri).orElseFail(BadRequestException(errMsg))
+    } else { ZIO.fail(BadRequestException(errMsg)) }
+  }
+
+  private def ensureIsFulltextSearch(searchStr: String) =
     ZIO
       .fail(BadRequestException("It looks like you are submitting a Gravsearch request to a full-text search route"))
       .when(searchStr.contains(OntologyConstants.KnoraApi.ApiOntologyHostname))
@@ -911,7 +926,7 @@ final case class SearchResponderV2Live(
     val searchOffset = offset * appConfig.v2.resourcesSequence.resultsPerPage
     for {
       searchValue          <- validateSearchString(searchValue)
-      _                    <- ensureIsNotFullTextSearch(searchValue)
+      _                    <- ensureIsFulltextSearch(searchValue)
       limitToResourceClass <- ZIO.foreach(limitToResourceClass)(ensureResourceClassIri)
       searchTerm            = MatchStringWhileTyping(searchValue).generateLiteralForLuceneIndexWithoutExactSequence
       searchResourceByLabelSparql = SearchQueries.constructSearchByLabel(

webapi/src/main/scala/org/knora/webapi/routing/ApiRoutes.scala

@@ -109,7 +109,6 @@ private final case class ApiRoutesImpl(
                 PermissionsRouteADM(routeData, runtime).makeRoute ~
                 RejectingRoute(appConfig, runtime).makeRoute ~
                 ResourcesRouteV2(appConfig).makeRoute ~
-                SearchRouteV2(appConfig.v2.fulltextSearch.searchValueMinLength).makeRoute ~
                 StandoffRouteV2().makeRoute ~
                 StoreRouteADM(routeData, runtime).makeRoute ~
                 UsersRouteADM().makeRoute ~

webapi/src/main/scala/org/knora/webapi/slice/admin/domain/model/KnoraProject.scala

@@ -7,15 +7,13 @@ package org.knora.webapi.slice.admin.domain.model
 
 import sttp.tapir.Codec
 import sttp.tapir.CodecFormat
-import sttp.tapir.DecodeResult
 import sttp.tapir.Schema
 import zio.NonEmptyChunk
 import zio.json.*
 import zio.prelude.Validation
 
 import scala.util.matching.Regex
 
-import dsp.errors.BadRequestException
 import dsp.errors.ValidationException
 import dsp.valueobjects.Iri
 import dsp.valueobjects.Iri.isProjectIri
@@ -47,11 +45,8 @@ object KnoraProject {
     implicit val codec: JsonCodec[ProjectIri] =
       JsonCodec[String].transformOrFail(ProjectIri.from(_).toEitherWith(e => e.head.getMessage), _.value)
 
-    implicit val tapirCodec: Codec[String, ProjectIri, CodecFormat.TextPlain] = Codec.string.mapDecode(str =>
-      ProjectIri
-        .from(str)
-        .fold(f => DecodeResult.Error(f.head.getMessage, BadRequestException(f.head.getMessage)), DecodeResult.Value(_))
-    )(_.value)
+    implicit val tapirCodec: Codec[String, ProjectIri, CodecFormat.TextPlain] =
+      Codec.string.mapEither(str => ProjectIri.from(str).toEitherWith(e => e.head.getMessage))(_.value)
 
     def unsafeFrom(str: String): ProjectIri = from(str).fold(e => throw e.head, identity)