Entities: Ensured book/shelf relation data removed on destroy

Author: ssddanbrown

app/Entities/Tools/TrashCan.php

@@ -141,6 +141,7 @@ protected function ensureDeletable(Entity $entity): void
     protected function destroyShelf(Bookshelf $shelf): int
     {
         $this->destroyCommonRelations($shelf);
+        $shelf->books()->detach();
         $shelf->forceDelete();
 
         return 1;
@@ -168,6 +169,7 @@ protected function destroyBook(Book $book): int
         }
 
         $this->destroyCommonRelations($book);
+        $book->shelves()->detach();
         $book->forceDelete();
 
         return $count + 1;

tests/Settings/RecycleBinTest.php

@@ -179,6 +179,34 @@ public function test_permanent_entity_delete_updates_existing_activity_with_enti
         ]);
     }
 
+    public function test_permanent_book_delete_removes_shelf_relation_data()
+    {
+        $book = $this->entities->book();
+        $shelf = $this->entities->shelf();
+        $shelf->books()->attach($book);
+        $this->assertDatabaseHas('bookshelves_books', ['book_id' => $book->id]);
+
+        $this->asEditor()->delete($book->getUrl());
+        $deletion = $book->deletions()->firstOrFail();
+        $this->asAdmin()->delete("/settings/recycle-bin/{$deletion->id}")->assertRedirect();
+
+        $this->assertDatabaseMissing('bookshelves_books', ['book_id' => $book->id]);
+    }
+
+    public function test_permanent_shelf_delete_removes_book_relation_data()
+    {
+        $book = $this->entities->book();
+        $shelf = $this->entities->shelf();
+        $shelf->books()->attach($book);
+        $this->assertDatabaseHas('bookshelves_books', ['bookshelf_id' => $shelf->id]);
+
+        $this->asEditor()->delete($shelf->getUrl());
+        $deletion = $shelf->deletions()->firstOrFail();
+        $this->asAdmin()->delete("/settings/recycle-bin/{$deletion->id}")->assertRedirect();
+
+        $this->assertDatabaseMissing('bookshelves_books', ['bookshelf_id' => $shelf->id]);
+    }
+
     public function test_auto_clear_functionality_works()
     {
         config()->set('app.recycle_bin_lifetime', 5);