Scalafmt

SwissDataScienceCenter · Feb 27, 2024 · 90c7d52 · 90c7d52
1 parent 44b66c1
commit 90c7d52
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 23 deletions.
diff --git a/modules/commons/src/main/scala/io/renku/search/model/EntityType.scala b/modules/commons/src/main/scala/io/renku/search/model/EntityType.scala
@@ -36,6 +36,5 @@ object EntityType:
   def unsafeFromString(str: String): EntityType =
     fromString(str).fold(sys.error, identity)
 
-
   given Encoder[EntityType] = Encoder.forString.contramap(_.name)
   given Decoder[EntityType] = Decoder.forString.mapEither(fromString)
diff --git a/modules/search-query/src/main/scala/io/renku/search/query/DateTimeRef.scala b/modules/search-query/src/main/scala/io/renku/search/query/DateTimeRef.scala
@@ -39,7 +39,8 @@ enum DateTimeRef:
     */
   def resolve(ref: Instant, zoneId: ZoneId): (Instant, Option[Instant]) = this match
     case Relative(RelativeDate.Today) => (ref, None)
-    case Relative(RelativeDate.Yesterday) => (ref.atZone(zoneId).minusDays(1).toInstant, None)
+    case Relative(RelativeDate.Yesterday) =>
+      (ref.atZone(zoneId).minusDays(1).toInstant, None)
     case Literal(pdate) =>
       val min = pdate.instantMin(zoneId)
       val max = pdate.instantMax(zoneId)
@@ -52,12 +53,10 @@ enum DateTimeRef:
         case rd: RelativeDate =>
           Relative(rd).resolve(ref, zoneId)._1.atZone(zoneId)
 
-      if (cdate.range) (ts.minus(cdate.amount).toInstant, Some(ts.plus(cdate.amount).toInstant))
+      if (cdate.range)
+        (ts.minus(cdate.amount).toInstant, Some(ts.plus(cdate.amount).toInstant))
       else (ts.plus(cdate.amount).toInstant, None)
 
