From 90323fef5f33e4d0526c198a9e55edb9f8521ced Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 18 Sep 2024 13:30:49 +1000 Subject: [PATCH] Ensure scheduled catalog scan/move jobs ids are unique. Remove deprecated objectType() --- app/Jobs/CatalogMove.php | 6 +++--- app/Jobs/CatalogScan.php | 2 +- app/Models/Abstracted/Catalog.php | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/Jobs/CatalogMove.php b/app/Jobs/CatalogMove.php index 38c72c0..efa95ba 100644 --- a/app/Jobs/CatalogMove.php +++ b/app/Jobs/CatalogMove.php @@ -32,7 +32,7 @@ class CatalogMove implements ShouldQueue,ShouldBeUnique public function middleware(): array { - return [new WithoutOverlapping($this->o->id)]; + return [new WithoutOverlapping($this->o::config.'|'.$this->o->id)]; } /** @@ -43,12 +43,12 @@ class CatalogMove implements ShouldQueue,ShouldBeUnique */ public function handle() { - $from = $this->o->file_name_rel(TRUE); + $from = $this->o->file_name_rel(); $to = $this->o->file_name_rel(FALSE); Log::info(sprintf('%s: Moving [%s|%s] from [%s] to [%s]', __METHOD__, - $this->o->objecttype(), + $this->o::config, $this->o->id, $from, $to, diff --git a/app/Jobs/CatalogScan.php b/app/Jobs/CatalogScan.php index e77bc79..9d5e2af 100644 --- a/app/Jobs/CatalogScan.php +++ b/app/Jobs/CatalogScan.php @@ -32,7 +32,7 @@ class CatalogScan implements ShouldQueue, ShouldBeUnique public function middleware(): array { - return [new WithoutOverlapping($this->o->id)]; + return [new WithoutOverlapping($this->o::config.'|'.$this->o->id)]; } /** diff --git a/app/Models/Abstracted/Catalog.php b/app/Models/Abstracted/Catalog.php index 63e5b44..9b37d0d 100644 --- a/app/Models/Abstracted/Catalog.php +++ b/app/Models/Abstracted/Catalog.php @@ -530,14 +530,6 @@ abstract class Catalog extends Model ->first(); } - /** - * Return my class shortname - */ - public function objectType(): string - { - return (new \ReflectionClass($this))->getShortName(); - } - /** * Get the id of the previous record */