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

Improve validation

Browse source 
Signed-off-by: David Arendsen <darendsen@gamepoint.com>
This commit is contained in:
David Arendsen 2023-01-14 11:27:13 +01:00
commit 602228a5e8
6 changed files with 53 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Builder/Basics.php
View file

@ -10,6 +10,7 @@ use Arendsen\FluxQueryBuilder\Expression\KeyValue;
use Arendsen\FluxQueryBuilder\Expression\KeyFilter;
use Arendsen\FluxQueryBuilder\Functions\Filter;
use Arendsen\FluxQueryBuilder\Functions\From;
use Arendsen\FluxQueryBuilder\Functions\Measurement;
use Arendsen\FluxQueryBuilder\Functions\Range;
use Arendsen\FluxQueryBuilder\Functions\RawFunction;
@ -17,9 +18,7 @@ trait Basics
{
public function from(array $from): QueryBuilderInterface
{
$this->addRequiredData(QueryBuilder::REQUIRED_INPUT_FROM, $from);
$this->addToQuery(
FluxPart::FROM,
new From($from)
);
return $this;
@ -27,14 +26,14 @@ trait Basics
public function fromBucket(string $bucket): QueryBuilderInterface
{
$this->from(['bucket' => $bucket]);
return $this;
return $this->from(['bucket' => $bucket]);
}
public function fromMeasurement(string $measurement): QueryBuilderInterface
{
$this->addRequiredData(QueryBuilder::REQUIRED_INPUT_MEASUREMENT, $measurement);
$this->addKeyFilter(KeyFilter::setEqualTo('_measurement', $measurement));
$this->addToQuery(
new Measurement($measurement)
);
return $this;
}
@ -47,7 +46,6 @@ trait Basics
public function addFilter(KeyValue $keyValue): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::FILTERS,
new Filter($keyValue)
);
return $this;
@ -56,7 +54,6 @@ trait Basics
public function addKeyFilter(KeyFilter $keyFilter): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::FILTERS,
new Filter($keyFilter)
);
return $this;
@ -65,7 +62,6 @@ trait Basics
public function addFieldFilter(array $fields): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::FILTERS,
new Filter($fields)
);
return $this;
@ -73,9 +69,7 @@ trait Basics
public function addRange(DateTime $start, ?DateTime $stop = null): QueryBuilderInterface
{
$this->addRequiredData(QueryBuilder::REQUIRED_INPUT_RANGE, [$start, $stop]);
$this->addToQuery(
FluxPart::RANGE,
new Range($start, $stop)
);
return $this;
@ -96,7 +90,6 @@ trait Basics
public function addRawFunction(string $input): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::RAWFUNCTION,
new RawFunction($input)
);
return $this;

1
src/Builder/FluxPart.php
View file

