[TASK] Make adjustments according to the comments

Author: daniellienert

Classes/Flowpack/ElasticSearch/ContentRepositoryAdaptor/Eel/ElasticSearchQueryBuilder.php

@@ -512,7 +512,7 @@ public function log($message = NULL) {
 	 * @return integer
 	 */
 	public function getTotalItems() {
-		return $this->result['totalItemCount'];
+		return $this->result['total'];
 	}
 
 	/**
@@ -554,27 +554,19 @@ public function fetch() {
 		$response = $this->elasticSearchClient->getIndex()->request('GET', '/_search', array(), json_encode($this->request));
 		$timeAfterwards = microtime(TRUE);
 
-		$treatedContent = $response->getTreatedContent();
+		$this->result =& $response->getTreatedContent();
 
-		$hits = array();
 		$this->result['nodes'] = array();
-		if(array_key_exists('hits', $treatedContent) && is_array($treatedContent['hits']) && count($treatedContent['hits']) > 0) {
-			$hits = $treatedContent['hits'];
-			$this->result['nodes'] = $this->convertHitsToNodes($treatedContent['hits']);
+		if (array_key_exists('hits', $this->result) && is_array($this->result['hits']) && count($this->result['hits']) > 0) {
+			$this->result['nodes'] = $this->convertHitsToNodes($this->result['hits']);
 		}
 
 		if ($this->logThisQuery === TRUE) {
 			$this->logger->log(sprintf('Query Log (%s): %s -- execution time: %s ms -- Limit: %s -- Number of results returned: %s -- Total Results: %s',
-				$this->logMessage, json_encode($this->request), (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($hits['hits']), $hits['total'])
+				$this->logMessage, json_encode($this->request), (($timeAfterwards - $timeBefore) * 1000), $this->limit, count($this->result['hits']['hits']), $this->result['hits']['total'])
 				, LOG_DEBUG);
 		}
 
-		$this->result['totalItemCount'] = $hits['total'];
-
-		if(array_key_exists('aggregations', $treatedContent)) {
-			$this->result['aggregations'] = $treatedContent['aggregations'];
-		}
-
 		return $this->result;
 	}
 
@@ -704,10 +696,10 @@ public function allowsCallOfMethod($methodName) {
 	}
 
 	/**
-	 * @param $hits
-	 * @return array
+	 * @param array $hits
+	 * @return array Array of Node objects
 	 */
-	protected function convertHitsToNodes($hits) {
+	protected function convertHitsToNodes(array $hits) {
 		$nodes = array();
 		$elasticSearchHitPerNode = array();
 

Tests/Functional/Eel/ElasticSearchQueryTest.php

@@ -102,13 +102,15 @@ public function filterNodeByProperty()
      */
     public function filterLimitQuery()
     {
+        $resultCount = $this->queryBuilder->query($this->context->getRootNode())->limit(1)->count();
+        $this->assertEquals(6, $resultCount, 'Asserting the count query returns the total count.');
+
         $result = $this->queryBuilder->query($this->context->getRootNode())->limit(1)->execute();
         $this->assertCount(1, $result, 'Asserting the executed query returns a valid number of items.');
-
-        $resultCount = $this->queryBuilder->query($this->context->getRootNode())->limit(1)->count();
-        $this->assertEquals(1, $resultCount, 'Asserting the count query returns a valid count.');
+        $this->assertEquals(1, $result->getAccessibleCount(), 'Asserting that getAccessibleCount returns the correct number');
     }
-    
+
+
     protected function createNodesForNodeSearchTest() {
         $rootNode = $this->context->getRootNode();