Add metas column to Message (#22)

* Add metas column to Message * updated `WhereHasLastMessage` query with `type` column * added token to message request validator * suspended passing type prop * updated WhereHasLastMessage query with type column * added token to message request validator * suspended passing type prop * Added metas to create message * removed metas ref * formatting Co-authored-by: Michael Ishola <[email protected]>
binkode · Jul 1, 2021 · 8830185 · 8830185
1 parent a86bcac
commit 8830185
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 183 deletions.
diff --git a/config/chat-system.php b/config/chat-system.php
@@ -10,7 +10,6 @@
     "conversation_user"  => "Myckhel\\ChatSystem\\Models\\ConversationUser",
     "message"       => "Myckhel\\ChatSystem\\Models\\Message",
     "chat_event"    => "Myckhel\\ChatSystem\\Models\\ChatEvent",
-    "meta"          => "Myckhel\\ChatSystem\\Models\\Meta",
   ],
 
   /*

diff --git a/database/migrations/2021_03_08_193929_create_messages_table.php b/database/migrations/2021_03_08_193929_create_messages_table.php
@@ -23,6 +23,7 @@ public function up()
             $table->nullableMorphs('reply');
             $table->text('message')->nullable();
             $table->enum('type', ['user', 'system', 'activity'])->default('user')->index();
+            $table->json('metas')->nullable();
             $table->timestamps();
         });
     }

diff --git a/database/migrations/2021_04_06_181727_create_metas_table.php b/database/migrations/2021_04_06_181727_create_metas_table.php
diff --git a/src/Events/Message/Created.php b/src/Events/Message/Created.php
@@ -31,7 +31,6 @@ public function broadcastAs() {
     }
 
     function broadcastWith() {
-      $this->message->metas->keyValue();
       return [
         'message' => $this->message,
       ];

diff --git a/src/Http/Controllers/MessageController.php b/src/Http/Controllers/MessageController.php
@@ -60,11 +60,8 @@ public function index(PaginableRequest $request)
       // ->withUrls(['image', 'videos'])
       ->whereConversationWasntDeleted($user)
       ->with($with)->latest()
-      ->metas(['token'])
       ->paginate($request->pageSize);
 
-      $messages->map(fn ($msg) => $msg->metas->keyValue());
-
       // $messages->withUrls(['image', 'videos']);
       return $messages;
     }
@@ -100,6 +97,7 @@ public function store(Request $request)
         'other_user_id'   => ['int', Rule::requiredIf(fn () => !$request->conversation_id)],
         'message'         => '',
         'reply_id'        => 'int',
+        'token'           => 'string',
         'reply_type'      => [
           Rule::requiredIf(fn () => $request->reply_id),
           "in:".Config::config('models.message'),
@@ -125,10 +123,7 @@ public function store(Request $request)
       $message = $conversation->messages()
       ->when(
         $token,
-        fn ($q) => $q->whereHas('metas', fn ($q) =>
-          $q->whereMetableType(Config::config('models.message'))
-          ->whereName('token')->whereValue($token)
-        ),
+        fn ($q) => $q->where('metas->token', $token),
         fn ($q) => $q->whereNull('id')
       )
       ->firstOrCreate([],
@@ -138,24 +133,20 @@ public function store(Request $request)
           'user_id'         => $user->id,
           'message'         => $request->message,
           'type'            => $type ?? 'user',
+          'metas'           => $token ? ['token' => $token] : null,
         ]
       );
       $message->loadMorph('reply', [
           Config::config('models.message') => ['reply'],
       ]);
 
       if ($message->wasRecentlyCreated) {
-        if ($token) {
-          $meta = ['name' => 'token', 'value' => $token];
-          $message->addMeta($meta, $meta);
-        }
 
         // $message->saveImage($image, 'image');
         // $message->saveVideo($videos, 'videos');
 
         broadcast(new Created($message));
 
-        $token && $message->metas->keyValue();
         // $otherUser->notify(new CreatedMessage($message, $user));
       }
 

diff --git a/src/Models/Conversation.php b/src/Models/Conversation.php
@@ -24,7 +24,7 @@ protected static function newFactory(){
 
   function scopeWhereHasLastMessage($q, $user = null) {
     $q->whereHas('last_message', fn ($q) =>
-      $q->whereDoesntHave('metas', fn ($q) => $q->whereName('system'))
+      $q->where('type', '!=', 'system')
       ->whereConversationWasntDeleted($user)
     );
   }

diff --git a/src/Models/Message.php b/src/Models/Message.php
@@ -11,15 +11,14 @@
 use Carbon\Carbon;
 use Myckhel\ChatSystem\Traits\ChatEvent\HasChatEvent;
 use Myckhel\ChatSystem\Contracts\ChatEventMaker;
-use Myckhel\ChatSystem\Traits\HasMeta;
 use Myckhel\ChatSystem\Database\Factories\MessageFactory;
 use Myckhel\ChatSystem\Traits\Config;
 
 class Message extends Model
 {
-    use HasFactory, HasChatEvent, HasMeta, Config;
-    protected $fillable = ['conversation_id', 'user_id', 'reply_id', 'reply_type', 'message', 'type'];
-    protected $casts    = ['conversation_id' => 'int', 'reply_id' => 'int', 'user_id' => 'int'];
+    use HasFactory, HasChatEvent, Config;
+    protected $fillable = ['conversation_id', 'user_id', 'reply_id', 'reply_type', 'message', 'type', 'metas'];
+    protected $casts    = ['conversation_id' => 'int', 'reply_id' => 'int', 'user_id' => 'int', 'metas' => 'array'];
     protected $searches = ['message'];
     protected $appends  = ['isSender'];
     protected $hidden   = ['media'];

diff --git a/src/Models/Meta.php b/src/Models/Meta.php
diff --git a/src/Traits/HasMeta.php b/src/Traits/HasMeta.php
diff --git a/src/Traits/Message/HasMessage.php b/src/Traits/Message/HasMessage.php
@@ -15,7 +15,7 @@ trait HasMessage
   function messages($conversation = null, $otherUser = null, Array $reply = [], $type = 'private'){
     if ($type == 'private') {
       if ($conversation || $otherUser) {
-        $conversation = $this->conversations($conversation, $otherUser, type: [$type])->first();
+        $conversation = $this->conversations($conversation, $otherUser)->first();
         // if conversation doesnt exist and add participant
         if (!$conversation) {
           $conversation = $this->conversations()->create([