Repair: copy legacy joinDate into new user's created_at when creating users from legacy wallz

app/Http/Controllers/Api/Messaging/ConversationController.php

@@ -9,10 +9,11 @@ use App\Http\Requests\Messaging\RenameConversationRequest;
 use App\Http\Requests\Messaging\StoreConversationRequest;
 use App\Models\Conversation;
 use App\Models\ConversationParticipant;
-use App\Models\Message;
 use App\Models\User;
+use App\Services\Messaging\ConversationReadService;
 use App\Services\Messaging\ConversationStateService;
 use App\Services\Messaging\SendMessageAction;
+use App\Services\Messaging\UnreadCounterService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@@ -23,7 +24,9 @@ class ConversationController extends Controller
 {
     public function __construct(
         private readonly ConversationStateService $conversationState,
+        private readonly ConversationReadService $conversationReads,
         private readonly SendMessageAction $sendMessage,
+        private readonly UnreadCounterService $unreadCounters,
     ) {}
 
     // ── GET /api/messages/conversations ─────────────────────────────────────
@@ -36,26 +39,13 @@ class ConversationController extends Controller
         $cacheKey = $this->conversationListCacheKey($user->id, $page, $cacheVersion);
 
         $conversations = Cache::remember($cacheKey, now()->addSeconds(20), function () use ($user, $page) {
-            return Conversation::query()
+            $query = Conversation::query()
                 ->select('conversations.*')
                 ->join('conversation_participants as cp_me', function ($join) use ($user) {
                     $join->on('cp_me.conversation_id', '=', 'conversations.id')
                         ->where('cp_me.user_id', '=', $user->id)
                         ->whereNull('cp_me.left_at');
                 })
-                ->addSelect([
-                    'unread_count' => Message::query()
-                        ->selectRaw('count(*)')
-                        ->whereColumn('messages.conversation_id', 'conversations.id')
-                        ->where('messages.sender_id', '!=', $user->id)
-                        ->whereNull('messages.deleted_at')
-                        ->where(function ($query) {
-                            $query->whereNull('cp_me.last_read_message_id')
-                                ->whereNull('cp_me.last_read_at')
-                                ->orWhereColumn('messages.id', '>', 'cp_me.last_read_message_id')
-                                ->orWhereColumn('messages.created_at', '>', 'cp_me.last_read_at');
-                        }),
-                ])
                 ->where('conversations.is_active', true)
                 ->with([
                     'allParticipants' => fn ($q) => $q->whereNull('left_at')->with(['user:id,username']),
@@ -64,8 +54,11 @@ class ConversationController extends Controller
                 ->orderByDesc('cp_me.is_pinned')
                 ->orderByDesc('cp_me.pinned_at')
                 ->orderByDesc('last_message_at')
-                ->orderByDesc('conversations.id')
-                ->paginate(20, ['conversations.*'], 'page', $page);
+                ->orderByDesc('conversations.id');
+
+            $this->unreadCounters->applyUnreadCountSelect($query, $user, 'cp_me');
+
+            return $query->paginate(20, ['conversations.*'], 'page', $page);
         });
 
         $conversations->through(function ($conv) use ($user) {
@@ -74,7 +67,12 @@ class ConversationController extends Controller
             return $conv;
         });
 
-        return response()->json($conversations);
+        return response()->json([
+            ...$conversations->toArray(),
+            'summary' => [
+                'unread_total' => $this->unreadCounters->totalUnreadForUser($user),
+            ],
+        ]);
     }
 
     // ── GET /api/messages/conversation/{id} ─────────────────────────────────
@@ -110,7 +108,7 @@ class ConversationController extends Controller
     public function markRead(Request $request, int $id): JsonResponse
     {
         $conversation = $this->findAuthorized($request, $id);
-        $participant = $this->conversationState->markConversationRead(
+        $participant = $this->conversationReads->markConversationRead(
             $conversation,
             $request->user(),
             $request->integer('message_id') ?: null,
@@ -120,6 +118,7 @@ class ConversationController extends Controller
             'ok' => true,
             'last_read_at' => optional($participant->last_read_at)?->toIso8601String(),
             'last_read_message_id' => $participant->last_read_message_id,
+            'unread_total' => $this->unreadCounters->totalUnreadForUser($request->user()),
         ]);
     }