@ -5,6 +5,7 @@ namespace Arendsen\FluxQueryBuilder\Builder;
class FluxPart
{
public const FROM = 'from';
public const MEASUREMENT = 'measurement';
public const RANGE = 'range';
public const FILTERS = 'filters';
public const REDUCE = 'reduce';

10
src/Builder/Universe.php
View file

@ -19,7 +19,6 @@ trait Universe
public function addReduce(array $settings, array $identity): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::REDUCE,
new Reduce($settings, $identity)
);
return $this;
@ -28,7 +27,6 @@ trait Universe
public function addSort(array $columns, $desc): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::SORT,
new Sort($columns, $desc)
);
return $this;
@ -37,7 +35,6 @@ trait Universe
public function addMap($query): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::MAP,
new Map($query)
);
return $this;
@ -46,7 +43,6 @@ trait Universe
public function addGroup(array $columns, $mode = 'by'): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::GROUP,
new Group($columns, $mode)
);
return $this;
@ -55,7 +51,6 @@ trait Universe
public function addLimit(int $limit, int $offset = 0): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::LIMIT,
new Limit($limit, $offset)
);
return $this;
@ -64,7 +59,6 @@ trait Universe
public function addWindow($every, array $options = []): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::WINDOW,
new Window($every, $options)
);
return $this;
@ -73,7 +67,6 @@ trait Universe
public function addDuplicate(string $column, string $as): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::DUPLICATE,
new Duplicate($column, $as)
);
return $this;
@ -82,7 +75,6 @@ trait Universe
public function addMean(?string $column = ''): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::MEAN,
new Mean($column)
);
return $this;
@ -91,7 +83,6 @@ trait Universe
public function addUnWindow(): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::UNWINDOW,
new Window('inf')
);
return $this;
@ -100,7 +91,6 @@ trait Universe
public function addAggregateWindow($every, $fn, array $options = []): QueryBuilderInterface
{
$this->addToQuery(
FluxPart::AGGREGATEWINDOW,
new AggregateWindow($every, $fn, $options)
);
return $this;

5
src/Functions/Limit.php
View file

@ -9,6 +9,11 @@ class Limit extends Base
*/
private $limit;
/**
* @var int $offset
*/
private $offset;
public function __construct(int $limit, int $offset = 0)
{
$this->limit = $limit;

21
src/Functions/Measurement.php Normal file
View file

@ -0,0 +1,21 @@
<?php
namespace Arendsen\FluxQueryBuilder\Functions;
class Measurement extends Base
{
/**
* @var string $measurement
*/
private $measurement;
public function __construct(string $measurement)
{
$this->measurement = $measurement;
}
public function __toString()
{
return '|> filter(fn: (r) => r._measurement == "' . (string)$this->measurement . '") ';
}
}

43
src/QueryBuilder.php
View file

@ -6,26 +6,23 @@ use Exception;
use Arendsen\FluxQueryBuilder\Builder\QueryBuilderInterface;
use Arendsen\FluxQueryBuilder\Builder\Basics;
use Arendsen\FluxQueryBuilder\Builder\Universe;
use Arendsen\FluxQueryBuilder\Functions\From;
use Arendsen\FluxQueryBuilder\Functions\Measurement;
use Arendsen\FluxQueryBuilder\Functions\Range;
class QueryBuilder implements QueryBuilderInterface
{
use Basics;
use Universe;
public const REQUIRED_INPUT_FROM = 'from';
public const REQUIRED_INPUT_RANGE = 'range';
public const REQUIRED_INPUT_MEASUREMENT = 'measurement';
public const REQUIRED_INPUT = [
self::REQUIRED_INPUT_FROM,
self::REQUIRED_INPUT_RANGE,
self::REQUIRED_INPUT_MEASUREMENT,
];
/**
* @var int $currentFluxQueryPart
* Depends on Basics trait
*/
private $currentFluxQueryPart = 0;
public const REQUIRED_FLUX_QUERY_PARTS = [
From::class,
Range::class,
Measurement::class,
];
/**
* @var array $fluxQuery
@ -37,10 +34,15 @@ class QueryBuilder implements QueryBuilderInterface
*/
private $requiredData = [];
protected function addToQuery($key, $query)
protected function addToQuery($query)
{
$this->fluxQueryParts[$this->currentFluxQueryPart] = $query;
$this->currentFluxQueryPart++;
$this->fluxQueryParts[] = $query;
foreach (self::REQUIRED_FLUX_QUERY_PARTS as $input) {
if ($query instanceof $input) {
$this->requiredData[] = $query;
}
}
}
public function build(): string
@ -56,15 +58,12 @@ class QueryBuilder implements QueryBuilderInterface
return $query;
}
protected function addRequiredData(string $key, $value)
{
$this->requiredData[][$key] = $value;
}
protected function checkRequired()
{
foreach (self::REQUIRED_INPUT as $key => $input) {
if (!isset($this->requiredData[$key][$input])) {
foreach (self::REQUIRED_FLUX_QUERY_PARTS as $key => $input) {
if (isset($this->requiredData[$key]) && !$this->requiredData[$key] instanceof $input) {
throw new Exception('You need to put the "' . $input . '" part of the query in the correct order!');
} elseif (!isset($this->requiredData[$key])) {
throw new Exception('You need to define the "' . $input . '" part of the query!');
}
}