diff --git a/modules/db/src/main/scala/Db.scala b/modules/db/src/main/scala/Db.scala index e908a23..1b6fd88 100644 --- a/modules/db/src/main/scala/Db.scala +++ b/modules/db/src/main/scala/Db.scala @@ -213,20 +213,22 @@ private object Sql: case (None, None) => none private def filterFragment(filter: PlayerFilter): Option[AppliedFragment] = - List.concat( - filter.name.map(nameLikeFragment), - between("standard", filter.standard), - between("rapid", filter.rapid), - between("blitz", filter.blitz), - filter.isActive.map(filterActive), - filter.federationId.map(federationIdFragment), - filter.titles.map(xs => playersByTitles(xs.size)(xs, xs)), - filter.otherTitles.map(xs => playersByOtherTitles(xs.size)(xs)), - filter.gender.map(filterGender), - between("birth_year", filter.birthYearMin, filter.birthYearMax) - ).match - case Nil => none - case xs => xs.intercalate(and).some + List + .concat( + filter.name.map(nameLikeFragment), + between("standard", filter.standard), + between("rapid", filter.rapid), + between("blitz", filter.blitz), + filter.isActive.map(filterActive), + filter.federationId.map(federationIdFragment), + filter.titles.map(xs => playersByTitles(xs.size)(xs, xs)), + filter.otherTitles.map(xs => playersByOtherTitles(xs.size)(xs)), + filter.gender.map(filterGender), + between("birth_year", filter.birthYearMin, filter.birthYearMax) + ) + .match + case Nil => none + case xs => xs.intercalate(and).some private lazy val filterActive: Fragment[Boolean] = sql"p.active = $bool"