Add Group, Limit, Map, Sort functions

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

tests/Expression/KeyValueTest.php

@@ -11,7 +11,7 @@ final class KeyValueExpressionTest extends TestCase {
         $keyvalue = KeyValue::setEqualTo('_measurement', 'test_measurement')
             ->andEqualTo('_field', 'user')
             ->or('count', '>=', '1')
-            ->and('user', '==', 'my_username')
+            ->and('user', KeyValue::EQUAL_TO, 'my_username')
             ->orNotEqualTo('test', 'world');
 
         $query = 'r._measurement == "test_measurement" and r._field == "user" or ' . 

tests/Function/GroupFunctionTest.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+use Arendsen\FluxQueryBuilder\Function\Group;
+use PHPUnit\Framework\TestCase;
+
+final class GroupFunctionTest extends TestCase {
+
+    public function testSimpleGroup()
+    {
+        $expression = new Group(['foo', 'bar'], 'by');
+
+        $query = '|> group(columns: ["foo", "bar"], mode: "by") ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
+
+}

tests/Function/LimitFunctionTest.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+use Arendsen\FluxQueryBuilder\Function\Limit;
+use PHPUnit\Framework\TestCase;
+
+final class LimitFunctionTest extends TestCase {
+
+    public function testSimpleLimit()
+    {
+        $expression = new Limit(1);
+
+        $query = '|> limit(n:1) ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
+
+}

tests/Function/MapFunctionTest.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+use Arendsen\FluxQueryBuilder\Function\Map;
+use PHPUnit\Framework\TestCase;
+
+final class MapFunctionTest extends TestCase {
+
+    public function testSimpleMap()
+    {
+        $expression = new Map('r with name: r.user');
+
+        $query = '|> map(fn: (r) => ({ r with name: r.user })) ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
+
+}

tests/Function/SortFunctionTest.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types=1);
+
+use Arendsen\FluxQueryBuilder\Function\Sort;
+use PHPUnit\Framework\TestCase;
+
+final class SortFunctionTest extends TestCase {
+
+    public function testSimpleSort()
+    {
+        $expression = new Sort(['foo', 'bar'], true);
+
+        $query = '|> sort(columns: ["foo", "bar"], desc: true) ';
+
+        $this->assertEquals($query, $expression->__toString());
+    }
+
+}

tests/QueryBuilderTest.php

@@ -87,4 +87,25 @@ final class QueryBuilderTest extends TestCase {
         ];
     }
 
+    public function testComplexQuery()
+    {
+        $queryBuilder = new QueryBuilder();
+        $queryBuilder->fromBucket('test_bucket')
+            ->fromMeasurement('test_measurement')
+			->addRangeStart('-3h')
+            ->addFilter(KeyValue::setEqualTo('_field', 'username'))
+            ->addMap('r with name: r.user')
+            ->addGroup(['_field', 'ip'])
+            ->addReduce(['count' => 'accumulator.count + 1'], ['count' => 0])
+            ->addFilter(KeyValue::setGreaterOrEqualTo('count', '1'));
+
+        $expectedQuery = 'from(bucket: "test_bucket") |> range(start: "-3h") ' . 
+            '|> reduce(fn: (r, accumulator) => ({count: accumulator.count + 1}), identity: {count: 0}) ' . 
+            '|> filter(fn: (r) => r._measurement == "test_measurement") |> filter(fn: (r) => r._field == "username") ' . 
+            '|> filter(fn: (r) => r.count >= "1") |> map(fn: (r) => ({ r with name: r.user })) ' . 
+            '|> group(columns: ["_field", "ip"], mode: "by") ';
+
+        $this->assertEquals($expectedQuery, $queryBuilder->build());
+    }
+
 }