-
-
-
 object DateTimeRef:
   given Encoder[DateTimeRef] = Encoder.forString.contramap(_.asString)
   given Decoder[DateTimeRef] = Decoder.forString.mapEither { str =>

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/EntityType.scala b/modules/search-query/src/main/scala/io/renku/search/query/EntityType.scala
@@ -0,0 +1 @@
+
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
@@ -23,7 +23,8 @@ import io.renku.search.model.EntityType
 import io.renku.search.model.projects.Visibility
 
 enum FieldTerm(val field: Field, val cmp: Comparison):
-  case TypeIs(values: NonEmptyList[EntityType]) extends FieldTerm(Field.Type, Comparison.Is)
+  case TypeIs(values: NonEmptyList[EntityType])
+      extends FieldTerm(Field.Type, Comparison.Is)
   case ProjectIdIs(values: NonEmptyList[String])
       extends FieldTerm(Field.ProjectId, Comparison.Is)
   case NameIs(values: NonEmptyList[String]) extends FieldTerm(Field.Name, Comparison.Is)
@@ -37,7 +38,7 @@ enum FieldTerm(val field: Field, val cmp: Comparison):
 
   private[query] def asString =
     val value = this match
-      case TypeIs(values)      =>
+      case TypeIs(values) =>
         val ts = values.toList.distinct.map(_.name)
         ts.mkString(",")
       case ProjectIdIs(values) => FieldTerm.nelToString(values)

diff --git a/modules/search-query/src/main/scala/io/renku/search/query/Order.scala b/modules/search-query/src/main/scala/io/renku/search/query/Order.scala
@@ -31,7 +31,10 @@ object Order:
   def apply(field: OrderedBy, fields: OrderedBy*): Order =
     Order(NonEmptyList(field, fields.toList))
 
-  def apply(field: (SortableField, Direction), fields: (SortableField, Direction)*): Order =
+  def apply(
+      field: (SortableField, Direction),
+      fields: (SortableField, Direction)*
+  ): Order =
     Order(NonEmptyList(field, fields.toList).map(OrderedBy.apply.tupled))
 
   enum Direction:

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
@@ -29,14 +29,14 @@ import io.renku.search.query.parse.{QueryParser, QueryUtil}
 import cats.kernel.Monoid
 
 final case class Query(
-  segments: List[Query.Segment]
+    segments: List[Query.Segment]
 ):
   def render: String =
     segments
       .map {
         case Query.Segment.Field(v) => v.asString
         case Query.Segment.Text(v)  => v
-        case Query.Segment.Sort(v) => v.render
+        case Query.Segment.Sort(v)  => v.render
       }
       .mkString(" ")
 

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
@@ -146,7 +146,6 @@ private[query] object QueryJsonCodec:
         val values = readNel[Order.OrderedBy](r)
         Segment.Sort(Order(values))
 
-
   val decoder: Decoder[List[Segment]] =
     new Decoder[List[Segment]] {
       def read(r: Reader) = {

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
@@ -166,11 +166,10 @@ object QueryGenerators:
     }
 
   val sortTerm: Gen[Order] =
-    Gen.choose(1,5).flatMap { len =>
+    Gen.choose(1, 5).flatMap { len =>
       nelOfN(len, orderedBy).map(Order.apply)
     }
 
-
   val segment: Gen[Query.Segment] =
     Gen.oneOf(
       fieldTerm.map(Query.Segment.Field.apply),

diff --git a/modules/search-solr-client/src/main/scala/io/renku/search/solr/query/SolrQuery.scala b/modules/search-solr-client/src/main/scala/io/renku/search/solr/query/SolrQuery.scala
@@ -24,13 +24,12 @@ import io.renku.search.query.Order
 import io.renku.solr.client.SolrSort
 
 final case class SolrQuery(
-  query: SolrToken,
-  sort: SolrSort
+    query: SolrToken,
+    sort: SolrSort
 ):
   def ++(next: SolrQuery): SolrQuery =
     SolrQuery(query && next.query, sort ++ next.sort)
 
-
 object SolrQuery:
   val empty: SolrQuery = SolrQuery(SolrToken.empty, SolrSort.empty)
 

diff --git a/modules/search-solr-client/src/main/scala/io/renku/search/solr/query/SolrToken.scala b/modules/search-solr-client/src/main/scala/io/renku/search/solr/query/SolrToken.scala
@@ -73,7 +73,7 @@ object SolrToken:
   def dateLt(field: Field, date: Instant): SolrToken =
     fieldOp(field, Comparison.LowerThan, date.toString)
 
-  //TODO: currently only projects work, user can't be decoded
+  // TODO: currently only projects work, user can't be decoded
   val allTypes: SolrToken = fieldIs(Field.Type, "Project")
 
   private def fieldOp(field: Field, op: Comparison, value: SolrToken): SolrToken =
@@ -85,12 +85,14 @@ object SolrToken:
     fieldOp(field, Comparison.Is, value)
 
   private def monoidWith(sep: String): Monoid[SolrToken] =
-    Monoid.instance(empty, (a, b) => if (a.isEmpty) b else if (b.isEmpty) a else s"$a$sep$b")
+    Monoid.instance(
+      empty,
+      (a, b) => if (a.isEmpty) b else if (b.isEmpty) a else s"$a$sep$b"
+    )
   private val orMonoid: Monoid[SolrToken] = monoidWith(" OR ")
   private val andMonoid: Monoid[SolrToken] = monoidWith(" AND ")
   private val spaceMonoid: Monoid[SolrToken] = monoidWith(" ")
 
-
   extension (self: SolrToken)
     def value: String = self
     def isEmpty: Boolean = self.isEmpty
@@ -103,8 +105,7 @@ object SolrToken:
     def <(next: SolrToken): SolrToken = self ~ Comparison.LowerThan.token ~ next
     def >(next: SolrToken): SolrToken = self ~ Comparison.GreaterThan.token ~ next
 
-  extension (self: Comparison)
-    def token: SolrToken = fromComparison(self)
+  extension (self: Comparison) def token: SolrToken = fromComparison(self)
 
   extension (self: Seq[SolrToken])
     def foldM(using Monoid[SolrToken]): SolrToken =

diff --git a/modules/solr-client/src/main/scala/io/renku/solr/client/SolrSort.scala b/modules/solr-client/src/main/scala/io/renku/solr/client/SolrSort.scala
@@ -32,7 +32,9 @@ object SolrSort:
 
   object Direction:
     def fromString(s: String): Either[String, Direction] =
-      Direction.values.find(_.toString.equalsIgnoreCase(s)).toRight(s"Invalid sort direction: $s")
+      Direction.values
+        .find(_.toString.equalsIgnoreCase(s))
+        .toRight(s"Invalid sort direction: $s")
     def unsafeFromString(s: String): Direction =
       fromString(s).fold(sys.error, identity)