Add addCount, addFirst, addMax, and addMin functions

Signed-off-by: David Arendsen <darendsen@gamepoint.com>

src/Builder/Universe.php

@@ -4,19 +4,111 @@ namespace Arendsen\FluxQueryBuilder\Builder;
 
 use Arendsen\FluxQueryBuilder\Builder\QueryBuilderInterface;
 use Arendsen\FluxQueryBuilder\Functions\AggregateWindow;
+use Arendsen\FluxQueryBuilder\Functions\Count;
 use Arendsen\FluxQueryBuilder\Functions\Duplicate;
+use Arendsen\FluxQueryBuilder\Functions\First;
+use Arendsen\FluxQueryBuilder\Functions\Group;
 use Arendsen\FluxQueryBuilder\Functions\Last;
+use Arendsen\FluxQueryBuilder\Functions\Limit;
+use Arendsen\FluxQueryBuilder\Functions\Map;
+use Arendsen\FluxQueryBuilder\Functions\Max;
+use Arendsen\FluxQueryBuilder\Functions\Mean;
+use Arendsen\FluxQueryBuilder\Functions\Min;
 use Arendsen\FluxQueryBuilder\Functions\Reduce;
 use Arendsen\FluxQueryBuilder\Functions\Sort;
-use Arendsen\FluxQueryBuilder\Functions\Map;
-use Arendsen\FluxQueryBuilder\Functions\Group;
-use Arendsen\FluxQueryBuilder\Functions\Limit;
-use Arendsen\FluxQueryBuilder\Functions\Mean;
-use Arendsen\FluxQueryBuilder\Functions\Window;
 use Arendsen\FluxQueryBuilder\Functions\Sum;
+use Arendsen\FluxQueryBuilder\Functions\Window;
 
 trait Universe
 {
+    public function addAggregateWindow($every, $fn, array $options = []): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new AggregateWindow($every, $fn, $options)
+        );
+        return $this;
+    }
+
+    public function addCount(?string $column = null): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Count($column)
+        );
+        return $this;
+    }
+
+    public function addDuplicate(string $column, string $as): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Duplicate($column, $as)
+        );
+        return $this;
+    }
+
+    public function addFirst(?string $column = null): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new First($column)
+        );
+        return $this;
+    }
+
+    public function addGroup(array $columns, $mode = 'by'): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Group($columns, $mode)
+        );
+        return $this;
+    }
+
+    public function addLast(string $column = '_value'): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Last($column)
+        );
+        return $this;
+    }
+
+    public function addLimit(int $limit, int $offset = 0): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Limit($limit, $offset)
+        );
+        return $this;
+    }
+
+    public function addMap($query): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Map($query)
+        );
+        return $this;
+    }
+
+    public function addMax(?string $column = null): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Max($column)
+        );
+        return $this;
+    }
+
+    public function addMean(?string $column = ''): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Mean($column)
+        );
+        return $this;
+    }
+
+    public function addMin(?string $column = null): QueryBuilderInterface
+    {
+        $this->addToQuery(
+            new Min($column)
+        );
+        return $this;
+    }
+
     public function addReduce(array $settings, array $identity): QueryBuilderInterface
     {
         $this->addToQuery(
@@ -33,50 +125,10 @@ trait Universe
         return $this;
     }
 
-    public function addMap($query): QueryBuilderInterface
+    public function addSum(string $column): QueryBuilderInterface
     {
         $this->addToQuery(
-            new Map($query)
-        );
-        return $this;
-    }
-
-    public function addGroup(array $columns, $mode = 'by'): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Group($columns, $mode)
-        );
-        return $this;
-    }
-
-    public function addLimit(int $limit, int $offset = 0): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Limit($limit, $offset)
-        );
-        return $this;
-    }
-
-    public function addWindow($every, array $options = []): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Window($every, $options)
-        );
-        return $this;
-    }
-
-    public function addDuplicate(string $column, string $as): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Duplicate($column, $as)
-        );
-        return $this;
-    }
-
-    public function addMean(?string $column = ''): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Mean($column)
+            new Sum($column)
         );
         return $this;
     }
@@ -89,26 +141,10 @@ trait Universe
         return $this;
     }
 
-    public function addAggregateWindow($every, $fn, array $options = []): QueryBuilderInterface
+    public function addWindow($every, array $options = []): QueryBuilderInterface
     {
         $this->addToQuery(
-            new AggregateWindow($every, $fn, $options)
-        );
-        return $this;
-    }
-
-    public function addSum(string $column): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Sum($column)
-        );
-        return $this;
-    }
-
-    public function addLast(string $column = '_value'): QueryBuilderInterface
-    {
-        $this->addToQuery(
-            new Last($column)
+            new Window($every, $options)
         );
         return $this;
     }

src/Functions/Count.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder\Functions;
+
+use Arendsen\FluxQueryBuilder\Type;
+
+class Count extends Base
+{
+    /**
+     * @var string|null $column
+     */
+    private $column;
+
+    public function __construct(?string $column = null)
+    {
+        $this->column = $column;
+    }
+
+    public function __toString()
+    {
+        $params = new Type(array_filter([
+          'column' => $this->column
+        ]));
+
+        return '|> count(' . $params . ') ';
+    }
+}

src/Functions/First.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder\Functions;
+
+use Arendsen\FluxQueryBuilder\Type;
+
+class First extends Base
+{
+    /**
+     * @var string|null $column
+     */
+    private $column;
+
+    public function __construct(?string $column = null)
+    {
+        $this->column = $column;
+    }
+
+    public function __toString()
+    {
+        $params = new Type(array_filter([
+          'column' => $this->column
+        ]));
+
+        return '|> first(' . $params . ') ';
+    }
+}

src/Functions/Max.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder\Functions;
+
+use Arendsen\FluxQueryBuilder\Type;
+
+class Max extends Base
+{
+    /**
+     * @var string|null $column
+     */
+    private $column;
+
+    public function __construct(?string $column = null)
+    {
+        $this->column = $column;
+    }
+
+    public function __toString()
+    {
+        $params = new Type(array_filter([
+          'column' => $this->column
+        ]));
+
+        return '|> max(' . $params . ') ';
+    }
+}

src/Functions/Min.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Arendsen\FluxQueryBuilder\Functions;
+
+use Arendsen\FluxQueryBuilder\Type;
+
+class Min extends Base
+{
+    /**
+     * @var string|null $column
+     */
+    private $column;
+
+    public function __construct(?string $column = null)
+    {
+        $this->column = $column;
+    }
+
+    public function __toString()
+    {
+        $params = new Type(array_filter([
+          'column' => $this->column
+        ]));
+
+        return '|> min(' . $params . ') ';
+    }
+}