Merge pull request #9 from schnittstabil/grandchildren

Fix deletion of grandchildren

Author: michaeldyrynda

src/CascadeSoftDeletes.php

@@ -33,8 +33,12 @@ protected static function bootCascadeSoftDeletes()
                 ));
             }
 
+            $delete = $model->forceDeleting ? 'forceDelete' : 'delete';
+
             foreach ($model->getCascadingDeletes() as $relationship) {
-                $model->forceDeleting ? $model->{$relationship}()->forceDelete() : $model->{$relationship}()->delete();
+                foreach ($model->{$relationship} as $child) {
+                    $child->{$delete}();
+                }
             }
         });
     }

tests/CascadeSoftDeletesIntegrationTest.php

@@ -21,8 +21,16 @@ public static function setupBeforeClass()
         $manager->setAsGlobal();
         $manager->bootEloquent();
 
+        $manager->schema()->create('authors', function ($table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
         $manager->schema()->create('posts', function ($table) {
             $table->increments('id');
+            $table->integer('author_id')->unsigned()->nullable();
             $table->string('title');
             $table->string('body');
             $table->timestamps();
@@ -170,6 +178,54 @@ public function it_handles_soft_deletes_inherited_from_a_parent_model()
         $this->assertCount(0, Tests\Entities\Comment::where('post_id', $post->id)->get());
     }
 
+    /** @test */
+    public function it_handles_grandchildren()
+    {
+        $author = Tests\Entities\Author::create([
+            'name' => 'Testing grandchildren are deleted',
+        ]);
+
+        $this->attachPostsAndCommentsToAuthor($author);
+
+        $author->delete();
+
+        $this->assertNull(Tests\Entities\Author::find($author->id));
+        $this->assertCount(1, Tests\Entities\Author::withTrashed()->where('id', $author->id)->get());
+        $this->assertCount(0, Tests\Entities\Post::where('author_id', $author->id)->get());
+
+        $deletedPosts = Tests\Entities\Post::withTrashed()->where('author_id', $author->id)->get();
+        $this->assertCount(2, $deletedPosts);
+
+        foreach ($deletedPosts as $deletedPost) {
+            $this->assertCount(0, Tests\Entities\Comment::where('post_id', $deletedPost->id)->get());
+        }
+    }
+
+    /**
+     * Attach some dummy posts (w/ comments) to the given author.
+     *
+     * @return void
+     */
+    private function attachPostsAndCommentsToAuthor($author)
+    {
+        $author->posts()->saveMany([
+            $this->attachCommentsToPost(
+                Tests\Entities\Post::create([
+                    'title' => 'First post',
+                    'body'  => 'This is the first test post',
+                ])
+            ),
+            $this->attachCommentsToPost(
+                Tests\Entities\Post::create([
+                    'title' => 'Second post',
+                    'body'  => 'This is the second test post',
+                ])
+            ),
+        ]);
+
+        return $author;
+    }
+
     /**
      * Attach some dummy comments to the given post.
      *
@@ -182,6 +238,8 @@ private function attachCommentsToPost($post)
             new Tests\Entities\Comment(['body' => 'This is the second test comment']),
             new Tests\Entities\Comment(['body' => 'This is the third test comment']),
         ]);
+
+        return $post;
     }
 
 }

tests/Entities/Author.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Entities;
+
+use Iatstuti\Database\Support\CascadeSoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Author extends Model
+{
+    use SoftDeletes, CascadeSoftDeletes;
+
+    public $dates = ['deleted_at'];
+
+    protected $cascadeDeletes = ['posts'];
+
+    protected $fillable = ['name'];
+
+    public function posts()
+    {
+        return $this->hasMany('Tests\Entities\Post');
+    }
+}