Add KeyValue expression

Signed-off-by: davidarendsen <davidarendsen@hey.com>

src/Expression/Filter/AndExpression.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Arendsen\FluxQueryBuilder\Expression\Filter;
-
-use Arendsen\FluxQueryBuilder\Expression\Base;
-
-class AndExpression extends Base {
-
-    /**
-     * @var string $key
-     */
-    private $key;
-
-    /**
-     * @var string $value
-     */
-    private $value;
-
-    public function __construct(string $key, string $value)
-    {
-        $this->key = $key;
-        $this->value = $value;
-    }
-
-    public function __toString()
-    {
-        return 'and r.' . $this->key . ' == "' . $this->value . '"';
-    }
-
-}

src/Expression/Filter/Measurement.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Arendsen\FluxQueryBuilder\Expression\Filter;
-
-use Arendsen\FluxQueryBuilder\Expression\Base;
-
-class Measurement extends Base {
-
-    /**
-     * @var array $measurement
-     */
-    private $measurement;
-
-    public function __construct(string $measurement)
-    {
-        $this->measurement = $measurement;
-    }
-
-    public function __toString()
-    {
-        return 'r._measurement == "' . $this->measurement . '"';
-    }
-
-}

src/Expression/Filter/OrExpression.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Arendsen\FluxQueryBuilder\Expression\Filter;
-
-use Arendsen\FluxQueryBuilder\Expression\Base;
-
-class OrExpression extends Base {
-
-    /**
-     * @var string $key
-     */
-    private $key;
-
-    /**
-     * @var string $value
-     */
-    private $value;
-
-    public function __construct(string $key, string $value)
-    {
-        $this->key = $key;
-        $this->value = $value;
-    }
-
-    public function __toString()
-    {
-        return 'or r.' . $this->key . ' == "' . $this->value . '"';
-    }
-
-}

src/Expression/KeyValue.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder\Expression;
+
+class KeyValue extends Base {
+
+    /**
+     * @var array $expressions
+     */
+    private $expressions;
+
+    public function __construct(string $key, string $value)
+    {
+        $this->expressions[] = 'r.' . $key . ' == "' . $value . '"';
+    }
+
+    public static function set(string $key, string $value): KeyValue
+    {
+        return new self($key, $value);
+    }
+
+    public function and(string $key, string $value): KeyValue
+    {
+        $this->expressions[] = 'and r.' . $key . ' == "' . $value . '"';
+        return $this;
+    }
+
+    public function or(string $key, string $value): KeyValue
+    {
+        $this->expressions[] = 'or r.' . $key . ' == "' . $value . '"';
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return implode(' ', $this->expressions);
+    }
+
+}

tests/Expression/KeyValueTest.php

@@ -0,0 +1,22 @@
+<?php
+declare(strict_types=1);
+
+use Arendsen\FluxQueryBuilder\Expression\KeyValue;
+use PHPUnit\Framework\TestCase;
+
+final class KeyValueExpressionTest extends TestCase {
+
+    public function testSimpleKeyvalue()
+    {
+        $keyvalue = KeyValue::set('_measurement', 'test_measurement')
+            ->and('_field', 'user')
+            ->or('_field', 'field2')
+            ->and('user', 'my_username');
+
+        $query = 'r._measurement == "test_measurement" and r._field == "user" or ' . 
+            'r._field == "field2" and r.user == "my_username"';
+
+        $this->assertEquals($keyvalue->__toString(), $query);
+    }
+
+}

tests/Function/FilterFunctionTest.php

@@ -1,9 +1,7 @@
 <?php
 declare(strict_types=1);
 
-use Arendsen\FluxQueryBuilder\Expression\Filter\AndExpression;
+use Arendsen\FluxQueryBuilder\Expression\KeyValue;
-use Arendsen\FluxQueryBuilder\Expression\Filter\OrExpression;
-use Arendsen\FluxQueryBuilder\Expression\Filter\Measurement;
 use Arendsen\FluxQueryBuilder\Function\Filter;
 use PHPUnit\Framework\TestCase;
 
@@ -12,10 +10,10 @@ final class FilterFunctionTest extends TestCase {
     public function testSimpleFilter()
     {
         $expression = new Filter([
-            new Measurement('test_measurement'),
+            KeyValue::set('_measurement', 'test_measurement')
-            new AndExpression('_field', 'user'),
+                ->and('_field', 'user')
-            new OrExpression('_field', 'field2'),
+                ->or('_field', 'field2')
-            'and r.user == "my_username"',
+                ->and('user', 'my_username'),
         ]);
 
         $query = '|> filter(fn: (r) => r._measurement == "test_measurement" and r._field == "user" or ' . 

tests/Function/FromFunctionTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 use Arendsen\FluxQueryBuilder\Function\From;
 use PHPUnit\Framework\TestCase;
 
-final class FromExpressionTest extends TestCase {
+final class FromFunctionTest extends TestCase {
 
     /**
      * @dataProvider somethingProvider