Merge pull request #64 from SwissDataScienceCenter/role-filter

feat: Add a role filter to user defined query
SwissDataScienceCenter · Mar 19, 2024 · 7f0acfa · 7f0acfa
2 parents f45bc0c + 38f998e
commit 7f0acfa
Show file tree

Hide file tree

Showing 21 changed files with 237 additions and 360 deletions.
diff --git a/build.sbt b/build.sbt
@@ -78,8 +78,7 @@ lazy val commons = project
         Dependencies.catsEffect ++
         Dependencies.ducktape ++
         Dependencies.fs2Core ++
-        Dependencies.scodecBits ++
-        Dependencies.scribe,
+        Dependencies.scodecBits,
     Test / sourceGenerators += Def.task {
       val sourceDir =
         (LocalRootProject / baseDirectory).value / "project"

diff --git a/modules/renku-redis-client/src/main/scala/io/renku/queue/client/MessageHeader.scala b/modules/renku-redis-client/src/main/scala/io/renku/queue/client/MessageHeader.scala
@@ -46,21 +46,25 @@ final case class MessageHeader(
     )
 
 object MessageHeader:
-  def apply(
+  def apply[F[_]: Clock: Functor](
       source: MessageSource,
       payloadSchema: Schema,
       dataContentType: DataContentType,
       schemaVersion: SchemaVersion,
       requestId: RequestId
-  ): MessageHeader =
-    MessageHeader(
-      source,
-      payloadSchema,
-      dataContentType,
-      schemaVersion,
-      CreationTime.now,
-      requestId
-    )
+  ): F[MessageHeader] =
+    CreationTime
+      .now[F]
+      .map(now =>
+        MessageHeader(
+          source,
+          payloadSchema,
+          dataContentType,
+          schemaVersion,
+          now,
+          requestId
+        )
+      )
 
 opaque type MessageSource = String
 object MessageSource:
@@ -76,8 +80,7 @@ object SchemaVersion:
 opaque type CreationTime = Instant
 object CreationTime:
   def apply(v: Instant): CreationTime = v
-  def now: CreationTime = Instant.now().truncatedTo(ChronoUnit.MILLIS)
-  def nowF[F[_]: Clock: Functor]: F[CreationTime] =
+  def now[F[_]: Clock: Functor]: F[CreationTime] =
     Clock[F].realTimeInstant.map(_.truncatedTo(ChronoUnit.MILLIS))
 
   extension (self: CreationTime) def value: Instant = self

diff --git a/modules/renku-redis-client/src/test/scala/io/renku/queue/client/Generators.scala b/modules/renku-redis-client/src/test/scala/io/renku/queue/client/Generators.scala
@@ -20,11 +20,20 @@ package io.renku.queue.client
 
 import org.apache.avro.Schema
 import org.scalacheck.Gen
+import java.time.Instant
 
 object Generators:
 
   val requestIdGen: Gen[RequestId] = Gen.uuid.map(_.toString).map(RequestId(_))
 
+  val creationTimeGen: Gen[CreationTime] =
+    Gen
+      .choose(
+        Instant.parse("2020-01-01T01:00:00Z").toEpochMilli(),
+        Instant.now().toEpochMilli()
+      )
+      .map(millis => CreationTime(Instant.ofEpochMilli(millis)))
+
   def messageHeaderGen(schema: Schema, contentType: DataContentType): Gen[MessageHeader] =
     messageHeaderGen(schema, Gen.const(contentType))
 
@@ -36,10 +45,12 @@ object Generators:
       contentType <- ctGen
       schemaVersion <- Gen.choose(1, 100).map(v => SchemaVersion(s"v$v"))
       requestId <- requestIdGen
+      creationTime <- creationTimeGen
     yield MessageHeader(
       MessageSource("test"),
       schema,
       contentType,
       schemaVersion,
+      creationTime,
       requestId
     )
diff --git a/modules/search-api/src/main/scala/io/renku/search/api/data/QueryInput.scala b/modules/search-api/src/main/scala/io/renku/search/api/data/QueryInput.scala
@@ -19,9 +19,6 @@
 package io.renku.search.api.data
 
 import io.renku.search.query.Query
-import io.bullet.borer.Encoder
-import io.bullet.borer.derivation.MapBasedCodecs.{deriveDecoder, deriveEncoder}
-import io.bullet.borer.Decoder
 import cats.Show
 
 final case class QueryInput(
@@ -30,9 +27,6 @@ final case class QueryInput(
 )
 
 object QueryInput:
-  given Encoder[QueryInput] = deriveEncoder
-  given Decoder[QueryInput] = deriveDecoder
-
   given Show[QueryInput] = Show.show(i => s"(${i.query.render}, ${i.page})")
 
   def pageOne(query: Query): QueryInput =

diff --git a/modules/search-provision/src/main/scala/io/renku/search/provision/handler/PushToRedis.scala b/modules/search-provision/src/main/scala/io/renku/search/provision/handler/PushToRedis.scala
@@ -65,14 +65,11 @@ object PushToRedis:
         )
 
       def createHeader(requestId: RequestId): F[MessageHeader] =
-        CreationTime.nowF.map { now =>
-          MessageHeader(
-            MessageSource(clientId.value),
-            ProjectAuthorizationRemoved.SCHEMA$,
-            DataContentType.Binary,
-            SchemaVersion.V1,
-            now,
-            requestId
-          )
-        }
+        MessageHeader[F](
+          MessageSource(clientId.value),
+          ProjectAuthorizationRemoved.SCHEMA$,
+          DataContentType.Binary,
+          SchemaVersion.V1,
+          requestId
+        )
     }
