Merge pull request #3 from 7span/hotfix/channel-response-change

Change the response of create and listing channel

Author: kajal-7span

src/Channel.php

@@ -13,12 +13,20 @@
 
 class Channel
 {
-    public function list(int $userId, int $perPage = null)
+    public function list(int $userId = null, array $channelIds = [], int $perPage = null)
     {
         $channels = ChannelModel::select('channels.id', 'name', 'channel_id', 'unread_message_count')
-            ->join('channel_users', 'channels.id', '=', 'channel_users.channel_id')
-            ->where('channel_users.user_id', $userId)
-            ->orderBy('channel_users.unread_message_count', 'DESC');
+            ->join('channel_users', 'channels.id', '=', 'channel_users.channel_id');
+
+        if (!empty($userId)) {
+            $channels->where('channel_users.user_id', $userId);
+        }
+
+        if (count($channelIds) > 0) {
+            $channels->whereIn('channels.id', $channelIds);
+        }
+
+        $channels->orderBy('channel_users.unread_message_count', 'DESC');
         $channels = $perPage ? $channels->paginate($perPage) : $channels->get();
         return $channels;
     }
@@ -52,8 +60,9 @@ public function create(int $userId, int $receiverId, string $channelName)
 
         broadcast(new CreateChannel($channel))->toOthers();
 
-        $data['message'] = "Channel created successfully.";
-        return $data;
+        $response['message'] = "Channel created successfully.";
+        $response['data'] = $channel;
+        return $response;
     }
 
     public function update(int $userId, int $channelId,  $channelName)