removed get() and latest() references in model scopes

Author: cmgmyr

src/Cmgmyr/Messenger/Models/Message.php

@@ -72,6 +72,6 @@ public function participants()
      */
     public function recipients()
     {
-        return $this->participants()->where('user_id', '!=', $this->user_id)->get();
+        return $this->participants()->where('user_id', '!=', $this->user_id);
     }
 }

src/Cmgmyr/Messenger/Models/Thread.php

@@ -67,7 +67,7 @@ public function participants()
      */
     public static function getAllLatest()
     {
-        return self::latest('updated_at')->get();
+        return self::latest('updated_at');
     }
 
     /**
@@ -99,9 +99,7 @@ public function scopeForUser($query, $userId)
         return $query->join('participants', 'threads.id', '=', 'participants.thread_id')
             ->where('participants.user_id', $userId)
             ->where('participants.deleted_at', null)
-            ->select('threads.*')
-            ->latest('updated_at')
-            ->get();
+            ->select('threads.*');
     }
 
     /**
@@ -120,9 +118,7 @@ public function scopeForUserWithNewMessages($query, $userId)
                 $query->where('threads.updated_at', '>', $this->getConnection()->raw($this->getConnection()->getTablePrefix() . 'participants.last_read'))
                     ->orWhereNull('participants.last_read');
             })
-            ->select('threads.*')
-            ->latest('updated_at')
-            ->get();
+            ->select('threads.*');
     }
 
     /**

src/Cmgmyr/Messenger/examples/MessagesController.php

@@ -32,13 +32,13 @@ public function index()
         $currentUserId = Auth::user()->id;
 
         // All threads, ignore deleted/archived participants
-        $threads = Thread::getAllLatest();
+        $threads = Thread::getAllLatest()->get();
 
         // All threads that user is participating in
-        // $threads = Thread::forUser($currentUserId);
+        // $threads = Thread::forUser($currentUserId)->latest('updated_at')->get();
 
         // All threads that user is participating in, with new messages
-        // $threads = Thread::forUserWithNewMessages($currentUserId);
+        // $threads = Thread::forUserWithNewMessages($currentUserId)->latest('updated_at')->get();
 
         return view('messenger.index', compact('threads', 'currentUserId'));
     }

tests/EloquentThreadTest.php

@@ -63,7 +63,7 @@ public function it_should_return_all_threads()
             $this->faktory->create('thread', ['id' => ($index + 1)]);
         }
 
-        $threads = Thread::getAllLatest();
+        $threads = Thread::getAllLatest()->get();
 
         $this->assertCount($threadCount, $threads);
     }
@@ -100,7 +100,7 @@ public function it_should_get_all_threads_for_a_user()
         $participant_2 = $this->faktory->create('participant', ['user_id' => $userId, 'thread_id' => $thread2->id]);
         $thread2->participants()->saveMany([$participant_2]);
 
-        $threads = Thread::forUser($userId);
+        $threads = Thread::forUser($userId)->get();
         $this->assertCount(2, $threads);
     }
 
@@ -117,7 +117,7 @@ public function it_should_get_all_threads_for_a_user_with_new_messages()
         $participant_2 = $this->faktory->create('participant', ['user_id' => $userId, 'thread_id' => $thread2->id, 'last_read' => Carbon::yesterday()]);
         $thread2->participants()->saveMany([$participant_2]);
 
-        $threads = Thread::forUserWithNewMessages($userId);
+        $threads = Thread::forUserWithNewMessages($userId)->get();
         $this->assertCount(1, $threads);
     }