fix: use getNumericMorphMap to resolve the numeric morph

sourcetoad · Nov 20, 2024 · 9fbc05a · 9fbc05a
1 parent 294cb39
commit 9fbc05a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Commands/AuditModelResolver.php b/src/Commands/AuditModelResolver.php
@@ -3,6 +3,7 @@
 namespace Sourcetoad\Logger\Commands;
 
 use Illuminate\Console\Command;
+use Sourcetoad\Logger\Logger;
 use Sourcetoad\Logger\Helpers\AuditResolver;
 use Sourcetoad\Logger\Models\AuditChange;
 use Sourcetoad\Logger\Models\AuditModel;
@@ -21,7 +22,7 @@ public function handle(): void
 
                 $item->processed = true;
                 $item->owner_id = $owner?->getKey();
-                $item->owner_type = $owner?->getMorphClass();
+                $item->owner_type = !is_null($owner) ? Logger::getNumericMorphMap($owner) : null;
                 $item->saveOrFail();
             }
         });
@@ -33,7 +34,7 @@ public function handle(): void
 
                 $item->processed = true;
                 $item->owner_id = $owner?->getKey();
-                $item->owner_type = $owner?->getMorphClass();
+                $item->owner_type = !is_null($owner) ? Logger::getNumericMorphMap($owner) : null;
                 $item->saveOrFail();
             }
         });

diff --git a/src/Logger.php b/src/Logger.php
@@ -124,7 +124,7 @@ public function logActivity(int $type, array $keys = []): AuditActivity
 
                 $data[] = [
                     'activity_id' => $activity->id,
-                    'entity_type' => $this->getNumericMorphMap($model),
+                    'entity_type' => static::getNumericMorphMap($model),
                     'entity_id'   => $model->getKey(),
                     'key_id'      => $keys->id,
                     'processed'   => false,
@@ -156,7 +156,7 @@ public function logActivity(int $type, array $keys = []): AuditActivity
 
             $data[] = [
                 'activity_id' => $activity->id,
-                'entity_type' => $this->getNumericMorphMap($model),
+                'entity_type' => static::getNumericMorphMap($model),
                 'entity_id'   => $model->getKey(),
                 'processed'   => false,
             ];
@@ -171,7 +171,7 @@ public function logActivity(int $type, array $keys = []): AuditActivity
     // Private functions
     //--------------------------------------------------------------------------------------------------------------
 
-    private function getNumericMorphMap(Model $model): int
+    public static function getNumericMorphMap(Model $model): int
     {
         $fcqn = get_class($model);
         $morphMap = LoggerServiceProvider::$morphs;