Adding Messages features

app/Http/Controllers/HerdController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Queries\TradingUsersQuery;
+use App\Queries\MessagesQuery;
 use App\Queries\ElephpantsQuery;
 use App\User;
 use Illuminate\Support\Facades\Auth;
@@ -47,19 +48,13 @@ private function prepareTradePossibilities($elephpants, $userElephpants)
     }
 
 
-    public function show(string $username, TradingUsersQuery $query)
+    public function show(string $username, TradingUsersQuery $query, MessagesQuery $mQuery)
     {
         $user = User::whereUsername($username)->firstOrFail();
         $elephpants = $user->elephpants()->orderBy('year', 'desc')->orderBy('name', 'desc')->get();
         $userElephpants = $user->elephpantsWithQuantity()->toArray();
 
-        $loggedUser = auth()->user();
-
-        if ($loggedUser) {
-            $possibleTrades = $query->fetchAllForUser($loggedUser, $user->id);
-        } else {
-            $possibleTrades = null;
-        }
+        $possibleTrades = $this->getPossibleTrades($user, $query, $mQuery);
 
         $stats = [
             'unique' => $unique = count($userElephpants),
@@ -69,4 +64,19 @@ public function show(string $username, TradingUsersQuery $query)
 
         return view('herd.show', compact('user', 'elephpants', 'stats', 'possibleTrades'));
     }
+
+    private function getPossibleTrades(User $user, TradingUsersQuery $query, MessagesQuery $mQuery)
+    {
+        $loggedUser = auth()->user();
+        $possibleTrades = null;
+
+        if ($loggedUser) {
+            $possibleTrades = $query->fetchAllForUser($loggedUser, $user->id);
+            foreach ($possibleTrades as $tradeUser) {
+                $tradeUser->messages = $mQuery->getMessagesWithLoggedInUserAndSomeoneElse($tradeUser->id);
+            }
+        }
+
+        return $possibleTrades;
+    }
 }

app/Http/Controllers/MessageController.php

@@ -7,6 +7,8 @@
 use App\Message;
 use App\User;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Auth;
+use App\Queries\MessagesQuery;
 
 class MessageController extends Controller
 {
@@ -23,4 +25,12 @@ public function store(MessageRequest $request)
 
         return response()->json(null, 204);
     }
+
+    public function history(MessagesQuery $query)
+    {
+        $interlocutorMessages = $query->getMessagesWithLoggedInUser();
+        $loggedInUser = Auth::user();
+
+        return view('messages.history', compact('interlocutorMessages', 'loggedInUser'));
+    }
 }

app/Http/Controllers/TradeController.php

@@ -3,34 +3,46 @@
 namespace App\Http\Controllers;
 
 use App\Queries\TradingUsersQuery;
+use App\Queries\MessagesQuery;
 use App\User;
 
 class TradeController extends Controller
 {
-    public function index(TradingUsersQuery $query)
+    public function index(TradingUsersQuery $query, MessagesQuery $mQuery)
     {
         /** @var User $loggedUser */
         $loggedUser = auth()->user();
         $users = $query->fetchAll($loggedUser);
 
+        $this->feedMessages($users, $mQuery);
+
         return view('trade.index', compact('users'));
     }
 
-    public function senders(int $elephpantId, TradingUsersQuery $query)
+    public function senders(int $elephpantId, TradingUsersQuery $query, MessagesQuery $mQuery)
     {
         /** @var User $loggedUser */
         $loggedUser = auth()->user();
         $users = $query->fetchAllOnlyIfHeHasElephpant($loggedUser, $elephpantId);
 
+        $this->feedMessages($users, $mQuery);
         return view('trade.index', compact('users'));
     }
 
-    public function receivers(int $elephpantId, TradingUsersQuery $query)
+    public function receivers(int $elephpantId, TradingUsersQuery $query, MessagesQuery $mQuery)
     {
         /** @var User $loggedUser */
         $loggedUser = auth()->user();
         $users = $query->fetchAllWhoLackElephpant($loggedUser, $elephpantId);
+        $this->feedMessages($users, $mQuery);
 
         return view('trade.index', compact('users'));
     }
+
+    private function feedMessages($users, MessagesQuery $mQuery)
+    {
+        foreach ($users as $user) {
+            $user->messages = $mQuery->getMessagesWithLoggedInUserAndSomeoneElse($user->id);
+        }
+    }
 }

