character filters: trigger data update event with character instead o…

…f user

src/Events/CharacterFilterDataUpdate.php

@@ -3,6 +3,7 @@
 namespace Seat\Web\Events;
 
 use Illuminate\Queue\SerializesModels;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Web\Models\User;
 
 /**
@@ -12,13 +13,13 @@ class CharacterFilterDataUpdate
 {
     use SerializesModels;
 
-    public User $user;
+    public CharacterInfo $character;
 
     /**
      * @param User $user
      */
-    public function __construct(User $user)
+    public function __construct(CharacterInfo $character)
     {
-        $this->user = $user;
+        $this->character = $character;
     }
 }

src/Listeners/CharacterFilterDataUpdatedSquads.php

@@ -9,7 +9,7 @@ class CharacterFilterDataUpdatedSquads
 {
     public static function handle(CharacterFilterDataUpdate $event)
     {
-        $user = $event->user;
+        $user = $event->character->user;
 
         $member_squads = $user->squads;
 

src/Observers/AbstractCharacterFilterObserver.php

@@ -23,6 +23,7 @@
 namespace Seat\Web\Observers;
 
 use Illuminate\Database\Eloquent\Model;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Web\Events\CharacterFilterDataUpdate;
 use Seat\Web\Exceptions\InvalidFilterException;
 use Seat\Web\Models\Squads\Squad;
@@ -39,9 +40,9 @@ abstract class AbstractCharacterFilterObserver
      * Return the User owning the model which fired the catch event.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $fired_model  The model which fired the catch event
-     * @return \Seat\Web\Models\User|null The user owning this model
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    abstract protected function findRelatedUser(Model $fired_model): ?User;
+    abstract protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo;
 
     /**
      * Update squads to which the user owning model firing the event is member.
@@ -52,11 +53,11 @@ abstract protected function findRelatedUser(Model $fired_model): ?User;
      */
     protected function fireCharacterFilterEvent(Model $fired_model): void
     {
-        $user = $this->findRelatedUser($fired_model);
+        $character = $this->findRelatedCharacter($fired_model);
 
-        if (! $user)
+        if (! $character)
             return;
 
-        event(new CharacterFilterDataUpdate($user));
+        event(new CharacterFilterDataUpdate($character));
     }
 }

src/Observers/CharacterAffiliationObserver.php

@@ -24,6 +24,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Seat\Eveapi\Models\Character\CharacterAffiliation;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Web\Models\User;
 
 /**
@@ -50,15 +51,13 @@ public function updated(CharacterAffiliation $affiliation)
     }
 
     /**
-     * {@inheritdoc}
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    protected function findRelatedUser(Model $fired_model): ?User
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
     {
-        // retrieve user related to the character affiliation
-        return User::with('squads')
-            ->standard()
-            ->whereHas('characters', function ($query) use ($fired_model) {
-                $query->where('character_infos.character_id', $fired_model->character_id);
-            })->first();
+        return $fired_model->character;
     }
 }

src/Observers/CharacterAssetObserver.php

@@ -24,6 +24,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Seat\Eveapi\Models\Assets\CharacterAsset;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Web\Models\User;
 
 /**
@@ -58,15 +59,13 @@ public function deleted(CharacterAsset $asset)
     }
 
     /**
-     * {@inheritdoc}
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    protected function findRelatedUser(Model $fired_model): ?User
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
     {
-        // retrieve user related to the character affiliation
-        return User::with('squads')
-            ->standard()
-            ->whereHas('characters', function ($query) use ($fired_model) {
-                $query->where('character_infos.character_id', $fired_model->character_id);
-            })->first();
+        return $fired_model->character;
     }
 }

src/Observers/CharacterRoleObserver.php

@@ -25,6 +25,7 @@
 use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Seat\Eveapi\Bus\Corporation;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Eveapi\Models\Character\CharacterRole;
 use Seat\Eveapi\Models\RefreshToken;
 use Seat\Web\Models\User;
@@ -79,15 +80,13 @@ public function deleted(CharacterRole $role)
     }
 
     /**
-     * {@inheritdoc}
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    protected function findRelatedUser(Model $fired_model): ?User
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
     {
-        // retrieve user related to the character affiliation
-        return User::with('squads')
-            ->standard()
-            ->whereHas('characters', function ($query) use ($fired_model) {
-                $query->where('character_infos.character_id', $fired_model->character_id);
-            })->first();
+        return $fired_model->character;
     }
 }

src/Observers/CharacterSkillObserver.php

@@ -23,6 +23,7 @@
 namespace Seat\Web\Observers;
 
 use Illuminate\Database\Eloquent\Model;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Eveapi\Models\Character\CharacterSkill;
 use Seat\Web\Models\User;
 
@@ -69,4 +70,15 @@ protected function findRelatedUser(Model $fired_model): ?User
                 $query->where('character_infos.character_id', $fired_model->character_id);
             })->first();
     }
+
+    /**
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
+     */
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
+    {
+        return $fired_model->character;
+    }
 }

src/Observers/CharacterTitleObserver.php

@@ -23,6 +23,7 @@
 namespace Seat\Web\Observers;
 
 use Illuminate\Database\Eloquent\Model;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Eveapi\Pivot\Character\CharacterTitle;
 use Seat\Web\Models\User;
 
@@ -58,15 +59,13 @@ public function deleted(CharacterTitle $title)
     }
 
     /**
-     * {@inheritdoc}
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    protected function findRelatedUser(Model $fired_model): ?User
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
     {
-        // retrieve user related to the character affiliation
-        return User::with('squads')
-            ->standard()
-            ->whereHas('characters', function ($query) use ($fired_model) {
-                $query->where('character_infos.character_id', $fired_model->character_id);
-            })->first();
+        return CharacterInfo::find($fired_model->character_id);
     }
 }

src/Observers/RefreshTokenObserver.php

@@ -25,6 +25,7 @@
 use Exception;
 use Illuminate\Database\Eloquent\Model;
 use Seat\Eveapi\Bus\Character;
+use Seat\Eveapi\Models\Character\CharacterInfo;
 use Seat\Eveapi\Models\RefreshToken;
 use Seat\Web\Models\User;
 
@@ -100,11 +101,13 @@ public function restored(RefreshToken $token)
     }
 
     /**
-     * {@inheritdoc}
+     * Return the User owning the model which fired the catch event.
+     *
+     * @param \Illuminate\Database\Eloquent\Model $fired_model The model which fired the catch event
+     * @return ?CharacterInfo The character that is affected by this update
      */
-    protected function findRelatedUser(Model $fired_model): ?User
+    protected function findRelatedCharacter(Model $fired_model): ?CharacterInfo
     {
-        return User::with('squads')
-            ->find($fired_model->user_id);
+        return $fired_model->character;
     }
 }