Ensure entry order is set when using queue

statamic · Nov 13, 2024 · f42a482 · f42a482
1 parent 01b187d
commit f42a482
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Entries/EntryRepository.php b/src/Entries/EntryRepository.php
@@ -86,7 +86,7 @@ public function updateOrders($collection, $ids = null)
             ->when($ids, fn ($query) => $query->whereIn('id', $ids))
             ->get(['id'])
             ->each(function ($entry) {
-                $dispatch = UpdateCollectionEntryOrder::dispatch($entry->id());
+                $dispatch = UpdateCollectionEntryOrder::dispatch($entry->id(), $entry->order());
 
                 $connection = config('statamic.eloquent-driver.collections.update_entry_order_connection', 'default');
 

diff --git a/src/Jobs/UpdateCollectionEntryOrder.php b/src/Jobs/UpdateCollectionEntryOrder.php
@@ -12,16 +12,17 @@ class UpdateCollectionEntryOrder implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable;
 
-    public $entryId;
-
-    public function __construct($entryId)
+    public function __construct(public $entryId, public $order)
     {
-        $this->entryId = $entryId;
     }
 
     public function handle()
     {
         if ($entry = Entry::find($this->entryId)) {
+            if ($this->order) {
+                $entry->order($this->order);
+            }
+
             $entry->save();
         }
     }