chore: prepare 2.39.1 (#1657)

SwissDataScienceCenter · Aug 11, 2023 · 9ca086b · 9ca086b
2 parents ebdf3a6 + eef57ba
commit 9ca086b
Show file tree

Hide file tree

Showing 32 changed files with 531 additions and 217 deletions.
diff --git a/entities-search/src/main/scala/io/renku/entities/search/DatasetsQuery.scala b/entities-search/src/main/scala/io/renku/entities/search/DatasetsQuery.scala
@@ -91,9 +91,12 @@ object DatasetsQuery extends EntityQuery[Entity.Dataset] {
           |      # textQuery
           |      ${textQueryPart(criteria.filters.maybeQuery)}
           |
-          |      Graph schema:Dataset {
+          |      GRAPH schema:Dataset {
           |        #creator
-          |        $sameAsVar schema:creator / schema:name ?creatorName.
+          |        $sameAsVar schema:creator ?creatorId.
+          |        GRAPH ${GraphClass.Persons.id} {
+          |          ?creatorId schema:name ?creatorName
+          |        }
           |
           |        #keywords
           |        $keywords
@@ -105,7 +108,7 @@ object DatasetsQuery extends EntityQuery[Entity.Dataset] {
           |        $images
           |      }
           |
-          |      Graph ?projId {
+          |      GRAPH ?projId {
           |        # project namespaces
           |        ${namespacesPart(criteria.filters.namespaces)}
           |
@@ -121,7 +124,7 @@ object DatasetsQuery extends EntityQuery[Entity.Dataset] {
           |
           |  ${creatorsPart(criteria.filters.creators)}
           |
-          |  Graph schema:Dataset {
+          |  GRAPH schema:Dataset {
           |    # name
           |    $sameAsVar renku:slug $nameVar
           |

diff --git a/entities-search/src/main/scala/io/renku/entities/search/ProjectsQuery.scala b/entities-search/src/main/scala/io/renku/entities/search/ProjectsQuery.scala
@@ -97,7 +97,12 @@ private case object ProjectsQuery extends EntityQuery[model.Entity.Project] {
              |        ${namespacesPart(criteria.filters.namespaces)}
              |      }
              |
-             |      OPTIONAL { $projectIdVar schema:creator/schema:name $someCreatorNameVar }
+             |      OPTIONAL {
+             |        $projectIdVar schema:creator ?creatorId.
+             |        GRAPH ${GraphClass.Persons.id} {
+             |          ?creatorId schema:name $someCreatorNameVar
+             |        }
+             |      }
              |      ${filters.maybeOnCreatorName(someCreatorNameVar)}
              |
              |      OPTIONAL { $projectIdVar schema:description $maybeDescriptionVar }

diff --git a/entities-search/src/main/scala/io/renku/entities/searchgraphs/PersonInfo.scala b/entities-search/src/main/scala/io/renku/entities/searchgraphs/PersonInfo.scala
diff --git a/...ies-search/src/main/scala/io/renku/entities/searchgraphs/datasets/DatasetSearchInfo.scala b/...ies-search/src/main/scala/io/renku/entities/searchgraphs/datasets/DatasetSearchInfo.scala
@@ -21,16 +21,15 @@ package io.renku.entities.searchgraphs.datasets
 import cats.Show
 import cats.data.NonEmptyList
 import cats.syntax.all._
-import io.renku.entities.searchgraphs.PersonInfo
 import io.renku.graph.model.images.Image
-import io.renku.graph.model.{datasets, projects}
+import io.renku.graph.model.{datasets, persons, projects}
 
 private final case class DatasetSearchInfo(topmostSameAs:      datasets.TopmostSameAs,
                                            name:               datasets.Name,
                                            visibility:         projects.Visibility,
                                            createdOrPublished: datasets.CreatedOrPublished,
                                            maybeDateModified:  Option[datasets.DateModified],
-                                           creators:           NonEmptyList[PersonInfo],
+                                           creators:           NonEmptyList[persons.ResourceId],
                                            keywords:           List[datasets.Keyword],
                                            maybeDescription:   Option[datasets.Description],
                                            images:             List[Image],

diff --git a/...s-search/src/main/scala/io/renku/entities/searchgraphs/datasets/SearchInfoExtractor.scala b/...s-search/src/main/scala/io/renku/entities/searchgraphs/datasets/SearchInfoExtractor.scala
@@ -21,7 +21,6 @@ package io.renku.entities.searchgraphs.datasets
 import cats.MonadThrow
 import cats.data.NonEmptyList
 import cats.syntax.all._
-import io.renku.entities.searchgraphs.PersonInfo.toPersonInfo
 import io.renku.graph.model.datasets
 import io.renku.graph.model.entities.{Dataset, Project}
 
@@ -65,7 +64,7 @@ private object SearchInfoExtractor {
     project.visibility,
     createdOrPublished,
     maybeDateModified,
-    ds.provenance.creators.map(toPersonInfo),
+    ds.provenance.creators.map(_.resourceId),
     ds.additionalInfo.keywords,
     ds.additionalInfo.maybeDescription,
     ds.additionalInfo.images,

diff --git a/...ies-search/src/main/scala/io/renku/entities/searchgraphs/datasets/commands/Encoders.scala b/...ies-search/src/main/scala/io/renku/entities/searchgraphs/datasets/commands/Encoders.scala
@@ -19,28 +19,18 @@
 package io.renku.entities.searchgraphs.datasets.commands
 
 import cats.syntax.all._
-import io.renku.entities.searchgraphs.PersonInfo
 import io.renku.entities.searchgraphs.datasets.Link.{ImportedDataset, OriginalDataset}
 import io.renku.entities.searchgraphs.datasets.{DatasetSearchInfo, DatasetSearchInfoOntology, Link, LinkOntology}
 import io.renku.graph.model.Schemas.{rdf, renku}
-import io.renku.graph.model.datasets
-import io.renku.graph.model.entities.Person
 import io.renku.graph.model.images.Image
+import io.renku.graph.model.{datasets, persons}
 import io.renku.jsonld.Property
 import io.renku.jsonld.syntax._
 import io.renku.triplesstore.client.model.{Quad, QuadsEncoder, TripleObject}
 import io.renku.triplesstore.client.syntax._
 
 private object Encoders {
 
-  implicit val personInfoEncoder: QuadsEncoder[PersonInfo] = QuadsEncoder.instance {
-    case PersonInfo(resourceId, name) =>
-      Set(
-        DatasetsQuad(resourceId, rdf / "type", Person.Ontology.typeClass.id),
-        DatasetsQuad(resourceId, Person.Ontology.nameProperty.id, name.asObject)
-      )
-  }
-
   implicit val imageEncoder: QuadsEncoder[Image] = QuadsEncoder.instance { case Image(resourceId, uri, position) =>
     Set(
       DatasetsQuad(resourceId, rdf / "type", Image.Ontology.typeClass.id),
@@ -84,9 +74,8 @@ private object Encoders {
       searchInfoQuad(DatasetSearchInfoOntology.descriptionProperty.id, d.asObject)
     }
 
-    val creatorsQuads = info.creators.toList.toSet.flatMap { (pi: PersonInfo) =>
-      pi.asQuads +
-        searchInfoQuad(DatasetSearchInfoOntology.creatorProperty, pi.resourceId.asEntityId)
+    val creatorsQuads = info.creators.toList.toSet.map { (resourceId: persons.ResourceId) =>
+      searchInfoQuad(DatasetSearchInfoOntology.creatorProperty, resourceId.asEntityId)
     }
 
     val keywordsQuads = info.keywords.toSet.map { (k: datasets.Keyword) =>
@@ -107,6 +96,7 @@ private object Encoders {
       searchInfoQuad(rdf / "type", DatasetSearchInfoOntology.typeDef.clazz.id).some,
       searchInfoQuad(DatasetSearchInfoOntology.slugProperty.id, info.name.asObject).some,
       searchInfoQuad(DatasetSearchInfoOntology.visibilityProperty.id, info.visibility.asObject).some,
+      searchInfoQuad(DatasetSearchInfoOntology.visibilityProperty.id, info.visibility.asObject).some,
       createdOrPublishedQuad.some,
       maybeDateModifiedQuad,
       maybeDescriptionQuad

diff --git a/...h/src/main/scala/io/renku/entities/searchgraphs/datasets/commands/SearchInfoFetcher.scala b/...h/src/main/scala/io/renku/entities/searchgraphs/datasets/commands/SearchInfoFetcher.scala
@@ -21,7 +21,6 @@ package io.renku.entities.searchgraphs.datasets.commands
 import cats.data.NonEmptyList
 import cats.effect.Async
 import io.renku.entities.searchgraphs
-import io.renku.entities.searchgraphs.PersonInfo
 import io.renku.entities.searchgraphs.datasets.{DatasetSearchInfo, Link, links}
 import io.renku.graph.model.datasets.TopmostSameAs
 import io.renku.graph.model.{GraphClass, projects}
@@ -78,16 +77,12 @@ private class SearchInfoFetcherImpl[F[_]: Async: Logger: SparqlQueryTimeRecorder
              |  } {
              |    GRAPH ${GraphClass.Datasets.id} {
              |      ?topSameAs renku:slug ?name;
-             |                 renku:projectVisibility ?visibility.
+             |                 renku:projectVisibility ?visibility;
+             |                 schema:creator ?creator.
              |      OPTIONAL { ?topSameAs schema:description ?maybeDescription }
              |      OPTIONAL { ?topSameAs schema:dateCreated ?maybeDateCreated }
              |      OPTIONAL { ?topSameAs schema:datePublished ?maybeDatePublished }
              |      OPTIONAL { ?topSameAs schema:dateModified ?maybeDateModified }
-             |      {
-             |        ?topSameAs schema:creator ?creatorId.
-             |        ?creatorId schema:name ?creatorName.
-             |        BIND (CONCAT(STR(?creatorId), STR(';;'), STR(?creatorName)) AS ?creator)
-             |      }
              |      OPTIONAL { ?topSameAs schema:keywords ?keyword }
              |      OPTIONAL {
              |        ?topSameAs schema:image ?imageId.
@@ -138,18 +133,15 @@ private class SearchInfoFetcherImpl[F[_]: Async: Logger: SparqlQueryTimeRecorder
         _.map(decode[datasets.Keyword](map = toKeyword, sort = _.sorted))
           .getOrElse(List.empty.asRight[DecodingFailure])
 
-      val toCreator: String => Decoder.Result[PersonInfo] = {
-        case s"$id;;$name" =>
-          (persons.ResourceId.from(id) -> persons.Name.from(name))
-            .mapN(PersonInfo(_, _))
-            .leftMap(ex => DecodingFailure(DecodingFailure.Reason.CustomReason(ex.getMessage), cur))
-        case other =>
-          DecodingFailure(DecodingFailure.Reason.CustomReason(s"'$other' not a valid creator record"), cur)
-            .asLeft[PersonInfo]
-      }
+      val toCreatorId: String => Decoder.Result[persons.ResourceId] =
+        persons.ResourceId
+          .from(_)
+          .leftMap(ex => DecodingFailure(DecodingFailure.Reason.CustomReason(ex.getMessage), cur))
 
-      def toListOfCreators(implicit topmostSameAs: TopmostSameAs): String => Decoder.Result[NonEmptyList[PersonInfo]] =
-        decode[PersonInfo](map = toCreator, sort = _.sortBy(_.name))(_)
+      def toListOfCreators(implicit
+          topmostSameAs: TopmostSameAs
+      ): String => Decoder.Result[NonEmptyList[persons.ResourceId]] =
+        decode[persons.ResourceId](map = toCreatorId, sort = _.sorted)(_)
           .flatMap(toNonEmptyList(s"No creators found for $topmostSameAs"))
 
       val toImage: String => Decoder.Result[images.Image] = {

diff --git a/entities-search/src/main/scala/io/renku/entities/searchgraphs/datasets/ontology.scala b/entities-search/src/main/scala/io/renku/entities/searchgraphs/datasets/ontology.scala
@@ -40,7 +40,7 @@ object DatasetSearchInfoOntology {
   lazy val typeDef: Type = Type.Def(
     Class(renku / "DiscoverableDataset"),
     ObjectProperties(
-      ObjectProperty(creatorProperty, PersonInfoOntology.typeDef),
+      ObjectProperty(creatorProperty, Person.Ontology.typeDef),
       ObjectProperty(imageProperty, Image.Ontology.typeDef),
       ObjectProperty(linkProperty, LinkOntology.typeDef)
     ),

diff --git a/...ies-search/src/main/scala/io/renku/entities/searchgraphs/projects/ProjectSearchInfo.scala b/...ies-search/src/main/scala/io/renku/entities/searchgraphs/projects/ProjectSearchInfo.scala
@@ -20,17 +20,16 @@ package io.renku.entities.searchgraphs.projects
 
 import cats.Show
 import cats.syntax.all._
-import io.renku.entities.searchgraphs.PersonInfo
 import io.renku.graph.model.images.Image
-import io.renku.graph.model.projects
+import io.renku.graph.model.{persons, projects}
 
 private final case class ProjectSearchInfo(id:               projects.ResourceId,
                                            name:             projects.Name,
                                            slug:             projects.Slug,
                                            visibility:       projects.Visibility,
                                            dateCreated:      projects.DateCreated,
                                            dateModified:     projects.DateModified,
-                                           maybeCreator:     Option[PersonInfo],
+                                           maybeCreator:     Option[persons.ResourceId],
                                            keywords:         List[projects.Keyword],
                                            maybeDescription: Option[projects.Description],
                                            images:           List[Image]

diff --git a/...s-search/src/main/scala/io/renku/entities/searchgraphs/projects/SearchInfoExtractor.scala b/...s-search/src/main/scala/io/renku/entities/searchgraphs/projects/SearchInfoExtractor.scala
@@ -18,7 +18,6 @@
 
 package io.renku.entities.searchgraphs.projects
 
-import io.renku.entities.searchgraphs.PersonInfo.toPersonInfo
 import io.renku.graph.model.entities.Project
 
 private object SearchInfoExtractor {
@@ -31,7 +30,7 @@ private object SearchInfoExtractor {
       project.visibility,
       project.dateCreated,
       project.dateModified,
-      project.maybeCreator.map(toPersonInfo),
+      project.maybeCreator.map(_.resourceId),
       project.keywords.toList,
       project.maybeDescription,
       project.images

diff --git a/...ies-search/src/main/scala/io/renku/entities/searchgraphs/projects/commands/Encoders.scala b/...ies-search/src/main/scala/io/renku/entities/searchgraphs/projects/commands/Encoders.scala
@@ -20,26 +20,16 @@ package io.renku.entities.searchgraphs.projects
 package commands
 
 import cats.syntax.all._
-import io.renku.entities.searchgraphs.PersonInfo
 import io.renku.graph.model.Schemas.rdf
-import io.renku.graph.model.entities.Person
 import io.renku.graph.model.images.Image
-import io.renku.graph.model.projects
+import io.renku.graph.model.{persons, projects}
 import io.renku.jsonld.Property
 import io.renku.jsonld.syntax._
 import io.renku.triplesstore.client.model.{Quad, QuadsEncoder, TripleObject}
 import io.renku.triplesstore.client.syntax._
 
 private object Encoders {
 
-  implicit val personInfoEncoder: QuadsEncoder[PersonInfo] = QuadsEncoder.instance {
-    case PersonInfo(resourceId, name) =>
-      Set(
-        ProjectsQuad(resourceId, rdf / "type", Person.Ontology.typeClass.id),
-        ProjectsQuad(resourceId, Person.Ontology.nameProperty.id, name.asObject)
-      )
-  }
-
   implicit val imageEncoder: QuadsEncoder[Image] = QuadsEncoder.instance { case Image(resourceId, uri, position) =>
     Set(
       ProjectsQuad(resourceId, rdf / "type", Image.Ontology.typeClass.id),
@@ -56,8 +46,8 @@ private object Encoders {
       searchInfoQuad(ProjectSearchInfoOntology.descriptionProperty.id, d.asObject)
     }
 
-    val creatorQuads = info.maybeCreator.toSet.flatMap { (c: PersonInfo) =>
-      c.asQuads + searchInfoQuad(ProjectSearchInfoOntology.creatorProperty, c.resourceId.asEntityId)
+    val creatorQuads = info.maybeCreator.toSet.map { (resourceId: persons.ResourceId) =>
+      searchInfoQuad(ProjectSearchInfoOntology.creatorProperty, resourceId.asEntityId)
     }
 
     val keywordsQuads = info.keywords.toSet.map { (k: projects.Keyword) =>

diff --git a/entities-search/src/main/scala/io/renku/entities/searchgraphs/projects/ontology.scala b/entities-search/src/main/scala/io/renku/entities/searchgraphs/projects/ontology.scala
@@ -40,7 +40,7 @@ object ProjectSearchInfoOntology {
   lazy val typeDef: Type = Type.Def(
     Class(renku / "DiscoverableProject"),
     ObjectProperties(
-      ObjectProperty(creatorProperty, PersonInfoOntology.typeDef),
+      ObjectProperty(creatorProperty, Person.Ontology.typeDef),
       ObjectProperty(imageProperty, Image.Ontology.typeDef)
     ),
     DataProperties(
@@ -56,17 +56,6 @@ object ProjectSearchInfoOntology {
   )
 }
 
-object PersonInfoOntology {
-
-  val nameProperty: DataProperty.Def = Person.Ontology.nameProperty
-
-  lazy val typeDef: Type = Type.Def(
-    Class(renku / "DiscoverableDatasetPerson"),
-    ObjectProperties(),
-    DataProperties(nameProperty)
-  )
-}
-
 object LinkOntology {
 
   val project: Property = renku / "project"

diff --git a/entities-search/src/test/scala/io/renku/entities/searchgraphs/Generators.scala b/entities-search/src/test/scala/io/renku/entities/searchgraphs/Generators.scala
@@ -18,19 +18,13 @@
 
 package io.renku.entities.searchgraphs
 
-import io.renku.entities.searchgraphs.PersonInfo.toPersonInfo
-import io.renku.graph.model.entities
-import io.renku.graph.model.testentities._
 import io.renku.triplesstore.SparqlQuery
 import io.renku.triplesstore.client.TriplesStoreGenerators.quads
 import io.renku.triplesstore.client.syntax._
 import org.scalacheck.Gen
 
 private object Generators {
 
-  lazy val personInfos: Gen[PersonInfo] =
-    personEntities.map(_.to[entities.Person]).map(toPersonInfo)
-
   val insertUpdateCommands: Gen[UpdateCommand] =
     quads.map(UpdateCommand.Insert)
   val deleteUpdateCommands: Gen[UpdateCommand] =

diff --git a/entities-search/src/test/scala/io/renku/entities/searchgraphs/PersonInfoSpec.scala b/entities-search/src/test/scala/io/renku/entities/searchgraphs/PersonInfoSpec.scala