Merge tag v2.2.9 into develop

roadiz · Mar 7, 2024 · 46b54c1 · 46b54c1
1 parent 8194ee7
commit 46b54c1
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/Api/Extension/AttributeValueQueryExtension.php b/src/Api/Extension/AttributeValueQueryExtension.php
@@ -55,26 +55,29 @@ private function apply(
             return;
         }
 
-        $parts = $queryBuilder->getDQLPart('join');
         $rootAlias = $queryBuilder->getRootAliases()[0];
-        if (!\is_array($parts) || !isset($parts[$rootAlias])) {
-            return;
-        }
 
+        /**
+         * AttributeValue is always linked to a Node.
+         * We need to join Node to filter by its status.
+         */
         $existingNodeJoin = QueryBuilderHelper::getExistingJoin($queryBuilder, 'o', 'node');
         if (null === $existingNodeJoin || !$existingNodeJoin->getAlias()) {
-            return;
+            $queryBuilder->leftJoin($rootAlias . '.node', 'node');
+            $joinAlias = 'node';
+        } else {
+            $joinAlias = $existingNodeJoin->getAlias();
         }
 
         if ($this->previewResolver->isPreview()) {
             $queryBuilder
-                ->andWhere($queryBuilder->expr()->lte($existingNodeJoin->getAlias() . '.status', ':status'))
+                ->andWhere($queryBuilder->expr()->lte($joinAlias . '.status', ':status'))
                 ->setParameter(':status', Node::PUBLISHED);
             return;
         }
 
         $queryBuilder
-            ->andWhere($queryBuilder->expr()->eq($existingNodeJoin->getAlias() . '.status', ':status'))
+            ->andWhere($queryBuilder->expr()->eq($joinAlias . '.status', ':status'))
             ->setParameter(':status', Node::PUBLISHED);
         return;
     }