Support for unix dates

src/Cursor.php

@@ -6,6 +6,7 @@ class Cursor
 {
     protected $prev = null;
     protected $next = null;
+    protected $date_identifier = false;
 
     /**
      * Cursor constructor.
@@ -19,6 +20,14 @@ public function __construct($prev = null, $next = null)
         $this->next = $next;
     }
 
+    /**
+     * @param bool $value
+     */
+    public function setDateIdentifier($value = true)
+    {
+        $this->date_identifier = $value;
+    }
+
     /**
      * @return bool
      */
@@ -58,4 +67,32 @@ public function getNextCursor()
     {
         return $this->next;
     }
+
+    /**
+     * @return mixed
+     */
+    public function getPrevQuery()
+    {
+        $prev = $this->getPrevCursor();
+
+        if ($this->date_identifier && is_numeric($prev)) {
+            return date('c', $prev);
+        }
+
+        return $prev;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getNextQuery()
+    {
+        $next = $this->getNextCursor();
+
+        if ($this->date_identifier && is_numeric($next)) {
+            return date('c', $next);
+        }
+
+        return $next;
+    }
 }

src/CursorPaginationServiceProvider.php

@@ -66,25 +66,32 @@ public function registerMacro()
                 $identifier_sort = $query_orders->firstWhere('column', $options['identifier']);
             }
 
+            if (!isset($options['request'])) {
+                $options['request'] = request();
+            }
+
             if (!isset($options['date_identifier']) && isset($this->model)) {
                 $options['date_identifier'] = $this->model->hasCast($options['identifier'], ['datetime', 'date']);
             }
 
-            if (!isset($options['request'])) {
-                $options['request'] = request();
-            }
 
             // Resolve the cursor by using the request query params
             $cursor = CursorPaginator::resolveCurrentCursor($options['request']);
 
+            if (isset($options['date_identifier']) && $options['date_identifier']) {
+                // Also check that the database does not contain unix dates.
+                $not_using_unix = !(isset($options['date_unix']) && $options['date_unix']);
+                $cursor->setDateIdentifier($not_using_unix);
+            }
+
             // If there's a sorting by the identifier, check if it's desc so the cursor is inverted
             $identifier_sort_inverted = $identifier_sort ? $identifier_sort['direction'] === 'desc' : false;
 
             if ($cursor->isPrev()) {
-                $this->where($options['identifier'], $identifier_sort_inverted ? '>' : '<', $cursor->getPrevCursor());
+                $this->where($options['identifier'], $identifier_sort_inverted ? '>' : '<', $cursor->getPrevQuery());
             }
             if ($cursor->isNext()) {
-                $this->where($options['identifier'], $identifier_sort_inverted ? '<' : '>', $cursor->getNextCursor());
+                $this->where($options['identifier'], $identifier_sort_inverted ? '<' : '>', $cursor->getNextQuery());
             }
 
             // Use configs perPage if it's not defined

tests/RequestTest.php

@@ -167,8 +167,6 @@ public function test_inverted_order()
 
         $response = $this->get("/test/inverse?$next_name=$next_cur");
 
-        //dd(json_decode($response->getOriginalContent()));
-
         $response->assertJsonFragment([$prev_name => null]);
         $response->assertJsonFragment([$next_name => (string) ($next_cur - 5)]);
         $response->assertJsonFragment(['per_page' => config('cursor_pagination.per_page')]);