Hosterra/flux-querybuilder
Hosterra/flux-querybuilder
1
0
Fork 0
Code Issues Pull requests Releases 2 Packages Activity

Extract general QueryBuilder logic into an abstract class to make it more maintainable

Browse source 
Signed-off-by: davidarendsen <davidarendsen@hey.com>
This commit is contained in:
davidarendsen 2022-12-21 16:02:43 +00:00
commit df6ff71375
5 changed files with 218 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/Functions/FilterFunctionTest.php
View file

@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Tests\Functions;
use Arendsen\FluxQueryBuilder\Expression\KeyValue;
use Arendsen\FluxQueryBuilder\Expression\KeyFilter;
use Arendsen\FluxQueryBuilder\Functions\Filter;
use PHPUnit\Framework\TestCase;
@ -31,4 +32,17 @@ final class FilterFunctionTest extends TestCase
$this->assertEquals($expression->__toString(), $query);
}
public function testKeyFilter()
{
$expression = new Filter(KeyFilter::setEqualTo('_measurement', 'test_measurement')
->andEqualTo('_field', 'user')
->orEqualTo('_field', 'field2')
->andEqualTo('user', 'my_username'));
$query = '|> filter(fn: (r) => r._measurement == "test_measurement" and r._field == "user" or ' .
'r._field == "field2" and r.user == "my_username") ';
$this->assertEquals($expression->__toString(), $query);
}
}

10
tests/QueryBuilderTest.php
View file

@ -117,13 +117,14 @@ final class QueryBuilderTest extends TestCase
->addFieldFilter(['username', 'ip'])
->addKeyFilter(KeyFilter::setGreaterOrEqualTo('count', 1)->andGreaterOrEqualTo('count2', 2))
->addMap('r with name: r.user')
->addGroup(['_field', 'ip']);
->addGroup(['_field', 'ip'])
->addLimit(1);
$expectedQuery = 'from(bucket: "test_bucket") |> range(start: time(v: 2022-08-12T17:31:00Z)) ' .
'|> reduce(fn: (r, accumulator) => ({count: accumulator.count + 1}), identity: {count: 0}) ' .
'|> filter(fn: (r) => r._measurement == "test_measurement") |> filter(fn: (r) => ' .
'r._field == "username" or r._field == "ip") |> filter(fn: (r) => r.count >= 1 and r.count2 >= 2) ' .
'|> map(fn: (r) => ({ r with name: r.user })) |> group(columns: ["_field", "ip"], mode: "by") ';
'|> map(fn: (r) => ({ r with name: r.user })) |> group(columns: ["_field", "ip"], mode: "by") |> limit(n: 1, offset: 0) ';
$this->assertEquals($expectedQuery, $queryBuilder->build());
}
@ -176,12 +177,13 @@ final class QueryBuilderTest extends TestCase
->addRangeStart(new DateTime('2022-08-12 17:31:00'))
->addReduce(['count' => new MathType('accumulator.count + 1')], ['count' => 0])
->fromMeasurement('test_measurement')
->addRawFunction('|> aggregateWindow(every: 20s, fn: mean, timeDst: "_time")');
->addRawFunction('|> aggregateWindow(every: 20s, fn: mean, timeDst: "_time")')
->addLimit(50, 100);
$expectedQuery = 'from(bucket: "test_bucket") |> range(start: time(v: 2022-08-12T17:31:00Z)) ' .
'|> reduce(fn: (r, accumulator) => ({count: accumulator.count + 1}), identity: {count: 0}) ' .
'|> filter(fn: (r) => r._measurement == "test_measurement") ' .
'|> aggregateWindow(every: 20s, fn: mean, timeDst: "_time") ';
'|> aggregateWindow(every: 20s, fn: mean, timeDst: "_time") |> limit(n: 50, offset: 100) ';
$this->assertEquals($expectedQuery, $queryBuilder->build());
}