Performance optimisations (laravelio#761)

* Migrate to timestamp

* Update last active on save

* Update tests

* Load only required models

* Apply fixes from StyleCI

* Rename column

* Apply fixes from StyleCI

app/Jobs/CreateThread.php

@@ -54,6 +54,7 @@ public function handle(): Thread
             'subject' => $this->subject,
             'body' => $this->body,
             'slug' => $this->subject,
+            'last_activity_at' => now(),
         ]);
         $thread->authoredBy($this->author);
         $thread->syncTags($this->tags);

app/Listeners/MarkLastActivity.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Listeners;
+
+use App\Events\ReplyWasCreated;
+
+final class MarkLastActivity
+{
+    public function handle(ReplyWasCreated $event): void
+    {
+        $replyAble = $event->reply->replyAble();
+        $replyAble->last_activity_at = now();
+        $replyAble->save();
+    }
+}

app/Models/Thread.php

@@ -68,6 +68,13 @@ final class Thread extends Model implements ReplyAble, SubscriptionAble, Feedabl
         'updatedByRelation',
     ];
 
+    /**
+     * {@inheritdoc}
+     */
+    protected $dates = [
+        'last_activity_at',
+    ];
+
     public function id(): int
     {
         return $this->id;
@@ -227,26 +234,12 @@ public static function feedByTagQuery(Tag $tag): Builder
      */
     public static function feedQuery(): Builder
     {
-        return static::with([
-            'solutionReplyRelation',
-            'likesRelation',
-            'repliesRelation',
-            'repliesRelation.authorRelation',
+        return static::withOnly([
             'tagsRelation',
             'authorRelation',
         ])
-            ->leftJoin('replies', function ($join) {
-                $join->on('threads.id', 'replies.replyable_id')
-                    ->where('replies.replyable_type', static::TABLE);
-            })
-            ->orderBy('latest_creation', 'DESC')
-            ->groupBy('threads.id')
-            ->select('threads.*', DB::raw('
-                CASE WHEN COALESCE(MAX(replies.created_at), 0) > threads.created_at
-                THEN COALESCE(MAX(replies.created_at), 0)
-                ELSE threads.created_at
-                END AS latest_creation
-            '));
+        ->withCount(['repliesRelation as reply_count', 'likesRelation as like_count'])
+        ->latest('last_activity_at');
     }
 
     /**

app/Providers/EventServiceProvider.php

@@ -4,6 +4,7 @@
 
 use App\Events\ArticleWasApproved;
 use App\Events\ReplyWasCreated;
+use App\Listeners\MarkLastActivity;
 use App\Listeners\SendArticleApprovedNotification;
 use App\Listeners\SendNewReplyNotification;
 use App\Listeners\StoreTweetIdentifier;
@@ -20,6 +21,7 @@ class EventServiceProvider extends ServiceProvider
     protected $listen = [
         ReplyWasCreated::class => [
             SendNewReplyNotification::class,
+            MarkLastActivity::class,
         ],
         ArticleWasApproved::class => [
             SendArticleApprovedNotification::class,

database/factories/ReplyFactory.php

@@ -15,8 +15,9 @@ public function definition(): array
         return [
             'body' => $this->faker->text(),
             'author_id' => User::factory(),
-            'replyable_id' =>  Thread::factory(),
+            'replyable_id' => Thread::factory(),
             'replyable_type' => Thread::TABLE,
+            'created_at' => $this->faker->dateTimeBetween('-6 months'),
         ];
     }
 }

database/factories/ThreadFactory.php

@@ -16,6 +16,7 @@ public function definition(): array
             'body' => $this->faker->text,
             'slug' => $this->faker->unique()->slug,
             'author_id' => $attributes['author_id'] ?? User::factory(),
+            'created_at' => $this->faker->dateTimeBetween('-6 months'),
         ];
     }
 

database/migrations/2021_11_22_093555_migrate_thread_feed_to_timestamp.php

@@ -0,0 +1,33 @@
+<?php
+
+use App\Models\Thread;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class MigrateThreadFeedToTimestamp extends Migration
+{
+    public function up()
+    {
+        Schema::table('threads', function (Blueprint $table) {
+            $table->timestamp('last_activity_at')
+                ->after('slug')
+                ->nullable()
+                ->index();
+        });
+
+        // Iterate over all the threads and update the `last_active_at` timestamp to
+        // the latest reply `created_at` or thread `created_at` if no reply exists.
+        if (! app()->runningUnitTests()) {
+            Thread::with(['repliesRelation' => function ($query) {
+                $query->latest();
+            }])
+                ->lazy()
+                ->each(function ($thread) {
+                    $thread->update([
+                        'last_activity_at' => ($reply = $thread->replies()->first()) ? $reply->created_at : $thread->created_at,
+                    ]);
+                });
+        }
+    }
+}

resources/views/components/threads/overview-summary.blade.php

@@ -49,13 +49,13 @@
         <div class="flex gap-x-5">
             <span class="flex items-center gap-x-2">
                 <x-heroicon-o-thumb-up class="w-6 h-6" />
-                <span>{{ count($thread->likes()) }}</span>
+                <span>{{ $thread->like_count }}</span>
                 <span class="sr-only">Likes</span>
             </span>
 
             <span class="flex items-center gap-x-2">
                 <x-heroicon-o-chat-alt-2 class="w-6 h-6" />
-                <span>{{ count($thread->replies()) }}</span>
+                <span>{{ $thread->reply_count }}</span>
                 <span class="sr-only">Replies</span>
             </span>
         </div>

tests/Feature/ReplyTest.php

@@ -97,3 +97,17 @@
             'You\'ll need to verify your account before participating in this thread.',
         );
 });
+
+test('replyable activity is updated when reply is created', function () {
+    $thread = Thread::factory()->create(['subject' => 'The first thread', 'slug' => 'the-first-thread']);
+
+    $this->login();
+
+    $this->post('/replies', [
+        'body' => 'The first reply',
+        'replyable_id' => $thread->id,
+        'replyable_type' => Thread::TABLE,
+    ]);
+
+    $this->assertNotNull($thread->fresh()->last_activity_at);
+});

tests/Integration/Models/ThreadTest.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Jobs\CreateReply;
 use App\Models\Reply;
 use App\Models\Thread;
 use App\Models\User;
@@ -81,6 +82,19 @@
     $this->assertTrue($threadFromTwoDaysAgo->is($threads->last()), 'Last thread is incorrect');
 });
 
+it('bumps threads when a reply is added', function () {
+    $threadUpdatedYesterday = createThreadFromYesterday();
+    $threadFromToday = createThreadFromToday();
+    $threadFromTwoDaysAgo = createThreadFromTwoDaysAgo();
+    dispatch_sync(new CreateReply('Hello world', User::factory()->create(), $threadFromTwoDaysAgo));
+
+    $threads = Thread::feed();
+
+    $this->assertTrue($threadFromTwoDaysAgo->is($threads->first()), 'First thread is incorrect');
+    $this->assertTrue($threadFromToday->is($threads->slice(1)->first()), 'Second thread is incorrect');
+    $this->assertTrue($threadUpdatedYesterday->is($threads->last()), 'Last thread is incorrect');
+});
+
 it('can retrieve only resolved threads', function () {
     createThreadFromToday();
     $resolvedThread = createResolvedThread();
@@ -126,21 +140,21 @@ function createThreadFromToday(): Thread
 {
     $today = Carbon::now();
 
-    return Thread::factory()->create(['created_at' => $today]);
+    return Thread::factory()->create(['created_at' => $today, 'last_activity_at' => $today]);
 }
 
 function createThreadFromYesterday(): Thread
 {
     $yesterday = Carbon::yesterday();
 
-    return Thread::factory()->create(['created_at' => $yesterday]);
+    return Thread::factory()->create(['created_at' => $yesterday, 'last_activity_at' => $yesterday]);
 }
 
 function createThreadFromTwoDaysAgo(): Thread
 {
     $twoDaysAgo = Carbon::now()->subDay(2);
 
-    return Thread::factory()->create(['created_at' => $twoDaysAgo]);
+    return Thread::factory()->create(['created_at' => $twoDaysAgo, 'last_activity_at' => $twoDaysAgo]);
 }
 
 function createResolvedThread()