imp: Change quick search so it searches for tickets with any label

All the filters of the quick search form are acting as "OR" (selecting
several statuses or priorities lists tickets that have status1 OR
status2 / priority1 OR priority2). However, the labels behaved
differently (label1 AND label2). This different behaviour was quite
disturbing for new users.

Now, the behaviour of labels is coherent with the other fields.

Author: marien-probesys

src/SearchEngine/Ticket/QuickSearchFilter.php

@@ -220,16 +220,12 @@ public function getLabels(): Collections\Collection
         return $this->labels;
     }
 
-    public function addLabel(Entity\Label $label): void
-    {
-        if (!$this->labels->contains($label)) {
-            $this->labels->add($label);
-        }
-    }
-
-    public function removeLabel(Entity\Label $label): void
+    /**
+     * @param Collections\Collection<int, Entity\Label> $values
+     */
+    public function setLabels(Collections\Collection $values): void
     {
-        $this->labels->removeElement($label);
+        $this->labels = $values;
     }
 
     /**
@@ -328,17 +324,9 @@ public function toTextualQuery(): string
             $textualQueryParts[] = "team:{$values}";
         }
 
-        foreach ($this->labels as $label) {
-            $value = $label->getName();
-
-            if (
-                str_contains($value, ' ') &&
-                (!str_starts_with($value, '"') || !str_ends_with($value, '"'))
-            ) {
-                $value = '"' . $value . '"';
-            }
-
-            $textualQueryParts[] = "label:{$value}";
+        if (!$this->labels->isEmpty()) {
+            $values = $this->processLabelValues($this->labels);
+            $textualQueryParts[] = "label:{$values}";
         }
 
         if ($this->priorities) {
@@ -386,4 +374,25 @@ private function processTeamValues(Collections\Collection $teams): string
 
         return implode(',', $teamIds);
     }
+
+    /**
+     * @param Collections\Collection<int, Entity\Label> $labels
+     */
+    private function processLabelValues(Collections\Collection $labels): string
+    {
+        $labelNames = array_map(function (Entity\Label $label): string {
+            $value = $label->getName();
+
+            if (
+                str_contains($value, ' ') &&
+                (!str_starts_with($value, '"') || !str_ends_with($value, '"'))
+            ) {
+                $value = '"' . $value . '"';
+            }
+
+            return $value;
+        }, $labels->toArray());
+
+        return implode(',', $labelNames);
+    }
 }

src/SearchEngine/Ticket/QuickSearchFilterBuilder.php

@@ -57,7 +57,7 @@ public function getFilter(?SearchEngine\Query $query = null): ?QuickSearchFilter
                 $qualifier = $condition->getQualifier();
                 $value = $condition->getValue();
 
-                if ($qualifier !== 'label' && isset($qualifiersAlreadySet[$qualifier])) {
+                if (isset($qualifiersAlreadySet[$qualifier])) {
                     return null;
                 }
 
@@ -90,13 +90,8 @@ public function getFilter(?SearchEngine\Query $query = null): ?QuickSearchFilter
                     $teams = $this->processTeams($values);
                     $quickSearchFilter->setTeams($teams);
                 } elseif ($qualifier === 'label') {
-                    foreach ($values as $value) {
-                        $labels = $this->labelRepository->findByName($value);
-
-                        foreach ($labels as $label) {
-                            $quickSearchFilter->addLabel($label);
-                        }
-                    }
+                    $labels = $this->processLabels($values);
+                    $quickSearchFilter->setLabels($labels);
                 } elseif ($qualifier === 'type' && count($values) === 1) {
                     $quickSearchFilter->setType($values[0]);
                 } elseif ($qualifier === 'no' && $values[0] === 'assignee') {
@@ -162,4 +157,27 @@ private function processTeams(array $values): Collections\ArrayCollection
 
         return new Collections\ArrayCollection($teams);
     }
+
+    /**
+     * @param string[] $values
+     *
+     * @return Collections\ArrayCollection<int, Entity\Label>
+     */
+    private function processLabels(array $values): Collections\ArrayCollection
+    {
+        /** @var Collections\ArrayCollection<int, Entity\Label> */
+        $labels = new Collections\ArrayCollection();
+
+        foreach ($values as $value) {
+            $matchingLabels = $this->labelRepository->findByName($value);
+
+            foreach ($matchingLabels as $label) {
+                if (!$labels->contains($label)) {
+                    $labels->add($label);
+                }
+            }
+        }
+
+        return $labels;
+    }
 }

tests/Controller/Tickets/QuickSearchesControllerTest.php

@@ -108,7 +108,7 @@ public function testPostNewWithLabels(): void
             ],
         ]);
 
-        $expectedQuery = urlencode('label:bar label:foo');
+        $expectedQuery = urlencode('label:bar,foo');
         $this->assertResponseRedirects("/tickets?q={$expectedQuery}", 302);
     }
 

tests/SearchEngine/Ticket/QuickSearchFilterBuilderTest.php

@@ -180,7 +180,7 @@ public function testGetFilterWithPriorityConditionReturnsFilter(): void
         $this->assertSame(['high'], $ticketQuickSearchFilter->getPriorities());
     }
 
-    public function testGetFilterWithLabelConditionsReturnsFilter(): void
+    public function testGetFilterWithLabelConditionReturnsFilter(): void
     {
         $fooLabel = Factory\LabelFactory::createOne([
             'name' => 'foo',
@@ -191,7 +191,7 @@ public function testGetFilterWithLabelConditionsReturnsFilter(): void
         $bazLabel = Factory\LabelFactory::createOne([
             'name' => 'BAZ',
         ]);
-        $query = SearchEngine\Query::fromString('label:foo label:baz');
+        $query = SearchEngine\Query::fromString('label:foo,baz');
 
         $ticketQuickSearchFilter = $this->ticketQuickSearchFilterBuilder->getFilter($query);
 
@@ -368,12 +368,12 @@ public function testToTextualQueryWithLabel(): void
         Factory\LabelFactory::createOne([
             'name' => 'Bar Baz',
         ]);
-        $query = SearchEngine\Query::fromString('label:foo label:"bar baz"');
+        $query = SearchEngine\Query::fromString('label:foo,"bar baz"');
         $ticketQuickSearchFilter = $this->ticketQuickSearchFilterBuilder->getFilter($query);
 
         $textualQuery = $ticketQuickSearchFilter->toTextualQuery();
 
-        $this->assertSame('label:foo label:"Bar Baz"', $textualQuery);
+        $this->assertSame('label:foo,"Bar Baz"', $textualQuery);
     }
 
     public function testSetText(): void