From: Dan Brown <redacted>
Date: Sun, 23 May 2021 12:41:56 +0000 (+0100)
Subject: Added deletion of favourites on entity/user delete
X-Git-Tag: v21.05~1^2~25^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c2069f37cc9c909c66e89dac6b9b2f2249855f5e

Added deletion of favourites on entity/user delete
---

diff --git a/app/Auth/User.php b/app/Auth/User.php
index 9855ab4e7..2f3c00a4b 100644
--- a/app/Auth/User.php
+++ b/app/Auth/User.php
@@ -1,5 +1,6 @@
 <?php namespace BookStack\Auth;
 
+use BookStack\Actions\Favourite;
 use BookStack\Api\ApiToken;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Interfaces\Loggable;
@@ -240,6 +241,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany(ApiToken::class);
     }
 
+    /**
+     * Get the favourite instances for this user.
+     */
+    public function favourites(): HasMany
+    {
+        return $this->hasMany(Favourite::class);
+    }
+
     /**
      * Get the last activity time for this user.
      */
diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index e437ff1e3..aa7653411 100644
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -184,6 +184,7 @@ class UserRepo
     {
         $user->socialAccounts()->delete();
         $user->apiTokens()->delete();
+        $user->favourites()->delete();
         $user->delete();
         
         // Delete user profile images
diff --git a/app/Entities/Tools/TrashCan.php b/app/Entities/Tools/TrashCan.php
index df98fd318..bf3792835 100644
--- a/app/Entities/Tools/TrashCan.php
+++ b/app/Entities/Tools/TrashCan.php
@@ -317,6 +317,7 @@ class TrashCan
         $entity->jointPermissions()->delete();
         $entity->searchTerms()->delete();
         $entity->deletions()->delete();
+        $entity->favourites()->delete();
 
         if ($entity instanceof HasCoverImage && $entity->cover) {
             $imageService = app()->make(ImageService::class);