rewrote matchAlwaysAvailable === true part to also use {terms} query parser

Author: ViniTou

src/lib/Query/Common/CriterionVisitor/LanguageCodeIn.php

@@ -31,35 +31,24 @@ public function canVisit(Criterion $criterion)
     public function visit(Criterion $criterion, ?CriterionVisitor $subVisitor = null): string
     {
         /** @var Criterion\LanguageCode $criterion */
-        if (!$criterion->matchAlwaysAvailable &&
-            ($criterion->operator === null || $criterion->operator === Operator::IN || $criterion->operator === Operator::EQ)
-        ) {
-            $values = is_array($criterion->value) ? $criterion->value : [$criterion->value];
-            // content_language_codes_ms is a string field which uses LowerCaseFilter.
-            // Since {!terms} bypasses analysis, we must manually lowercase the values to match the index.
-            /** @param bool|float|int|string $value */
-            $values = array_map(static function ($value): string {
-                return strtolower((string)$value);
-            }, $values);
-
-            return sprintf(
-                '_query_:"{!terms f=content_language_codes_ms}%s"',
-                implode(',', $values)
-            );
-        }
-
-        $languageCodeExpressions = array_map(
-            static function ($value) {
-                return 'content_language_codes_ms:"' . $value . '"';
-            },
-            is_array($criterion->value) ? $criterion->value : [$criterion->value]
+        $values = is_array($criterion->value) ? $criterion->value : [$criterion->value];
+        // content_language_codes_ms is a string field which uses LowerCaseFilter.
+        // Since {!terms} bypasses analysis, we must manually lowercase the values to match the index.
+        /** @param bool|float|int|string $value */
+        $values = array_map(static function ($value): string {
+            return strtolower((string)$value);
+        }, $values);
+
+        $termsQuery = sprintf(
+            '_query_:"{!terms f=content_language_codes_ms}%s"',
+            implode(',', $values)
         );
 
         if ($criterion->matchAlwaysAvailable) {
-            $languageCodeExpressions[] = 'content_always_available_b:true';
+            return '(' . $termsQuery . ' OR content_always_available_b:true)';
         }
 
-        return '(' . implode(' OR ', $languageCodeExpressions) . ')';
+        return $termsQuery;
     }
 }
 

tests/lib/Search/Query/Common/CriterionVisitor/LanguageCodeInTest.php

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\Solr\Search\Query\Common\CriterionVisitor;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LanguageCode;
+use Ibexa\Contracts\Solr\Query\CriterionVisitor;
+use Ibexa\Solr\Query\Common\CriterionVisitor\LanguageCodeIn;
+use Ibexa\Tests\Solr\Search\Query\BaseCriterionVisitorTestCase;
+
+class LanguageCodeInTest extends BaseCriterionVisitorTestCase
+{
+    protected function getVisitor(): CriterionVisitor
+    {
+        return new LanguageCodeIn();
+    }
+
+    protected function getSupportedCriterion(): LanguageCode
+    {
+        return new LanguageCode('eng-GB');
+    }
+
+    public function provideDataForTestVisit(): iterable
+    {
+        yield 'Single language, match always available' => [
+            '(_query_:"{!terms f=content_language_codes_ms}eng-gb" OR content_always_available_b:true)',
+            new LanguageCode('eng-GB', true),
+        ];
+
+        yield 'Multiple languages, match always available' => [
+            '(_query_:"{!terms f=content_language_codes_ms}eng-gb,pol-pl" OR content_always_available_b:true)',
+            new LanguageCode(['eng-GB', 'pol-PL'], true),
+        ];
+
+        yield 'Multiple languages, do NOT match always available (optimization)' => [
+            '_query_:"{!terms f=content_language_codes_ms}eng-gb,pol-pl"',
+            new LanguageCode(['eng-GB', 'pol-PL'], false),
+        ];
+
+        yield 'Single language, do NOT match always available (optimization)' => [
+            '_query_:"{!terms f=content_language_codes_ms}eng-gb"',
+            new LanguageCode('eng-GB', false),
+        ];
+    }
+}