feat: Add support to load knora-ontologies in the docker-compose stack (

#3002)

Co-authored-by: Marcin Procyk <[email protected]>

docker-compose.yml

@@ -93,6 +93,8 @@ services:
       - "3339:3339"
     volumes:
       - /tmp:/tmp
+      - ./knora-ontologies:/opt/knora-ontologies
+      - ./test_data:/opt/test_data
     networks:
       - knora-net
     environment:

integration/src/test/scala/org/knora/webapi/core/LayersTest.scala

@@ -33,6 +33,7 @@ import org.knora.webapi.slice.admin.api.service.MaintenanceRestService
 import org.knora.webapi.slice.admin.api.service.PermissionsRestService
 import org.knora.webapi.slice.admin.api.service.ProjectADMRestService
 import org.knora.webapi.slice.admin.api.service.ProjectsADMRestServiceLive
+import org.knora.webapi.slice.admin.api.service.StoreRestService
 import org.knora.webapi.slice.admin.api.service.UsersRestService
 import org.knora.webapi.slice.admin.domain.service.*
 import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive
@@ -135,7 +136,7 @@ object LayersTest {
       with StandoffResponderV2
       with StandoffTagUtilV2
       with State
-      with StoresResponderADM
+      with StoreRestService
       with TestClientService
       with TriplestoreService
       with UsersResponderADM
@@ -200,6 +201,8 @@ object LayersTest {
       ProjectsEndpoints.layer,
       ProjectsEndpointsHandler.layer,
       ProjectsResponderADMLive.layer,
+      StoreEndpoints.layer,
+      StoreEndpointsHandler.layer,
       QueryTraverser.layer,
       RepositoryUpdater.layer,
       ResourceInfoLayers.live,
@@ -213,7 +216,7 @@ object LayersTest {
       StandoffResponderV2Live.layer,
       StandoffTagUtilV2Live.layer,
       State.layer,
-      StoresResponderADMLive.layer,
+      StoreRestService.layer,
       TapirToPekkoInterpreter.layer,
       TestClientService.layer,
       TriplestoreServiceLive.layer,

integration/src/test/scala/org/knora/webapi/testservices/TestClientService.scala

@@ -38,7 +38,6 @@ import org.knora.webapi.messages.store.sipimessages.SipiUploadResponse
 import org.knora.webapi.messages.store.sipimessages.SipiUploadResponseJsonProtocol.*
 import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponse
 import org.knora.webapi.messages.store.sipimessages.SipiUploadWithoutProcessingResponseJsonProtocol.*
-import org.knora.webapi.messages.store.triplestoremessages.RdfDataObject
 import org.knora.webapi.messages.store.triplestoremessages.TriplestoreJsonProtocol
 import org.knora.webapi.messages.util.rdf.JsonLDDocument
 import org.knora.webapi.messages.util.rdf.JsonLDUtil
@@ -75,27 +74,6 @@ final case class TestClientService(config: AppConfig, httpClient: CloseableHttpC
 
   case class TestClientTimeoutException(msg: String) extends Exception
 
-  /**
-   * Loads test data.
-   */
-  def loadTestData(rdfDataObjects: Seq[RdfDataObject]): Task[Unit] = {
-
-    val loadRequest = Post(
-      config.knoraApi.internalKnoraApiBaseUrl + "/admin/store/ResetTriplestoreContent",
-      pekko.http.scaladsl.model
-        .HttpEntity(
-          pekko.http.scaladsl.model.ContentTypes.`application/json`,
-          rdfDataObjects.toJson.compactPrint
-        )
-    )
-
-    for {
-      _ <- ZIO.logInfo("Loading test data started ...")
-      _ <- singleAwaitingRequest(loadRequest)
-      _ <- ZIO.logInfo("... loading test data done.")
-    } yield ()
-  }
-
   /**
    * Performs a http request.
    *

webapi/src/main/scala/org/knora/webapi/core/LayersLive.scala

@@ -34,6 +34,7 @@ import org.knora.webapi.slice.admin.api.service.MaintenanceRestService
 import org.knora.webapi.slice.admin.api.service.PermissionsRestService
 import org.knora.webapi.slice.admin.api.service.ProjectADMRestService
 import org.knora.webapi.slice.admin.api.service.ProjectsADMRestServiceLive
+import org.knora.webapi.slice.admin.api.service.StoreRestService
 import org.knora.webapi.slice.admin.api.service.UsersRestService
 import org.knora.webapi.slice.admin.domain.service.*
 import org.knora.webapi.slice.admin.repo.service.KnoraProjectRepoLive
@@ -81,7 +82,7 @@ object LayersLive {
       ProjectExportStorageService & ProjectImportService & ProjectsResponderADM & QueryTraverser & RepositoryUpdater &
       ResourcesResponderV2 & ResourceUtilV2 & ResourceUtilV2 & RestCardinalityService & RestResourceInfoService &
       SearchApiRoutes & SearchResponderV2 & AssetPermissionsResponder & SipiService & StandoffResponderV2 & StandoffTagUtilV2 &
-      State & StoresResponderADM & StringFormatter & TriplestoreService & UsersResponderADM & ValuesResponderV2
+      State & StoreRestService & StringFormatter & TriplestoreService & UsersResponderADM & ValuesResponderV2
 
   /**
    * All effect layers needed to provide the `Environment`
@@ -148,6 +149,8 @@ object LayersLive {
       ProjectsEndpoints.layer,
       ProjectsEndpointsHandler.layer,
       ProjectsResponderADMLive.layer,
+      StoreEndpoints.layer,
+      StoreEndpointsHandler.layer,
       QueryTraverser.layer,
       RepositoryUpdater.layer,
       ResourceInfoLayers.live,
@@ -162,7 +165,7 @@ object LayersLive {
       StandoffResponderV2Live.layer,
       StandoffTagUtilV2Live.layer,
       State.layer,
-      StoresResponderADMLive.layer,
+      StoreRestService.layer,
       StringFormatter.live,
       TapirToPekkoInterpreter.layer,
       TriplestoreServiceLive.layer,

webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessages.scala

@@ -8,6 +8,8 @@ package org.knora.webapi.messages.store.triplestoremessages
 import org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import spray.json.*
 import zio.*
+import zio.json.DeriveJsonCodec
+import zio.json.JsonCodec
 
 import java.time.Instant
 import scala.collection.mutable
@@ -157,6 +159,9 @@ case class RepositoryUpdatedResponse(message: String)
  * @param name of the named graph the data will be load into.
  */
 case class RdfDataObject(path: String, name: String)
+object RdfDataObject {
+  implicit val jsonCodec: JsonCodec[RdfDataObject] = DeriveJsonCodec.gen[RdfDataObject]
+}
 
 /**
  * Represents the subject of a statement read from the triplestore.
@@ -589,5 +594,4 @@ trait TriplestoreJsonProtocol extends SprayJsonSupport with DefaultJsonProtocol
     }
   }
 
-  implicit val rdfDataObjectFormat: RootJsonFormat[RdfDataObject] = jsonFormat2(RdfDataObject)
 }

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

@@ -108,7 +108,6 @@ private final case class ApiRoutesImpl(
                 RejectingRoute(appConfig, runtime).makeRoute ~
                 ResourcesRouteV2(appConfig).makeRoute ~
                 StandoffRouteV2().makeRoute ~
-                StoreRouteADM(routeData, runtime).makeRoute ~
                 UsersRouteADM().makeRoute ~
                 ValuesRouteV2().makeRoute ~
                 VersionRoute().makeRoute