fix test

alchemy-fr · Sep 27, 2023 · 6051426 · 6051426
1 parent d2244cf
commit 6051426
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/databox/api/src/Elasticsearch/AbstractSearch.php b/databox/api/src/Elasticsearch/AbstractSearch.php
@@ -28,13 +28,6 @@ protected function createACLBoolQuery(?string $userId, array $groupIds): ?Query\
 
         $publicWorkspaceIds = $this->getPublicWorkspaceIds();
         if (null !== $userId) {
-            $allowedWorkspaceIds = $this->getAllowedWorkspaceIds($userId, $groupIds);
-
-            $aclBoolQuery->addMust(new Query\Terms(
-                'workspaceId',
-                array_values(array_unique(array_merge($allowedWorkspaceIds, $publicWorkspaceIds)))
-            ));
-
             if (!empty($publicWorkspaceIds)) {
                 $publicWorkspaceBoolQuery = new Query\BoolQuery();
                 $publicWorkspaceBoolQuery->addMust(new Query\Range('privacy', [
@@ -44,6 +37,7 @@ protected function createACLBoolQuery(?string $userId, array $groupIds): ?Query\
                 $shoulds[] = $publicWorkspaceBoolQuery;
             }
 
+            $allowedWorkspaceIds = $this->getAllowedWorkspaceIds($userId, $groupIds);
             if (!empty($allowedWorkspaceIds)) {
                 $workspaceBoolQuery = new Query\BoolQuery();
 
@@ -61,8 +55,6 @@ protected function createACLBoolQuery(?string $userId, array $groupIds): ?Query\
                 $shoulds[] = new Query\Terms('groups', $groupIds);
             }
         } else {
-            $aclBoolQuery->addMust(new Query\Terms('workspaceId', $publicWorkspaceIds));
-
             if (!empty($publicWorkspaceIds)) {
                 $publicWorkspaceBoolQuery = new Query\BoolQuery();
                 $publicWorkspaceBoolQuery->addMust(new Query\Range('privacy', [