Refactor to a more idomatic skunk fragments (#122)

lenguyenthanh · May 31, 2024 · de19d5e · de19d5e
2 parents 8da77f9 + aa85747
commit de19d5e
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/modules/db/src/main/scala/Db.scala b/modules/db/src/main/scala/Db.scala
@@ -176,8 +176,7 @@ private object Sql:
       sortingFragment(sorting) |+| pagingFragment(page)
 
   def playersByName(name: String, sorting: Sorting, page: Pagination, filter: PlayerFilter): AppliedFragment =
-    val whereQuery =
-      where |+| filterFragment(filter).fold(nameLikeFragment(name))(nameLikeFragment(name) |+| and |+| _)
+    val whereQuery = where |+| nameLikeFragment(name) |+| filterFragment(filter).fold(void)(and |+| _)
     allPlayersFragment(Void) |+| whereQuery |+| sortingFragment(sorting) |+| pagingFragment(page)
 
   def playersByIds(n: Int): Fragment[List[Int]] =
@@ -210,19 +209,15 @@ private object Sql:
       case (None, None) => none
 
   private def filterFragment(filter: PlayerFilter): Option[AppliedFragment] =
-    val bw: Option[AppliedFragment] = List(
+    List(
       between("standard", filter.standard),
       between("rapid", filter.rapid),
-      between("blitz", filter.blitz)
-    ).flatten.foldLeft(none)((a, b) => a.fold(b)(_ |+| and |+| b).some)
-
-    val f = filter.isActive.fold(bw): x =>
-      val a = filterActive(x)
-      bw.fold(a)(_ |+| and |+| a).some
-
-    filter.federationId.fold(f): x =>
-      val a = federationIdFragment(x)
-      f.fold(a)(_ |+| and |+| a).some
+      between("blitz", filter.blitz),
+      filter.isActive.map(filterActive),
+      filter.federationId.map(federationIdFragment)
+    ).flatten.match
+      case Nil => none
+      case xs  => xs.intercalate(and).some
 
   private lazy val filterActive: Fragment[Boolean] =
     sql"p.active = $bool"