refactored search with free search term support (#1064)

src/Repository/TimesheetRepository.php

@@ -551,6 +551,7 @@ class TimesheetRepository extends EntityRepository
             ->select('t')
             ->from(Timesheet::class, 't')
             ->leftJoin('t.project', 'p')
+            ->addOrderBy('t.' . $query->getOrderBy(), $query->getOrder())
         ;
 
         $user = [];
@@ -636,7 +637,33 @@ class TimesheetRepository extends EntityRepository
 
         $this->addPermissionCriteria($qb, $query->getCurrentUser(), $query->getTeams());
 
-        $qb->orderBy('t.' . $query->getOrderBy(), $query->getOrder());
+        if ($query->hasSearchTerm()) {
+            $searchAnd = $qb->expr()->andX();
+            $searchTerm = $query->getSearchTerm();
+
+            foreach ($searchTerm->getSearchFields() as $metaName => $metaValue) {
+                $qb->leftJoin('t.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()->like('t.description', ':searchTerm')
+                );
+                $qb->setParameter('searchTerm', '%' . $searchTerm->getSearchTerm() . '%');
+            }
+
+            if ($searchAnd->count() > 0) {
+                $qb->andWhere($searchAnd);
+            }
+        }
 
         return $qb;
     }