Move Aggregations into AggregationInterface

Author: marcgeurts

src/Query/Aggregation/AggregationInterface.php

@@ -3,10 +3,23 @@
 
 namespace TBolier\RethinkQL\Query\Aggregation;
 
+use TBolier\RethinkQL\Query\QueryInterface;
 use TBolier\RethinkQL\Response\ResponseInterface;
 
 interface AggregationInterface
 {
+    /**
+     * @param int $n
+     * @return AggregationInterface
+     */
+    public function limit($n): AggregationInterface;
+
+    /**
+     * @param mixed|QueryInterface $key
+     * @return AggregationInterface
+     */
+    public function orderBy($key): AggregationInterface;
+
     /**
      * @return Iterable|ResponseInterface
      */

src/Query/Operation/AbstractOperation.php

@@ -3,10 +3,10 @@
 
 namespace TBolier\RethinkQL\Query\Operation;
 
-use TBolier\RethinkQL\Query\AbstractQuery;
+use TBolier\RethinkQL\Query\Aggregation\AbstractAggregation;
 use TBolier\RethinkQL\Query\QueryInterface;
 
-abstract class AbstractOperation extends AbstractQuery implements OperationInterface
+abstract class AbstractOperation extends AbstractAggregation implements OperationInterface
 {
     /**
      * @inheritdoc

src/Query/Table.php

@@ -4,9 +4,6 @@
 namespace TBolier\RethinkQL\Query;
 
 use TBolier\RethinkQL\Message\MessageInterface;
-use TBolier\RethinkQL\Query\Aggregation\Limit;
-use TBolier\RethinkQL\Query\Aggregation\OrderBy;
-use TBolier\RethinkQL\Query\Aggregation\AggregationInterface;
 use TBolier\RethinkQL\Query\Operation\AbstractOperation;
 use TBolier\RethinkQL\Query\Operation\Get;
 use TBolier\RethinkQL\RethinkInterface;
@@ -47,22 +44,6 @@ public function get($value): AbstractQuery
         return new Get($this->rethink, $this->message, $this, $value);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function limit($value): AggregationInterface
-    {
-        return new Limit($this->rethink, $this->message, $this, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function orderBy($key): AggregationInterface
-    {
-        return new OrderBy($this->rethink, $this->message, $this, $key);
-    }
-
     /**
      * @inheritdoc
      */

src/Query/TableInterface.php

@@ -3,7 +3,6 @@
 
 namespace TBolier\RethinkQL\Query;
 
-use TBolier\RethinkQL\Query\Aggregation\AggregationInterface;
 use TBolier\RethinkQL\Query\Operation\OperationInterface;
 
 interface TableInterface extends OperationInterface
@@ -13,16 +12,4 @@ interface TableInterface extends OperationInterface
      * @return AbstractQuery
      */
     public function get($value): AbstractQuery;
-
-    /**
-     * @param int $n
-     * @return AggregationInterface
-     */
-    public function limit($n): AggregationInterface;
-
-    /**
-     * @param mixed|QueryInterface $key
-     * @return AggregationInterface
-     */
-    public function orderBy($key): AggregationInterface;
 }

test/integration/Aggregation/LimitTest.php

@@ -28,4 +28,26 @@ public function testLimit(): void
 
         $this->assertCount(2, $cursor);
     }
+
+    /**
+     * @return void
+     * @throws \Exception
+     */
+    public function testFilterAndLimit(): void
+    {
+        $this->insertDocument(1);
+        $this->insertDocument(2);
+        $this->insertDocument(3);
+        $this->insertDocument(4);
+        $this->insertDocument(5);
+
+        /** @var Cursor $cursor */
+        $cursor = $this->r()
+                       ->table('tabletest')
+                       ->filter(['description' => 'A document description.'])
+                       ->limit(2)
+                       ->run();
+
+        $this->assertCount(2, $cursor);
+    }
 }

test/integration/Aggregation/OrderByTest.php

@@ -49,4 +49,26 @@ public function testOrderByAsc(): void
 
         $this->assertArraySubset(['id' => 1], $res->getData()[0]);
     }
+
+    /**
+     * @return void
+     * @throws \Exception
+     */
+    public function testFilerAndOrderByAsc(): void
+    {
+        $this->insertDocument(5);
+        $this->insertDocument(4);
+        $this->insertDocument(3);
+        $this->insertDocument(2);
+        $this->insertDocument(1);
+
+        /** @var ResponseInterface $res */
+        $res = $this->r()
+                    ->table('tabletest')
+                    ->filter(['description' => 'A document description.'])
+                    ->orderBy($this->r()->asc('id'))
+                    ->run();
+
+        $this->assertArraySubset(['id' => 1], $res->getData()[0]);
+    }
 }