Adopt code for new visibility type

SwissDataScienceCenter · Feb 14, 2024 · 7d3a408 · 7d3a408
1 parent 8e33685
commit 7d3a408
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 46 deletions.
diff --git a/modules/commons/src/main/scala/io/renku/commons/Visibility.scala b/modules/commons/src/main/scala/io/renku/commons/Visibility.scala
diff --git a/modules/commons/src/main/scala/io/renku/search/model/projects.scala b/modules/commons/src/main/scala/io/renku/search/model/projects.scala
@@ -18,6 +18,7 @@
 
 package io.renku.search.model
 
+import cats.kernel.Order
 import io.bullet.borer.derivation.MapBasedCodecs.*
 import io.bullet.borer.{Codec, Decoder, Encoder}
 import io.renku.search.borer.codecs.all.given
@@ -70,9 +71,13 @@ object projects:
     given Codec[CreationDate] = Codec.of[Instant]
 
   enum Visibility derives Codec:
-    lazy val name: String = productPrefix
+    lazy val name: String = productPrefix.toLowerCase
     case Public, Private
 
   object Visibility:
-    def fromCaseInsensitive(v: String): Visibility =
+    given Order[Visibility] = Order.by(_.ordinal)
+    given Decoder[Visibility] = Decoder.forString.map(Visibility.unsafeFromString)
+    given Encoder[Visibility] = Encoder.forString.contramap(_.name)
+
+    def unsafeFromString(v: String): Visibility =
       valueOf(v.toLowerCase.capitalize)
diff --git a/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala b/modules/search-provision/src/main/scala/io/renku/search/provision/SearchProvisioner.scala
@@ -112,7 +112,7 @@ private class SearchProvisionerImpl[F[_]: Async](
         projects.Name(pc.name),
         projects.Slug(pc.slug),
         pc.repositories.map(projects.Repository(_)),
-        projects.Visibility.fromCaseInsensitive(pc.visibility.name()),
+        projects.Visibility.unsafeFromString(pc.visibility.name()),
         pc.description.map(projects.Description(_)),
         toUser(pc.createdBy),
         projects.CreationDate(pc.creationDate),

diff --git a/...les/search-provision/src/test/scala/io/renku/search/provision/SearchProvisionerSpec.scala b/...les/search-provision/src/test/scala/io/renku/search/provision/SearchProvisionerSpec.scala
@@ -124,7 +124,7 @@ class SearchProvisionerSpec extends CatsEffectSuite with RedisSpec with SearchSo
       projects.Name(created.name),
       projects.Slug(created.slug),
       created.repositories.map(projects.Repository(_)),
-      projects.Visibility.fromCaseInsensitive(created.visibility.name()),
+      projects.Visibility.unsafeFromString(created.visibility.name()),
       created.description.map(projects.Description(_)),
       toUser(created.createdBy),
       projects.CreationDate(created.creationDate),

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
@@ -19,7 +19,7 @@
 package io.renku.search.query
 
 import cats.data.NonEmptyList
-import io.renku.commons.Visibility
+import io.renku.search.model.projects.Visibility
 
 enum FieldTerm(val field: Field, val cmp: Comparison):
   case ProjectIdIs(values: NonEmptyList[String])

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,7 +21,7 @@ package io.renku.search.query
 import cats.data.NonEmptyList
 import cats.syntax.all.*
 import io.bullet.borer.{Decoder, Encoder}
-import io.renku.commons.Visibility
+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

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
@@ -21,7 +21,7 @@ package io.renku.search.query.json
 import cats.data.NonEmptyList
 import io.bullet.borer.compat.cats.*
 import io.bullet.borer.{Decoder, Encoder, Reader, Writer}
-import io.renku.commons.Visibility
+import io.renku.search.model.projects.Visibility
 import io.renku.search.query.*
 import io.renku.search.query.FieldTerm.*
 import io.renku.search.query.Query.Segment
@@ -44,10 +44,6 @@ import scala.collection.mutable.ListBuffer
   * }}}
   */
 private[query] object QueryJsonCodec:
-  // temporary
-  given Decoder[Visibility] = Decoder.forString.map(Visibility.unsafeFromString)
-  given Encoder[Visibility] = Encoder.forString.contramap(_.name)
-
   private[this] val freeTextField = "_text"
 
   enum Name:

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/parse/QueryParser.scala b/modules/search-query/src/main/scala/io/renku/search/query/parse/QueryParser.scala
@@ -20,7 +20,7 @@ package io.renku.search.query.parse
 
 import cats.data.NonEmptyList
 import cats.parse.{Parser as P, Parser0 as P0}
-import io.renku.commons.Visibility
+import io.renku.search.model.projects.Visibility
 import io.renku.search.query.*
 
 private[query] object QueryParser {

diff --git a/modules/search-query/src/test/scala/io/renku/search/query/QueryGenerators.scala b/modules/search-query/src/test/scala/io/renku/search/query/QueryGenerators.scala
@@ -20,7 +20,7 @@ package io.renku.search.query
 
 import cats.data.NonEmptyList
 import cats.syntax.all.*
-import io.renku.commons.Visibility
+import io.renku.search.model.projects.Visibility
 import io.renku.search.query.parse.QueryUtil
 import org.scalacheck.Gen
 import org.scalacheck.cats.implicits.*