diff --git a/modules/search-query/src/main/scala/io/renku/search/query/Field.scala b/modules/search-query/src/main/scala/io/renku/search/query/Field.scala
@@ -28,6 +28,7 @@ enum Field:
   case Created
   case CreatedBy
   case Type
+  case Role
 
   val name: String = Strings.lowerFirst(productPrefix)
 

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/FieldTerm.scala b/modules/search-query/src/main/scala/io/renku/search/query/FieldTerm.scala
@@ -21,6 +21,7 @@ package io.renku.search.query
 import cats.data.NonEmptyList
 import io.renku.search.model.EntityType
 import io.renku.search.model.projects.Visibility
+import io.renku.search.model.projects.MemberRole
 
 enum FieldTerm(val field: Field, val cmp: Comparison):
   case TypeIs(values: NonEmptyList[EntityType])
@@ -34,6 +35,8 @@ enum FieldTerm(val field: Field, val cmp: Comparison):
       extends FieldTerm(Field.Created, cmp)
   case CreatedByIs(values: NonEmptyList[String])
       extends FieldTerm(Field.CreatedBy, Comparison.Is)
+  case RoleIs(values: NonEmptyList[MemberRole])
+      extends FieldTerm(Field.Role, Comparison.Is)
 
   private[query] def asString =
     val value = this match
@@ -48,6 +51,7 @@ enum FieldTerm(val field: Field, val cmp: Comparison):
         vis.mkString(",")
       case Created(_, values)  => FieldTerm.nelToString(values.map(_.asString))
       case CreatedByIs(values) => FieldTerm.nelToString(values)
+      case RoleIs(values)      => FieldTerm.nelToString(values.map(_.name))
 
     s"${field.name}${cmp.asString}${value}"
 

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/Query.scala b/modules/search-query/src/main/scala/io/renku/search/query/Query.scala
@@ -21,12 +21,10 @@ package io.renku.search.query
 import cats.data.NonEmptyList
 import cats.kernel.Monoid
 import cats.syntax.all.*
-import io.bullet.borer.{Decoder, Encoder}
 import io.renku.search.model.EntityType
 import io.renku.search.model.projects.Visibility
 import io.renku.search.query.FieldTerm.Created
 import io.renku.search.query.Query.Segment
-import io.renku.search.query.json.QueryJsonCodec
 import io.renku.search.query.parse.{QueryParser, QueryUtil}
 
 final case class Query(
@@ -44,9 +42,6 @@ final case class Query(
   def isEmpty: Boolean = segments.isEmpty
 
 object Query:
-  given Encoder[Query] = QueryJsonCodec.encoder.contramap(_.segments)
-  given Decoder[Query] = QueryJsonCodec.decoder.map(Query.apply)
-
   def parse(str: String): Either[String, Query] =
     val trimmed = str.trim
     if (trimmed.isEmpty) Right(empty)

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/json/QueryJsonCodec.scala b/modules/search-query/src/main/scala/io/renku/search/query/json/QueryJsonCodec.scala