server/src/app/Http/Controllers/Api/DateStatsController.php
changeset 378 5b47eab083f3
parent 377 52169c718513
child 406 cf0f23803a53
--- a/server/src/app/Http/Controllers/Api/DateStatsController.php	Thu Oct 20 17:27:36 2016 +0200
+++ b/server/src/app/Http/Controllers/Api/DateStatsController.php	Thu Oct 20 19:14:37 2016 +0200
@@ -7,6 +7,7 @@
 use Es;
 
 use CorpusParole\Http\Controllers\Controller;
+use CorpusParole\Libraries\Filters\CorpusFilterManager;
 
 
 class DateStatsController extends Controller
@@ -19,7 +20,13 @@
     public function index(Request $request)
     {
 
-        $query = [ "match_all" => []];
+
+        $filterManager = new CorpusFilterManager();
+        $filters = $filterManager->prepareFilters($request);
+        unset($filters['dates']);
+        $qFilterParts = $filterManager->buildESFilters($filters);
+
+        $query = $filterManager->buildQuery($qFilterParts);
 
         $esQuery = [
             'index' => env('ELASTICSEARCH_INDEX'),
@@ -58,7 +65,10 @@
         $datestats = [];
 
         foreach($esRes['aggregations']['datestats']['years']['buckets'] as $bucket) {
-            $datestats[(string)($bucket['key'])] = round($bucket['year_count']['value']);
+            $c = round($bucket['year_count']['value']);
+            if($c > 0) {
+                $datestats[(string)($bucket['key'])] = $c;
+            }
         }
 
         return response()->json(['datestats' => $datestats ]);