Add default sort

enjin · Sep 6, 2023 · 772b0d4 · 772b0d4
1 parent c6fb621
commit 772b0d4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Models/Laravel/Traits/EagerLoadSelectFields.php b/src/Models/Laravel/Traits/EagerLoadSelectFields.php
@@ -82,7 +82,8 @@ public static function loadBeams(
             $with = [
                 $key => function ($query) use ($select, $args) {
                     $query->select(array_unique($select))
-                        ->when(Arr::get($args, 'after'), fn ($q) => $q->where('id', '>', Cursor::fromEncoded($args['after'])->parameter('id')));
+                        ->when($cursor = Cursor::fromEncoded(Arr::get($args, 'after')), fn ($q) => $q->where('id', '>', $cursor->parameter('id')))
+                        ->orderBy('beams.id');
                     // This must be done this way to load eager limit correctly.
                     if ($limit = Arr::get($args, 'first')) {
                         $query->limit($limit + 1);
@@ -139,7 +140,8 @@ public static function loadClaims(
             $with = [
                 $key => function ($query) use ($select, $args) {
                     $query->select(array_unique($select))
-                        ->when(Arr::get($args, 'after'), fn ($q) => $q->where('id', '>', Cursor::fromEncoded($args['after'])->parameter('id')));
+                        ->when($cursor = Cursor::fromEncoded(Arr::get($args, 'after')), fn ($q) => $q->where('id', '>', $cursor->parameter('id')))
+                        ->orderBy('beam_claims.id');
                     // This must be done this way to load eager limit correctly.
                     if ($limit = Arr::get($args, 'first')) {
                         $query->limit($limit + 1);