Fix URI and related issues (#317)

Co-authored-by: Ryan Mitchell <[email protected]>

Author: jasonvarga

composer.json

@@ -25,7 +25,7 @@
     },
     "require": {
         "php": "^8.1",
-        "statamic/cms": "^5.12"
+        "statamic/cms": "^5.14"
     },
     "require-dev": {
         "doctrine/dbal": "^3.8",

src/Collections/CollectionRepository.php

@@ -4,22 +4,11 @@
 
 use Illuminate\Support\Collection as IlluminateCollection;
 use Statamic\Contracts\Entries\Collection as CollectionContract;
-use Statamic\Eloquent\Jobs\UpdateCollectionEntryOrder;
 use Statamic\Facades\Blink;
 use Statamic\Stache\Repositories\CollectionRepository as StacheRepository;
 
 class CollectionRepository extends StacheRepository
 {
-    public function updateEntryUris($collection, $ids = null)
-    {
-        $query = $collection->queryEntries()
-            ->when($ids, fn ($query) => $query->whereIn('id', $ids))
-            ->get()
-            ->each(function ($entry) {
-                app('statamic.eloquent.entries.model')::find($entry->id())->update(['uri' => $entry->uri()]);
-            });
-    }
-
     public function all(): IlluminateCollection
     {
         return Blink::once('eloquent-collections', function () {
@@ -76,22 +65,4 @@ public static function bindings(): array
             CollectionContract::class => Collection::class,
         ];
     }
-
-    public function updateEntryOrder(CollectionContract $collection, $ids = null)
-    {
-        $query = $collection->queryEntries()
-            ->when($ids, fn ($query) => $query->whereIn('id', $ids))
-            ->get(['id'])
-            ->each(function ($entry) {
-                $dispatch = UpdateCollectionEntryOrder::dispatch($entry->id());
-
-                $connection = config('statamic.eloquent-driver.collections.update_entry_order_connection', 'default');
-
-                if ($connection != 'default') {
-                    $dispatch->onConnection($connection);
-                }
-
-                $dispatch->onQueue(config('statamic.eloquent-driver.collections.update_entry_order_queue', 'default'));
-            });
-    }
 }

src/Entries/Entry.php

@@ -100,7 +100,17 @@ public static function makeModelFromContract(EntryContract $source)
 
         $dataMappings = (new self)->getDataColumnMappings(new $class);
 
+        $attributes = [];
+
+        if ($id = $source->id()) {
+            $attributes['id'] = $id;
+
+            // Ensure that when calling $source->uri() that it doesn't use the cached value.
+            Blink::store('entry-uris')->forget($source->id());
+        }
+
         $attributes = [
+            ...$attributes,
             'origin_id' => $origin?->id(),
             'site' => $source->locale(),
             'slug' => $source->slug(),
@@ -118,10 +128,6 @@ public static function makeModelFromContract(EntryContract $source)
             $attributes[$key] = $data->get($key);
         }
 
-        if ($id = $source->id()) {
-            $attributes['id'] = $id;
-        }
-
         return $class::findOrNew($id)->fill($attributes);
     }
 

src/Entries/EntryRepository.php

@@ -4,6 +4,8 @@
 
 use Statamic\Contracts\Entries\Entry as EntryContract;
 use Statamic\Contracts\Entries\QueryBuilder;
+use Statamic\Eloquent\Jobs\UpdateCollectionEntryOrder;
+use Statamic\Eloquent\Jobs\UpdateCollectionEntryParent;
 use Statamic\Facades\Blink;
 use Statamic\Stache\Repositories\EntryRepository as StacheRepository;
 
@@ -67,4 +69,50 @@ public function delete($entry)
 
         $entry->model()->delete();
     }
+
+    public function updateUris($collection, $ids = null)
+    {
+        $ids = collect($ids);
+
+        $collection->queryEntries()
+            ->when($ids->isNotEmpty(), fn ($query) => $query->whereIn('id', $ids))
+            ->get()
+            ->each(fn ($entry) => $entry->model()->update(['uri' => $entry->uri()]));
+    }
+
+    public function updateOrders($collection, $ids = null)
+    {
+        $collection->queryEntries()
+            ->when($ids, fn ($query) => $query->whereIn('id', $ids))
+            ->get(['id'])
+            ->each(function ($entry) {
+                $dispatch = UpdateCollectionEntryOrder::dispatch($entry->id());
+
+                $connection = config('statamic.eloquent-driver.collections.update_entry_order_connection', 'default');
+
+                if ($connection != 'default') {
+                    $dispatch->onConnection($connection);
+                }
+
+                $dispatch->onQueue(config('statamic.eloquent-driver.collections.update_entry_order_queue', 'default'));
+            });
+    }
+
+    public function updateParents($collection, $ids = null)
+    {
+        $collection->queryEntries()
+            ->when($ids, fn ($query) => $query->whereIn('id', $ids))
+            ->get(['id'])
+            ->each(function ($entry) {
+                $dispatch = UpdateCollectionEntryParent::dispatch($entry->id());
+
+                $connection = config('statamic.eloquent-driver.collections.update_entry_parent_connection', 'default');
+
+                if ($connection != 'default') {
+                    $dispatch->onConnection($connection);
+                }
+
+                $dispatch->onQueue(config('statamic.eloquent-driver.collections.update_entry_parent_queue', 'default'));
+            });
+    }
 }

src/Jobs/UpdateCollectionEntryParent.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Statamic\Eloquent\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Statamic\Facades\Entry;
+
+class UpdateCollectionEntryParent implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable;
+
+    public $entryId;
+
+    public function __construct($entryId)
+    {
+        $this->entryId = $entryId;
+    }
+
+    public function handle()
+    {
+        if ($entry = Entry::find($this->entryId)) {
+            $entry->save();
+        }
+    }
+}

src/Listeners/UpdateStructuredEntryOrder.php

@@ -31,7 +31,6 @@
 use Statamic\Eloquent\Forms\SubmissionRepository;
 use Statamic\Eloquent\Globals\GlobalRepository;
 use Statamic\Eloquent\Globals\GlobalVariablesRepository;
-use Statamic\Eloquent\Listeners\UpdateStructuredEntryOrder;
 use Statamic\Eloquent\Revisions\RevisionRepository;
 use Statamic\Eloquent\Structures\CollectionTreeRepository;
 use Statamic\Eloquent\Structures\NavigationRepository;
@@ -40,7 +39,6 @@
 use Statamic\Eloquent\Taxonomies\TermQueryBuilder;
 use Statamic\Eloquent\Taxonomies\TermRepository;
 use Statamic\Eloquent\Tokens\TokenRepository;
-use Statamic\Events\CollectionTreeSaved;
 use Statamic\Providers\AddonServiceProvider;
 use Statamic\Statamic;
 
@@ -61,12 +59,6 @@ class ServiceProvider extends AddonServiceProvider
         \Statamic\Eloquent\Updates\ChangeFormSubmissionsIdType::class,
     ];
 
-    protected $listen = [
-        CollectionTreeSaved::class => [
-            UpdateStructuredEntryOrder::class,
-        ],
-    ];
-
     public function boot()
     {
         parent::boot();