[TRELLO-2737] Fix search by subcategories (#1827)

betagouv · Jan 8, 2025 · 21187e6 · 21187e6
1 parent 286bfff
commit 21187e6
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/app/repositories/report/ReportRepository.scala b/app/repositories/report/ReportRepository.scala
@@ -604,15 +604,6 @@ object ReportRepository {
     }
   }
 
-  // Utilisé pour caster un type mal généré par slick : @>
-  // Cette fonction attend le même type à gauche et à droite
-  // mais slick génère varchar[] @> text[]
-  private val castVarCharArrayToTextArray = SimpleExpression.unary[List[String], List[String]] { (s, qb) =>
-    qb.sqlBuilder += "CAST( ": Unit
-    qb.expr(s)
-    qb.sqlBuilder += " AS TEXT[])": Unit
-  }
-
   def queryFilter(
       table: Query[ReportTable, Report, Seq],
       filter: ReportFilter,
@@ -697,9 +688,6 @@ object ReportRepository {
           table.category === category
         }
       }
-      .filterIf(filter.subcategories.nonEmpty) { table =>
-        castVarCharArrayToTextArray(table.subcategories) @> filter.subcategories.toList.bind
-      }
       .filterIf(filter.status.nonEmpty)(table => table.status.inSetBind(filter.status.map(_.entryName)))
       .filterIf(filter.withTags.nonEmpty) { table =>
         table.tags @& filter.withTags.toList.bind
@@ -813,6 +801,10 @@ object ReportRepository {
         val bookmarkExists = bookmark.isDefined
         if (isBookmarked) bookmarkExists else !bookmarkExists
       }
+      .filterIf(filter.subcategories.nonEmpty) { case (_, _, _, subcategoryLabelTable) =>
+        subcategoryLabelTable.flatMap(_.subcategoryLabelsFr) @> filter.subcategories.toList.bind ||
+        subcategoryLabelTable.flatMap(_.subcategoryLabelsEn) @> filter.subcategories.toList.bind
+      }
   }
 
 }