Already deleted items should not be in the affectedRows

Author: gcphost

src/SoftCascade.php

@@ -199,7 +199,12 @@ protected function execute($relation, $foreignKey, $foreignKeyIds, $affectedRows
         $relationModel = $relation->getQuery()->getModel();
         $relationModel = new $relationModel();
         if ($affectedRows > 0) {
-            $relationModel = $relationModel->withTrashed()->whereIn($foreignKey, $foreignKeyIds)->limit($affectedRows);
+            if ($this->direction != 'delete') {
+                $relationModel = $relationModel->withTrashed();
+            }
+
+            $relationModel = $relationModel->whereIn($foreignKey, $foreignKeyIds)->limit($affectedRows);
+
             $this->run($relationModel->get([$relationModel->getModel()->getKeyName()]));
             $relationModel->{$this->direction}($this->directionData);
         }
@@ -253,7 +258,11 @@ protected function affectedRows($relation, $foreignKey, $foreignKeyIds)
         $relationModel = $relation->getQuery()->getModel();
         $relationModel = new $relationModel();
 
-        return $relationModel->withTrashed()->whereIn($foreignKey, $foreignKeyIds)->count();
+        if ($this->direction != 'delete') {
+            $relationModel = $relationModel->withTrashed();
+        }
+
+        return $relationModel->whereIn($foreignKey, $foreignKeyIds)->count();
     }
 
     /**

tests/IntegrationTest.php

@@ -248,6 +248,23 @@ public function testMultipleDelete()
         $this->assertEquals(1, Profiles::count());
     }
 
+    public function testKeepDeletedDates()
+    {
+        $this->createPostAndCategoriesRaw();
+        $post = Post::first();
+        $post->deleted_at = '2011-01-01';
+        $post->save();
+        $this->assertSoftDeleted('posts', ['id' => $post->id]);
+        $categoryToDelete = Category::with('posts')->first();
+        $categoryToDelete->delete();
+        $this->assertSoftDeleted('categories', ['id' => $categoryToDelete->id]);
+        $categoryToDelete->posts->each(function ($post) {
+            $this->assertSoftDeleted('posts', ['id' => $post->id]);
+        });
+        $posts = Post::withTrashed()->get();
+        $this->assertNotEquals($posts->first()->deleted_at, $posts->last()->deleted_at);
+    }
+
     public function testMultipleRestore()
     {
         $this->createUserRaw();