refactor(cycle): refactor CycleQuery

Author: tntrex

CHANGELOG.md

@@ -22,6 +22,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 - Nothing
 -->
 
+## [1.4.1] - 2021-02-25
+
+### Fixed
+
+- Refactor CycleQuery.
+
 ## [1.4.0] - 2021-02-25
 
 ### Added

src/Bridge/CycleOrm/Query/CycleQuery.php

@@ -9,6 +9,7 @@
 use spaceonfire\Collection\CollectionInterface;
 use spaceonfire\Collection\TypedCollection;
 use spaceonfire\Criteria\Bridge\SpiralPagination\PaginableCriteria;
+use spaceonfire\Criteria\Criteria;
 use spaceonfire\Criteria\CriteriaInterface;
 use spaceonfire\DataSource\EntityInterface;
 use spaceonfire\DataSource\MapperInterface;
@@ -21,11 +22,27 @@ class CycleQuery implements QueryInterface
      * @var Select
      */
     protected $select;
+
     /**
      * @var MapperInterface
      */
     protected $mapper;
 
+    /**
+     * @var CriteriaInterface|null
+     */
+    protected $criteria;
+
+    /**
+     * @var int|null
+     */
+    protected $limit;
+
+    /**
+     * @var int|null
+     */
+    protected $offset;
+
     /**
      * CycleQuery constructor.
      * @param Select $select
@@ -40,18 +57,30 @@ public function __construct(Select $select, MapperInterface $mapper)
     /**
      * @inheritDoc
      */
-    public function limit(int $limit): QueryInterface
+    public function limit(?int $limit): QueryInterface
+    {
+        $this->limit = $limit;
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function offset(?int $offset): QueryInterface
     {
-        $this->select->limit($limit);
+        $this->offset = $offset;
+
         return $this;
     }
 
     /**
      * @inheritDoc
      */
-    public function offset(int $offset): QueryInterface
+    public function matching(CriteriaInterface $criteria): QueryInterface
     {
-        $this->select->offset($offset);
+        $this->criteria = $criteria;
+
         return $this;
     }
 
@@ -60,7 +89,7 @@ public function offset(int $offset): QueryInterface
      */
     public function fetchOne(): ?EntityInterface
     {
-        $entity = $this->select->fetchOne();
+        $entity = $this->makeSelect()->fetchOne();
 
         if ($entity === null) {
             return null;
@@ -80,54 +109,69 @@ public function fetchOne(): ?EntityInterface
      */
     public function fetchAll(): CollectionInterface
     {
-        $items = $this->select->fetchAll();
+        $items = $this->makeSelect()->fetchAll();
 
         return new TypedCollection($items, EntityInterface::class);
     }
 
     /**
      * @inheritDoc
      */
-    public function matching(CriteriaInterface $criteria): QueryInterface
+    public function count(?string $column = null): int
+    {
+        $select = clone $this->select;
+
+        if (null !== $this->criteria) {
+            $criteria = clone $this->criteria;
+            $criteria->limit(null);
+            $criteria->offset(null);
+
+            $select = $this->applyCriteria($select, $criteria);
+        }
+
+        return $select->count($column);
+    }
+
+    private function makeSelect(): Select
+    {
+        $select = clone $this->select;
+
+        $criteria = null === $this->criteria ? new Criteria() : clone $this->criteria;
+        $criteria->limit($this->limit ?? $criteria->getLimit());
+        $criteria->offset($this->offset ?? $criteria->getOffset());
+
+        return $this->applyCriteria($select, $criteria);
+    }
+
+    private function applyCriteria(Select $select, CriteriaInterface $criteria): Select
     {
         if ($expression = $criteria->getWhere()) {
             $scope = (new CycleQueryExpressionVisitor($this->mapper))->dispatch($expression);
-            $this->select->andWhere($scope);
+            $select->andWhere($scope);
         }
 
         foreach ($criteria->getOrderBy() as $key => $order) {
-            $this->select->orderBy(
+            $select->orderBy(
                 $this->mapper->convertNameToStorage($key),
                 $order === SORT_ASC ? SelectQuery::SORT_ASC : SelectQuery::SORT_DESC
             );
         }
 
         if ($criteria instanceof PaginableCriteria) {
-            $criteria->paginate($this);
+            $criteria->paginate($select);
         } else {
             if ($criteria->getOffset()) {
-                $this->offset($criteria->getOffset());
+                $select->offset($criteria->getOffset());
             }
 
             if ($criteria->getLimit() !== null) {
-                $this->limit($criteria->getLimit());
+                $select->limit($criteria->getLimit());
             }
         }
 
         // TODO: support load options
-        $this->select->load($criteria->getInclude());
-
-        return $this;
-    }
+        $select->load($criteria->getInclude());
 
-    /**
-     * @inheritDoc
-     */
-    public function count(?string $column = null): int
-    {
-        $select = clone $this->select;
-        $select->limit(-1);
-        $select->offset(0);
-        return $select->count($column);
+        return $select;
     }
 }