support more complex metafield queries (#3228)

src/Repository/ActivityRepository.php

@@ -10,6 +10,7 @@
 namespace App\Repository;
 
 use App\Entity\Activity;
+use App\Entity\ActivityMeta;
 use App\Entity\Project;
 use App\Entity\Team;
 use App\Entity\Timesheet;
@@ -33,6 +34,8 @@ use Pagerfanta\Pagerfanta;
  */
 class ActivityRepository extends EntityRepository
 {
+    use RepositorySearchTrait;
+
     /**
      * @param mixed $id
      * @param null $lockMode
@@ -394,40 +397,29 @@ class ActivityRepository extends EntityRepository
 
         $this->addPermissionCriteria($qb, $query->getCurrentUser(), $query->getTeams(), $query->isGlobalsOnly());
 
-        if ($query->hasSearchTerm()) {
-            $searchAnd = $qb->expr()->andX();
-            $searchTerm = $query->getSearchTerm();
-
-            foreach ($searchTerm->getSearchFields() as $metaName => $metaValue) {
-                $qb->leftJoin('a.meta', 'meta');
-                $searchAnd->add(
-                    $qb->expr()->andX(
-                        $qb->expr()->eq('meta.name', ':metaName'),
-                        $qb->expr()->like('meta.value', ':metaValue')
-                    )
-                );
-                $qb->setParameter('metaName', $metaName);
-                $qb->setParameter('metaValue', '%' . $metaValue . '%');
-            }
-
-            if ($searchTerm->hasSearchTerm()) {
-                $searchAnd->add(
-                    $qb->expr()->orX(
-                        $qb->expr()->like('a.name', ':searchTerm'),
-                        $qb->expr()->like('a.comment', ':searchTerm')
-                    )
-                );
-                $qb->setParameter('searchTerm', '%' . $searchTerm->getSearchTerm() . '%');
-            }
-
-            if ($searchAnd->count() > 0) {
-                $qb->andWhere($searchAnd);
-            }
-        }
+        $this->addSearchTerm($qb, $query);
 
         return $qb;
     }
 
+    private function getMetaFieldClass(): string
+    {
+        return ActivityMeta::class;
+    }
+
+    private function getMetaFieldName(): string
+    {
+        return 'activity';
+    }
+
+    /**
+     * @return array<string>
+     */
+    private function getSearchableFields(): array
+    {
+        return ['a.name', 'a.comment'];
+    }
+
     public function countActivitiesForQuery(ActivityQuery $query): int
     {
         $qb = $this->getQueryBuilderForQuery($query);