Add orderBy clause to cache key

Author: mikebronner

src/CachedBuilder.php

@@ -27,7 +27,7 @@ protected function getCacheKey(array $columns = ['*'], $idColumn = null) : strin
         $key .= $this->getQueryColumns($columns);
         $key .= $this->getWhereClauses();
         $key .= $this->getWithModels();
-        $key .= $this->getOrderClauses();
+        $key .= $this->getOrderByClauses();
         $key .= $this->getOffsetClause();
         $key .= $this->getLimitClause();
 
@@ -118,16 +118,14 @@ protected function getWithModels() : string
         return '-' . implode('-', $eagerLoads->keys()->toArray());
     }
 
-	protected function getOrderClauses(){
+	protected function getOrderByClauses(){
         $orders = collect($this->query->orders);
 
         return $orders->reduce(function($carry, $order){
-            $carry .= '_sort_' . array_get($order, 'column') . '_' . array_get($order, 'direction');
-
-            return $carry;
+            return $carry . '_orderBy_' . $order['column'] . '_' . $order['direction'];
         });
     }
-	
+
     protected function getCacheTags() : array
     {
         return collect($this->eagerLoad)->keys()

tests/Unit/CachedBuilderTest.php

@@ -227,7 +227,7 @@ public function testChunkModelResultsCreatesCache()
                 }
 
                 $cachedChunks['authors']->push($chunk);
-                $cachedChunks['keys']->push("genealabslaravelmodelcachingtestsfixturesauthor-books-profile{$offset}-limit_3");
+                $cachedChunks['keys']->push("genealabslaravelmodelcachingtestsfixturesauthor-books-profile_orderBy_authors.id_asc{$offset}-limit_3");
             });
 
         (new UncachedAuthor)->with('books', 'profile')
@@ -464,6 +464,22 @@ public function testLazyLoadingOnResourceIsCached()
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));
     }
 
+    public function testOrderByClauseParsing()
+    {
+        $authors = (new Author)->orderBy('name')->get();
+
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor_orderBy_name_asc';
+        $tags = [
+            'genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+
+        $cachedResults = cache()->tags($tags)->get($key);
+        $liveResults = (new UncachedAuthor)->orderBy('name')->get();
+
+        $this->assertEmpty($authors->diffAssoc($cachedResults));
+        $this->assertEmpty($liveResults->diffAssoc($cachedResults));
+    }
+
     public function testNestedRelationshipWhereClauseParsing()
     {
         // -> with('modelA.modelB')