Fix for overriding urls to update/delete

silverstripe · Apr 4, 2023 · 76f9e1c · 76f9e1c
1 parent 8c24101
commit 76f9e1c
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/src/Extension/Engine/SiteTreePublishingEngine.php b/src/Extension/Engine/SiteTreePublishingEngine.php
@@ -64,22 +64,32 @@ public static function setQueueService(QueuedJobService $service): void
         static::$queueService = $service;
     }
 
-    public function getUrlsToUpdate(): array
+    protected function getUrlsToUpdate(): array
     {
         return $this->urlsToUpdate;
     }
 
-    public function getUrlsToDelete(): array
+    protected function getUrlsToDelete(): array
     {
         return $this->urlsToDelete;
     }
 
-    public function setUrlsToUpdate(array $urlsToUpdate): void
+    protected function addUrlsToUpdate(array $urlsToUpdate): void
+    {
+        $this->urlsToUpdate = array_merge($this->getUrlsToUpdate(), $urlsToUpdate);
+    }
+
+    protected function addUrlsToDelete(array $urlsToDelete): void
+    {
+        $this->urlsToDelete = array_merge($this->getUrlsToDelete(), $urlsToDelete);
+    }
+
+    protected function setUrlsToUpdate(array $urlsToUpdate): void
     {
         $this->urlsToUpdate = $urlsToUpdate;
     }
 
-    public function setUrlsToDelete(array $urlsToDelete): void
+    protected function setUrlsToDelete(array $urlsToDelete): void
     {
         $this->urlsToDelete = $urlsToDelete;
     }
@@ -195,8 +205,8 @@ public function collectChanges(array $context): void
                 $urlsToDelete = array_merge($urlsToDelete, $objectToDelete->urlsToCache());
             }
 
-            $this->setUrlsToUpdate($urlsToUpdate);
-            $this->setUrlsToDelete($urlsToDelete);
+            $this->addUrlsToUpdate($urlsToUpdate);
+            $this->addUrlsToDelete($urlsToDelete);
         });
     }
 
@@ -206,6 +216,7 @@ public function collectChanges(array $context): void
     public function flushChanges()
     {
         $queueService = static::$queueService ?? QueuedJobService::singleton();
+        $owner = $this->getOwner();
         $urlsToUpdate = $this->getUrlsToUpdate();
         $urlsToDelete = $this->getUrlsToDelete();
 
@@ -214,27 +225,27 @@ public function flushChanges()
             $urlService = Injector::inst()->create(UrlBundleInterface::class);
             $urlService->addUrls($urlsToUpdate);
 
-            $jobs = $urlService->getJobsForUrls(GenerateStaticCacheJob::class, 'Building URLs', $this->owner);
+            $jobs = $urlService->getJobsForUrls(GenerateStaticCacheJob::class, 'Building URLs', $owner);
 
             foreach ($jobs as $job) {
                 $queueService->queueJob($job);
             }
 
-            $this->urlsToUpdate = [];
+            $this->setUrlsToUpdate([]);
         }
 
         if ($urlsToDelete) {
             /** @var UrlBundleInterface $urlService */
             $urlService = Injector::inst()->create(UrlBundleInterface::class);
             $urlService->addUrls($urlsToDelete);
 
-            $jobs = $urlService->getJobsForUrls(DeleteStaticCacheJob::class, 'Purging URLs', $this->owner);
+            $jobs = $urlService->getJobsForUrls(DeleteStaticCacheJob::class, 'Purging URLs', $owner);
 
             foreach ($jobs as $job) {
                 $queueService->queueJob($job);
             }
 
-            $this->urlsToDelete = [];
+            $this->setUrlsToDelete([]);
         }
     }
 }