add admin convo replies and fix up some user replies

Author: josler

src/Intercom/Service/config/intercom_public_conversation.json

@@ -144,25 +144,39 @@
                     "required": true,
                     "type": "string"
                 },
+                "intercom_user_id": {
+                    "location": "json",
+                    "required": false,
+                    "type": "string"
+                },
+                "user_id": {
+                    "location": "json",
+                    "required": false,
+                    "type": "string"
+                },
                 "email": {
                     "location": "json",
                     "required": false,
                     "type": "string"
                 },
+                "admin_id": {
+                    "location": "json",
+                    "required": false,
+                    "type": "string"
+                },
                 "type": {
-                    "default": "json",
-                    "location": "query",
+                    "location": "json",
                     "required": true,
-                    "static": true
+                    "type": "string"
                 },
                 "body": {
                     "location": "json",
-                    "required": false,
+                    "required": true,
                     "type": "string"
                 },
                 "message_type": {
                     "location": "json",
-                    "required": false,
+                    "required": true,
                     "type": "string"
                 }
             },

tests/Intercom/Resources/ConversationTest.php

@@ -77,9 +77,17 @@ public function testGetAdminConversations()
     public function testReplyToConversation()
     {
         $this->setMockResponse($this->client, 'Conversation/Conversation.txt');
-        $this->client->replyToConversation(['id' => '123456']);
+        $this->client->replyToConversation(['id' => '123456', 'user_id' => '45', 'type' => 'user', 'message_type' => 'comment', 'body' => 'my reply']);
 
-        $this->assertRequest('POST', '/conversations/123456/reply?type=json');
+        $this->assertRequest('POST', '/conversations/123456/reply');
+        $this->assertRequestJson(['user_id' => '45', 'type' => 'user', 'body' => 'my reply', 'message_type' => 'comment']);
+    }
+
+    public function testReplyToConversationAsAdmin() {
+        $this->setMockResponse($this->client, 'Conversation/Conversation.txt');
+        $this->client->replyToConversation(['id' => '123456', 'admin_id' => '6', 'type' => 'admin', 'message_type' => 'comment', 'body' => 'my reply']);
+        $this->assertRequest('POST', '/conversations/123456/reply');
+        $this->assertRequestJson(['admin_id' => '6', 'type' => 'admin', 'body' => 'my reply', 'message_type' => 'comment']);
     }
 
     public function testMarkConversationAsRead()
@@ -113,4 +121,4 @@ public function testMarkConversationAsReadNoID()
     {
         $this->client->markConversationAsRead();
     }
-}
+}