From 1709ca9b1981f7fca65829fcc056830a01af9748 Mon Sep 17 00:00:00 2001
From: cyppe <thomas.andersson@gmail.com>
Date: Thu, 25 Jan 2024 10:54:26 +0100
Subject: [PATCH] Add back sorting by createdAt desc

---
 src/Repositories/RedisBatchRepository.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Repositories/RedisBatchRepository.php b/src/Repositories/RedisBatchRepository.php
index a9d55f9..4081091 100644
--- a/src/Repositories/RedisBatchRepository.php
+++ b/src/Repositories/RedisBatchRepository.php
@@ -37,19 +37,14 @@ public function get( $limit = 50, $before = null ): array
         // Determine the starting index
         $startIndex = 0;
         if ( $before !== null ) {
-            // Fetch a range of batch IDs surrounding the 'before' value
-            // Adjust the range size as needed for efficiency
             $rangeSize   = 100;
             $allBatchIds = Redis::lrange( 'batches_list', 0, $rangeSize - 1 );
             $beforeIndex = array_search( $before, $allBatchIds );
 
             if ( $beforeIndex !== false ) {
                 $startIndex = $beforeIndex + 1;
-            } else {
-                // TODO:
-                // Handle case where 'before' is not found in the initial range
-                // Consider fetching additional ranges or handling this scenario differently
             }
+            // Handle cases where 'before' is not found or other scenarios
         }
 
         // Calculate the range to fetch
@@ -65,12 +60,16 @@ public function get( $limit = 50, $before = null ): array
             }
         } );
 
-        // Filter, unserialize, and map to Batch objects
-        $batches = array_map( function ( $response ) {
-            return $response ? $this->toBatch( json_decode( $response, true ) ) : null;
-        }, $responses );
+        // Filter, decode, and sort raw batch data
+        $batchesRaw = array_map( fn( $response ) => json_decode( $response, true ), array_filter( $responses ) );
+        uasort( $batchesRaw, function ( $a, $b ) {
+            return $b['created_at'] <=> $a['created_at'];
+        } );
+
+        // Map sorted data to Batch objects and convert to a sequential array
+        $batches = array_values( array_map( fn( $data ) => $this->toBatch( $data ), $batchesRaw ) );
 
-        return array_filter( $batches );
+        return $batches;
     }
 
     public function find( string $batchId )
@@ -327,4 +326,4 @@ protected function pruneBatches( DateTimeInterface $before, $isFinished = null,
 
         return $totalDeleted;
     }
-}
+}
\ No newline at end of file