fix: Fix searching tickets by contract if using subquery

Probesys · Mar 14, 2024 · b30603e · b30603e
1 parent 93a2bb5
commit b30603e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/SearchEngine/QueryBuilder/TicketQueryBuilder.php b/src/SearchEngine/QueryBuilder/TicketQueryBuilder.php
@@ -412,10 +412,24 @@ private function registerParameter(mixed $value): string
     private function mustIncludeContracts(array $queries): bool
     {
         foreach ($queries as $query) {
-            foreach ($query->getConditions() as $condition) {
-                if ($condition->isQualifierCondition() && $condition->getQualifier() === 'contract') {
-                    return true;
-                }
+            if ($this->includesQualifier($query, 'contract')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function includesQualifier(Query $query, string $qualifier): bool
+    {
+        foreach ($query->getConditions() as $condition) {
+            if ($condition->isQualifierCondition() && $condition->getQualifier() === $qualifier) {
+                return true;
+            } elseif (
+                $condition->isQueryCondition() &&
+                $this->includesQualifier($condition->getQuery(), $qualifier)
+            ) {
+                return true;
             }
         }
 

diff --git a/tests/SearchEngine/QueryBuilder/TicketQueryBuilderTest.php b/tests/SearchEngine/QueryBuilder/TicketQueryBuilderTest.php
@@ -52,7 +52,7 @@ public function testCreate(): void
 
     public function testCreateWithContract(): void
     {
-        $query = SearchEngine\Query::fromString('contract:#1');
+        $query = SearchEngine\Query::fromString('(contract:#1)');
 
         $queryBuilder = $this->ticketQueryBuilder->create([$query]);