app/Message.php

@@ -6,5 +6,20 @@
 
 class Message extends Model
 {
-    protected $fillable = ['receiver_id', 'message'];
+    protected $fillable = ['receiver_id', 'message', 'sender_id', 'created_at'];
+
+    public function sender()
+    {
+        return $this->belongsTo(User::class, 'sender_id');
+    }
+
+    public function receiver()
+    {
+        return $this->belongsTo(User::class, 'receiver_id');
+    }
+
+    public function interlocutor()
+    {
+        return $this->belongsTo(User::class, 'interlocutor_id');
+    }
 }

app/Queries/MessagesQuery.php

@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Queries;
+
+use App\Message;
+use Illuminate\Database\Eloquent\Collection;
+
+final class MessagesQuery
+{
+    public function getMessagesWithLoggedInUser(): Collection
+    {
+        $authUserId = auth()->id();
+
+        return $this->getAllQuery()
+                    ->where(function ($query) use ($authUserId) {
+                        $query->where('m.sender_id', '=', $authUserId)
+                            ->orWhere('m.receiver_id', '=', $authUserId);
+                    })
+                    ->orderBy('m.created_at', 'asc')
+
+                    ->get()
+                    ->groupBy('interlocutor_id');
+    }
+
+    public function getMessagesWithLoggedInUserAndSomeoneElse(int $userId): Collection
+    {
+        $authUserId = auth()->id();
+
+        return $this->getAllQuery()
+                    ->where(function ($query) use ($authUserId, $userId) {
+                        $query->where('m.sender_id', '=', $authUserId)
+                            ->orWhere('m.sender_id', '=', $userId);
+                    })
+                    ->where(function ($query) use ($authUserId, $userId) {
+                        $query->where('m.receiver_id', '=', $userId)
+                            ->orWhere('m.receiver_id', '=', $authUserId);
+                    })
+                    ->orderBy('m.created_at', 'asc')
+                    ->get();
+    }
+
+    public function getAllQuery()
+    {
+        $authUserId = auth()->id();
+
+        return Message::query()
+            ->select([
+                'm.message',
+                'm.created_at',
+                'sender.id as sender_id',
+                'receiver.id as receiver_id',
+                'interlocutor.id as interlocutor_id',
+            ])
+            ->with('sender')
+            ->with('receiver')
+            ->with('interlocutor')
+            ->from('messages as m')
+            ->join('users as sender', 'm.sender_id', '=', 'sender.id')
+            ->join('users as receiver', 'm.receiver_id', '=', 'receiver.id')
+            ->join('users as interlocutor', Message::raw("CASE WHEN m.sender_id = {$authUserId} then m.receiver_id else m.sender_id end"), '=', 'interlocutor.id');
+    }
+
+    public function fetchAll(): Collection
+    {
+        return $this->getAllQuery()
+            ->get();
+    }
+}

public/css/app.css

@@ -13038,3 +13038,30 @@ body {
   font-weight: bold;
 }
 
+.user-message-container .user-message-username {
+  background-color: #3e86f9;
+  color: white;
+  padding: 0.1em 0.5em;
+  border-radius: 0.5em;
+  max-width: 16em;
+  margin: 0 0.1em;
+}
+
+.user-message-container .user-message-timestamp {
+  background-color: #ccc;
+  padding: 0.1em 0.5em;
+  border-radius: 0.5em;
+}
+
+.user-message-container .user-message-text {
+  padding: 0.1em 0.5em;
+}
+
+.messages-exchanges-container .messages-exchanges-list {
+  display: none;
+}
+
+.messages-exchanges-container .messages-exchanges-infotext {
+  line-height: 3em;
+}
+