refactor: CriteriaPageable, CriteriaRecollection, `MinimalCriteri…

…aRecollection` now respect default order by (#112)
rekalogika · Jul 8, 2024 · 95a9311 · 95a9311
1 parent 8effcee
commit 95a9311
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 * refactor: consolidate util classes
 * feat: default indexBy
 * feat: repositories now automatically detect indexBy
+* refactor: `CriteriaPageable`, `CriteriaRecollection`, `MinimalCriteriaRecollection`
+  now respect default order by
 
 ## 0.8.0
 

diff --git a/packages/collections-domain/src/CriteriaPageable.php b/packages/collections-domain/src/CriteriaPageable.php
@@ -14,7 +14,6 @@
 namespace Rekalogika\Domain\Collections;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Collections\Order;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Rekalogika\Contracts\Collections\Exception\UnexpectedValueException;
@@ -81,7 +80,7 @@ final private function __construct(
         $criteria = clone ($criteria ?? Criteria::create());
 
         if (\count($criteria->orderings()) === 0) {
-            $criteria->orderBy(['id' => Order::Descending]);
+            $criteria->orderBy(Configuration::$defaultOrderBy);
         }
 
         $this->criteria = $criteria;

diff --git a/packages/collections-domain/src/CriteriaRecollection.php b/packages/collections-domain/src/CriteriaRecollection.php
@@ -99,7 +99,7 @@ final private function __construct(
         $criteria = clone ($criteria ?? Criteria::create());
 
         if (\count($criteria->orderings()) === 0) {
-            $criteria->orderBy(['id' => Order::Descending]);
+            $criteria->orderBy(Configuration::$defaultOrderBy);
         }
 
         $this->criteria = $criteria;

diff --git a/packages/collections-domain/src/MinimalCriteriaRecollection.php b/packages/collections-domain/src/MinimalCriteriaRecollection.php
@@ -14,7 +14,6 @@
 namespace Rekalogika\Domain\Collections;
 
 use Doctrine\Common\Collections\Criteria;
-use Doctrine\Common\Collections\Order;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Rekalogika\Contracts\Collections\Exception\UnexpectedValueException;
@@ -82,7 +81,7 @@ final private function __construct(
         $criteria = clone ($criteria ?? Criteria::create());
 
         if (\count($criteria->orderings()) === 0) {
-            $criteria->orderBy(['id' => Order::Descending]);
+            $criteria->orderBy(Configuration::$defaultOrderBy);
         }
 
         $this->criteria = $criteria;