Solution 4: Join once

Author: webhdx

eZ/Publish/API/Repository/Tests/Values/User/Limitation/ObjectStateLimitationTest.php

@@ -12,6 +12,7 @@
 use eZ\Publish\API\Repository\Values\Content\ContentInfo;
 use eZ\Publish\API\Repository\Values\Content\Query;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
+use eZ\Publish\API\Repository\Values\Filter\Filter;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectState;
 use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup;
 use eZ\Publish\API\Repository\Values\User\Limitation\ObjectStateLimitation;
@@ -198,6 +199,60 @@ public function testObjectStateLimitationSearch(): void
         self::assertEquals($searchResultsBefore->totalCount - 1, $searchResultsAfter->totalCount);
     }
 
+    /**
+     * Checks if the Filtering API results are correctly filtered when using ObjectStateLimitation
+     * with limitation values from two different StateGroups.
+     *
+     * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
+     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
+     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     */
+    public function testObjectStateLimitationFilter(): void
+    {
+        $repository = $this->getRepository();
+        $permissionResolver = $repository->getPermissionResolver();
+
+        $objectStateGroup = $this->createObjectStateGroup();
+        $objectState = $this->createObjectState($objectStateGroup);
+
+        $user = $this->createUserWithObjectStateLimitationOnContentRead(
+            [
+                self::OBJECT_STATE_NOT_LOCKED_STATE_ID,
+                $objectState->id,
+            ]
+        );
+        $adminUser = $permissionResolver->getCurrentUserReference();
+
+        $wikiPage = $this->createWikiPage();
+
+        $this->loginAsUser($user);
+
+        $query = new Filter();
+        $query->withLimit(50);
+        $query->withCriterion(new Criterion\MatchAll());
+
+        $searchResultsBefore = $repository->getContentService()->find($query);
+
+        $this->loginAsUser($adminUser);
+
+        //change the Object State to the one that doesn't match the Limitation
+        $stateService = $repository->getObjectStateService();
+        $stateService->setContentState(
+            $wikiPage->contentInfo,
+            $stateService->loadObjectStateGroup(2),
+            $stateService->loadObjectState(2)
+        );
+
+        $this->loginAsUser($user);
+
+        $searchResultsAfter = $repository->getContentService()->find($query);
+
+        self::assertEquals(
+            $searchResultsBefore->getTotalCount() - 1,
+            $searchResultsAfter->getTotalCount()
+        );
+    }
+
     /**
      * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException

eZ/Publish/Core/Limitation/ObjectStateLimitationType.php

@@ -213,12 +213,53 @@ public function getCriterion(APILimitationValue $value, APIUserReference $curren
             throw new RuntimeException('$value->limitationValues is empty');
         }
 
-        if (!isset($value->limitationValues[1])) {
+        if (count($value->limitationValues) === 1) {
             // 1 limitation value: EQ operation
             return new Criterion\ObjectStateId($value->limitationValues[0]);
         }
 
         return new Criterion\ObjectStateId($value->limitationValues);
+
+        $groupedLimitationValues = $this->groupLimitationValues($value->limitationValues);
+
+        if (count($groupedLimitationValues) === 1) {
+            // one group, several limitation values: IN operation
+            return new Criterion\ObjectStateId($groupedLimitationValues[0]);
+        }
+
+        // limitations from different groups require logical AND between them
+        $criterions = [];
+        foreach ($groupedLimitationValues as $limitationGroup) {
+            $criterions[] = new Criterion\ObjectStateId($limitationGroup);
+        }
+
+        return new Criterion\LogicalAnd($criterions);
+    }
+
+    /**
+     * Groups limitation values by the State Group.
+     *
+     * @param string[] $limitationValues
+     *
+     * @return int[][]
+     */
+    private function groupLimitationValues(array $limitationValues)
+    {
+        $objectStateHandler = $this->persistence->objectStateHandler();
+        $stateGroups = $objectStateHandler->loadAllGroups();
+        $groupedLimitationValues = [];
+        foreach ($stateGroups as $stateGroup) {
+            $states = $objectStateHandler->loadObjectStates($stateGroup->id);
+            $stateIds = array_map(static function ($state) {
+                return $state->id;
+            }, $states);
+            $limitationValuesGroup = array_intersect($stateIds, $limitationValues);
+            if (!empty($limitationValuesGroup)) {
+                $groupedLimitationValues[] = array_values($limitationValuesGroup);
+            }
+        }
+
+        return $groupedLimitationValues;
     }
 
     /**

eZ/Publish/Core/Persistence/Legacy/Filter/CriterionQueryBuilder/Content/ObjectStateIdQueryBuilder.php

@@ -25,35 +25,33 @@ public function accepts(FilteringCriterion $criterion): bool
         return $criterion instanceof ObjectStateId;
     }
 
-
-    /**
-     * @param \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId $criterion
-     */
     public function buildQueryConstraint(
         FilteringQueryBuilder $queryBuilder,
         FilteringCriterion $criterion
     ): ?string {
         $value = (array)$criterion->value;
+        $tableAlias = uniqid('osl_');
 
+        /** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId $criterion */
         $queryBuilder
-            ->joinOnce(
+            ->leftJoinOnce(
                 'content',
                 Gateway::OBJECT_STATE_LINK_TABLE,
-                'osl',
+                $tableAlias,
                 (string) $queryBuilder->expr()->and(
-                    $queryBuilder->expr()->eq('content.id', 'osl.contentobject_id'),
+                    $queryBuilder->expr()->eq(
+                        'content.id',
+                        $tableAlias . '.contentobject_id'
+                    ),
                     $queryBuilder->expr()->in(
-                        'osl.contentobject_state_id',
+                        $tableAlias . '.contentobject_state_id',
                         $queryBuilder->createNamedParameter($value, Connection::PARAM_INT_ARRAY)
                     )
                 )
             );
 
-
-
-
         return $queryBuilder->expr()->isNotNull(
-            'osl.contentobject_state_id',
+            $tableAlias . '.contentobject_state_id',
         );
     }
 }