From b14c845811d99dcc636aa818391f31e43b74fc3f Mon Sep 17 00:00:00 2001
From: Mathieu Darse <mdarse@jolicode.com>
Date: Tue, 26 May 2015 17:03:46 +0200
Subject: [PATCH] Remove remaining calls to getFieldsStructure()

---
 .../Elastic/ElasticSearchEngine.php           | 46 +++----------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
index bfc72e07a3..1487697889 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
@@ -369,51 +369,19 @@ class ElasticSearchEngine implements SearchEngineInterface
 
     private function getAggregationQueryParams(SearchEngineOptions $options)
     {
-        // get business field access rights for current user
-        $allowed_databoxes = [];
-        $acl = $this->app['acl']->get($this->app['authentication']->getUser());
-        foreach ($options->getDataboxes() as $databox) {
-            $id = $databox->get_sbas_id();
-            if ($acl->can_see_business_fields($databox)) {
-                $allowed_databoxes[] = $id;
-            }
-        }
-
         $aggs = [];
 
-        // We always a collection facet right now
+        // We always want a collection facet right now
         $collection_facet_agg = array();
         $collection_facet_agg['terms']['field'] = 'collection_name';
         $aggs['Collection'] = $collection_facet_agg;
 
-        foreach ($this->recordHelper->getFieldsStructure() as $field_name => $params) {
-            // skip if field is not searchable or not aggregated
-            if (!$params['searchable'] || !$params['to_aggregate']) {
-                continue;
-            }
-
-            if ($params['private']) {
-                // restrict access to authorized databoxes
-                $databoxes = array_intersect($params['databox_ids'], $allowed_databoxes);
-                $prefix = 'private_caption';
-            } else {
-                $databoxes = $params['databox_ids'];
-                $prefix = 'caption';
-            }
-
-            // filter aggregation to allowed databoxes
-            // declare aggregation on current field
-            $agg = array();
-            // TODO (mdarse) Remove databox filtering. It's already done by the
-            // ACL filter in the query scope, so no document that shouldn't be
-            // displayed can go this far.
-            // // array_values is needed to ensure array serialization
-            // $agg['filter']['terms']['databox_id'] = array_values($databoxes);
-            // $agg['aggs']['distinct_occurrence']['terms']['field'] =
-            $agg['terms']['field'] =
-                sprintf('%s.%s.raw', $prefix, $field_name);
-
-            $aggs[$field_name] = $agg;
+        foreach ($this->structure->getFacetFields() as $name => $field) {
+            $prefix = $field->isPrivate() ? 'private_caption' : 'caption';
+            // 2015-05-26 (mdarse) Removed databox filtering.
+            // It was already done by the ACL filter in the query scope, so no
+            // document that shouldn't be displayed can go this far.
+            $aggs[$name]['terms']['field'] = sprintf('%s.%s.raw', $prefix, $name);
         }
 
         return $aggs;