Direct convo updates (#213)

* direct conversation updates

* Apply fixes from StyleCI (#212)

Author: musonza

README.md

@@ -141,7 +141,12 @@ $conversation = Chat::createConversation($participants)->makePrivate();
 $conversation = Chat::createConversation($participants)->makePrivate(false);
 
 // Create a direct message
+
+// Make direct conversation after creation
 $conversation = Chat::createConversation($participants)->makeDirect();
+
+// Specify intent for direct conversation before creation
+$conversation = Chat::makeDirect()->createConversation($participants);
 ```
 
 > **Note:** You will not be able to add additional participants to a direct conversation. 

src/Chat.php

@@ -49,7 +49,20 @@ public function __construct(
      */
     public function createConversation(array $participants, array $data = [])
     {
-        return $this->conversationService->start($participants, $data);
+        $payload = [
+            'participants'   => $participants,
+            'data'           => $data,
+            'direct_message' => $this->conversationService->directMessage,
+        ];
+
+        return $this->conversationService->start($payload);
+    }
+
+    public function makeDirect()
+    {
+        $this->conversationService->directMessage = true;
+
+        return $this;
     }
 
     /**

src/ChatServiceProvider.php

@@ -45,8 +45,8 @@ public function register()
      */
     private function registerChat()
     {
-        $this->app->bind('chat', function () {
-            return $this->app->make(\Musonza\Chat\Chat::class);
+        $this->app->bind('\Musonza\Chat\Chat', function () {
+            return $this->app->make(Chat::class);
         });
     }
 

src/Facades/ChatFacade.php

@@ -3,6 +3,7 @@
 namespace Musonza\Chat\Facades;
 
 use Illuminate\Support\Facades\Facade;
+use Musonza\Chat\Chat;
 
 class ChatFacade extends Facade
 {
@@ -14,6 +15,8 @@ class ChatFacade extends Facade
      */
     protected static function getFacadeAccessor()
     {
-        return 'chat';
+        self::clearResolvedInstance(Chat::class);
+
+        return Chat::class;
     }
 }

src/Models/Conversation.php

@@ -20,7 +20,7 @@
 class Conversation extends BaseModel
 {
     protected $table = ConfigurationManager::CONVERSATIONS_TABLE;
-    protected $fillable = ['data'];
+    protected $fillable = ['data', 'direct_message'];
     protected $casts = [
         'data'           => 'array',
         'direct_message' => 'boolean',
@@ -148,18 +148,23 @@ public function removeParticipant($participants)
     /**
      * Starts a new conversation.
      *
-     * @param array $participants
-     * @param array $data
+     * @param array $payload
+     *
+     * @throws InvalidDirectMessageNumberOfParticipants
      *
      * @return Conversation
      */
-    public function start(array $participants, $data = []): self
+    public function start(array $payload): self
     {
+        if ($payload['direct_message'] && count($payload['participants']) > 2) {
+            throw new InvalidDirectMessageNumberOfParticipants();
+        }
+
         /** @var Conversation $conversation */
-        $conversation = $this->create(['data' => $data]);
+        $conversation = $this->create(['data' => $payload['data'], 'direct_message' => (bool) $payload['direct_message']]);
 
-        if ($participants) {
-            $conversation->addParticipants($participants);
+        if ($payload['participants']) {
+            $conversation->addParticipants($payload['participants']);
         }
 
         return $conversation;
@@ -210,6 +215,7 @@ public function makeDirect($isDirect = true)
     private function ensureNoDirectMessagingExist()
     {
         $participants = $this->participants()->get()->pluck('messageable');
+        /** @var Conversation $common */
         $common = Chat::conversations()->between($participants[0], $participants[1]);
 
         if (!is_null($common)) {

src/Services/ConversationService.php

@@ -21,14 +21,16 @@ class ConversationService
      */
     public $conversation;
 
+    public $directMessage = false;
+
     public function __construct(Conversation $conversation)
     {
         $this->conversation = $conversation;
     }
 
-    public function start($participants, $data = [])
+    public function start(array $payload)
     {
-        $conversation = $this->conversation->start($participants, $data);
+        $conversation = $this->conversation->start($payload);
 
         event(new ConversationStarted($conversation));
 

tests/Unit/ConversationTest.php

@@ -274,8 +274,8 @@ public function it_prevents_additional_participants_to_direct_conversation()
     /** @test */
     public function it_can_return_a_conversation_between_users()
     {
-        $conversation = Chat::createConversation([$this->alpha, $this->bravo])->makeDirect();
-        $conversation2 = Chat::createConversation([$this->alpha, $this->charlie]);
+        $conversation = Chat::makeDirect()->createConversation([$this->alpha, $this->bravo]);
+        Chat::createConversation([$this->alpha, $this->charlie]);
         $conversation3 = Chat::createConversation([$this->alpha, $this->delta])->makeDirect();
 
         $c1 = Chat::conversations()->between($this->alpha, $this->bravo);