Fixed bad prune delete methodology

Prevents deletion during chunk cycle, which would cause bad looping
behaviour.

Author: ssddanbrown

app/Rss/PostPruner.php

@@ -16,23 +16,29 @@ public function prune(int $retentionDays): int
     {
         $day = 86400;
         $oldestAcceptable = time() - ($retentionDays * $day);
-        $deleteCount = 0;
+        $ids = [];
 
         Post::query()
             ->where('published_at', '<', $oldestAcceptable)
             ->select(['id', 'thumbnail'])
-            ->chunk(250, function (Collection $posts) use (&$deleteCount) {
-                $deleteCount += $posts->count();
-                $this->deletePosts($posts);
+            ->chunk(250, function (Collection $posts) use (&$ids) {
+                array_push($ids, ...$posts->pluck('id')->all());
+                $this->deletePostsThumbnails($posts);
             });
 
-        return $deleteCount;
+        foreach (array_chunk($ids, 250) as $idChunk) {
+            Post::query()
+                ->whereIn('id', $idChunk)
+                ->delete();
+        }
+
+        return count($ids);
     }
 
     /**
      * @param Collection<Post> $posts
      */
-    protected function deletePosts(Collection $posts)
+    protected function deletePostsThumbnails(Collection $posts)
     {
         $storage = Storage::disk('public');
 
@@ -41,9 +47,5 @@ protected function deletePosts(Collection $posts)
                 $storage->delete($post->thumbnail);
             }
         }
-
-        Post::query()
-            ->whereIn('id', $posts->pluck('id')->all())
-            ->delete();
     }
 }

database/factories/FeedFactory.php

@@ -16,8 +16,9 @@ class FeedFactory extends Factory
      */
     public function definition()
     {
+        $url = $this->faker->url . '?query=' . random_int(0, 1000);
         return [
-            'url' => $this->faker->url,
+            'url' => $url,
             'last_fetched_at' => now()->subHours(random_int(0, 100))->unix(),
             'last_accessed_at' => time(),
         ];

tests/Feature/Commands/PrunePostsCommandTest.php

@@ -78,4 +78,17 @@ public function test_command_defaults_to_no_action_if_config_false()
 
         $this->assertEquals(1, Post::query()->count());
     }
+
+    public function test_command_deletes_all_posts_in_range()
+    {
+        Post::factory(500)->create(['published_at' => time() - (86400 * 10.1)]);
+
+        $this->assertEquals(500, Post::query()->count());
+
+        $this->artisan('rss:prune-posts --days=3')
+            ->expectsConfirmation('This will delete all posts older than 3 day(s). Do you want to continue?', 'yes')
+            ->assertExitCode(0);
+
+        $this->assertEquals(0, Post::query()->count());
+    }
 }