normalize elastic class management

linebreaker · Nov 7, 2016 · 7c17ff9 · 7c17ff9
1 parent 020f59b
commit 7c17ff9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/module/Rubedo/config/services.config.php b/module/Rubedo/config/services.config.php
@@ -41,6 +41,8 @@
     'ElasticContentTypes' => 'Rubedo\\Elastic\\ContentTypes',
     'ElasticClickStream' => 'Rubedo\\Elastic\\ClickStream',
     'ElasticViewStream' => 'Rubedo\\Elastic\\ViewStream',
+    'ElasticDataFilters' => 'Rubedo\\Elastic\\DataFilters',
+    'ElasticDataAggregations' => 'Rubedo\\Elastic\\DataAggregations',
     'ElasticDam' => 'Rubedo\\Elastic\\Dam',
     'ElasticDamTypes' => 'Rubedo\\Elastic\\DamTypes',
     'ElasticUsers' => 'Rubedo\\Elastic\\Users',

diff --git a/module/Rubedo/src/Rubedo/Elastic/ClickStream.php b/module/Rubedo/src/Rubedo/Elastic/ClickStream.php
@@ -16,6 +16,7 @@
  */
 
 namespace Rubedo\Elastic;
+use Rubedo\Services\Manager;
 
 /**
  * Service to handle clickstream indexing and searching.
@@ -278,7 +279,7 @@ public function getDateHistogramAgg($startDate, $endDate, $interval, $filters =
         // Set facet operator for events
         SearchContext::setFacetOperator('event','or');
         // Build date filter
-        $filterFactory = new DataFilters();
+        $filterFactory = Manager::getService("ElasticDataFilters");
         $filterFactory->addDateRangeFilter('date', 'date', $startDate, $endDate);
         // Build facets filters
         foreach (self::$_facets as $key => $field) {
@@ -296,7 +297,7 @@ public function getDateHistogramAgg($startDate, $endDate, $interval, $filters =
             $params['body']['query']['filtered']['filter'] = $globalFilter;
         }
         // Build facets
-        $facetFactory = new DataAggregations();
+        $facetFactory = Manager::getService("ElasticDataAggregations");
         foreach (self::$_facets as $key => $field) {
             $facetFactory->addAggregation($field, $field);
         }
@@ -364,7 +365,7 @@ public function getGeoAgg($startDate, $endDate, $filters = [])
         // Set facet operator for events
         SearchContext::setFacetOperator('event','or');
         // Build date filter
-        $filterFactory = new DataFilters();
+        $filterFactory = Manager::getService("ElasticDataFilters");
         $filterFactory->addDateRangeFilter('date', 'date', $startDate, $endDate);
         // Build geo filter
         $coordinates = [
@@ -394,7 +395,7 @@ public function getGeoAgg($startDate, $endDate, $filters = [])
             $params['body']['query']['filtered']['filter'] = $globalFilter;
         }
         // Build facets
-        $facetFactory = new DataAggregations();
+        $facetFactory = Manager::getService("ElasticDataAggregations");
         foreach (self::$_facets as $name => $field) {
             $facetFactory->addAggregation($field, $field);
         }

diff --git a/module/Rubedo/src/Rubedo/Elastic/DataSearch.php b/module/Rubedo/src/Rubedo/Elastic/DataSearch.php
@@ -18,6 +18,7 @@
 
 namespace Rubedo\Elastic;
 
+use Rubedo\Services\Manager;
 use Zend\Json\Json;
 
 /**
@@ -194,7 +195,7 @@ public function search(array $params, $option = 'all', $withSummary = true)
         $params ['query'] = strip_tags($params ['query']);
 
         // Build filters
-        $filterFactory = new DataFilters();
+        $filterFactory =Manager::getService("ElasticDataFilters");
 
         // System filters
         $systemFilters = [
@@ -376,7 +377,7 @@ public function search(array $params, $option = 'all', $withSummary = true)
         }
 
         // Build facets
-        $facetFactory = new DataAggregations();
+        $facetFactory = Manager::getService("ElasticDataAggregations");
 
         // Add system facets
         $systemFacets = [

diff --git a/module/Rubedo/src/Rubedo/Elastic/SearchContext.php b/module/Rubedo/src/Rubedo/Elastic/SearchContext.php
@@ -147,7 +147,7 @@ public static function setFacetedFields($value)
     public static function getSeenItems($fingerprint)
     {
         if (is_null(self::$_seenItems)) {
-            $viewStream = new ViewStream();
+            $viewStream = Manager::getService('ElasticViewStream');
             self::$_seenItems = $viewStream->getSignificantItems($fingerprint);
         }