Adding support for non string granularities

Author: r4j4h

src/DruidFamiliar/QueryGenerator/SimpleGroupByDruidQueryGenerator.php

@@ -57,7 +57,13 @@ public function generateQuery(IDruidQueryParameters $params)
         // We always have these keys
         $queryKeys[] =  '"queryType": "{QUERYTYPE}"';
         $queryKeys[] =  '"dataSource": "{DATASOURCE}"';
-        $queryKeys[] =  '"granularity": "{GRANULARITYSPEC.GRAN}"';
+
+        if ( is_array( $params->granularity ) && count( $params->granularity ) > 0 ) {
+            $queryKeys[] =  '"granularity": {GRANULARITYSPEC.GRAN}';
+        } else {
+            $queryKeys[] = '"granularity": "{GRANULARITYSPEC.GRAN}"';
+        }
+
         $queryKeys[] =  '"dimensions": [ "{NON_TIME_DIMENSIONS}" ]';
 
         if ( count( $params->filters ) > 0 ) {
@@ -83,7 +89,12 @@ public function generateQuery(IDruidQueryParameters $params)
         $query = str_replace('{INTERVALS}',             $params->intervals,                   $query);
 
 
-        $query = str_replace('{GRANULARITYSPEC.GRAN}',  $params->granularity,                 $query);
+        if ( is_array( $params->granularity ) && count( $params->granularity ) > 0 ) {
+            $query = str_replace('{GRANULARITYSPEC.GRAN}', json_encode( $params->granularity ), $query);
+        } else {
+            $query = str_replace('{GRANULARITYSPEC.GRAN}',  $params->granularity,               $query);
+        }
+
         $query = str_replace('{NON_TIME_DIMENSIONS}',   join('","', $params->dimensions),     $query);
         $query = str_replace('{FILTERS}',               join(",", $params->filters),          $query);
         $query = str_replace('{AGGREGATORS}',           join(",", $params->aggregators),      $query);

tests/DruidFamiliar/Test/QueryGenerator/SimpleGroupByDruidQueryGeneratorTest.php

@@ -254,4 +254,40 @@ public function testGenerateQueryHandlesNotHavingPostAggregations()
         $this->assertArrayNotHasKey('postAggregations', $query);
     }
 
+    public function testGenerateQueryHandlesStringGranularities()
+    {
+        $params = $this->getMockSimpleGroupByQueryParameters();
+        $params->granularity = 'DAY';
+
+        $q = new \DruidFamiliar\QueryGenerator\SimpleGroupByDruidQueryGenerator();
+
+        $query = $q->generateQuery($params);
+
+
+        $jsonString = json_decode( $query, true );
+
+        $this->assertArrayHasKey('granularity', $jsonString);
+        $this->assertEquals( 'DAY', $jsonString['granularity'] );
+    }
+
+    public function testGenerateQueryHandlesObjectGranularities()
+    {
+        $params = $this->getMockSimpleGroupByQueryParameters();
+        $params->granularity = array('type'=> "period", "period"=>"P3M");
+
+        $q = new \DruidFamiliar\QueryGenerator\SimpleGroupByDruidQueryGenerator();
+
+        $query = $q->generateQuery($params);
+
+
+        $jsonString = json_decode( $query, true );
+
+        $this->assertArrayHasKey('granularity', $jsonString);
+        $this->assertCount( 2, $jsonString['granularity'] );
+        $this->assertArrayHasKey('type', $jsonString['granularity']);
+        $this->assertArrayHasKey('period', $jsonString['granularity']);
+
+        $this->assertEquals( 'period', $jsonString['granularity']['type'] );
+        $this->assertEquals( 'P3M', $jsonString['granularity']['period'] );
+    }
 }