Add all conversation methods to Client and remove ConversationClient

guiajlopes · guiajlopes · commit 380069a0872e · 2019-04-03T11:04:23.000+02:00
diff --git a/examples/conversation_create_message.py b/examples/conversation_create_message.py
@@ -36,9 +36,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  msg = client.create_message(CONVERSATION_ID, { 'channelId':  CHANNEL_ID, 'type': MESSAGE_TYPE_TEXT, 'content': { 'text': TEXT_MESSAGE } })
+  msg = client.conversation_create_message(CONVERSATION_ID, { 'channelId':  CHANNEL_ID, 'type': MESSAGE_TYPE_TEXT, 'content': { 'text': TEXT_MESSAGE } })
 
   # Print the object information.
   print('\nThe following information was returned as a Conversation List object:\n')
diff --git a/examples/conversation_create_webhook.py b/examples/conversation_create_webhook.py
@@ -24,9 +24,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  webhook = client.create_webhook({
+  webhook = client.conversation_create_webhook({
       'channelId': CHANNEL_ID,
       'events': [CONVERSATION_WEBHOOK_EVENT_CONVERSATION_CREATED, CONVERSATION_WEBHOOK_EVENT_CONVERSATION_UPDATED],
       'url': 'https://example.com'
diff --git a/examples/conversation_delete_webhook.py b/examples/conversation_delete_webhook.py
@@ -21,9 +21,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  client.delete_webhook(WEBHOOK_ID)
+  client.conversation_delete_webhook(WEBHOOK_ID)
 
   # Print the object information.
   print('\nWebhook has been deleted:\n')
diff --git a/examples/conversation_list.py b/examples/conversation_list.py
@@ -14,9 +14,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  conversationList = client.list()
+  conversationList = client.conversation_list()
 
   itemIds = []
   for msgItem in conversationList.items:
diff --git a/examples/conversation_list_messages.py b/examples/conversation_list_messages.py
@@ -21,9 +21,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  msg = client.list_messages(CONVERSATION_ID)
+  msg = client.conversation_list_messages(CONVERSATION_ID)
 
   itemIds = []
   for msgItem in msg.items:
diff --git a/examples/conversation_list_webhook.py b/examples/conversation_list_webhook.py
@@ -14,9 +14,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  webhookList = client.list()
+  webhookList = client.conversation_list_webhooks()
 
   itemIds = []
   for msgItem in webhookList.items:
diff --git a/examples/conversation_read.py b/examples/conversation_read.py
@@ -21,9 +21,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  conversation = client.read(CONVERSATION_ID)
+  conversation = client.conversation_read(CONVERSATION_ID)
 
   # Print the object information.
   print('\nThe following information was returned as a Conversation object:\n')
diff --git a/examples/conversation_read_message.py b/examples/conversation_read_message.py
@@ -22,9 +22,9 @@
 
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  msg = client.read_message(MESSAGE_ID)
+  msg = client.conversation_read_message(MESSAGE_ID)
 
   # Print the object information.
   print('\nThe following information was returned as a Conversation List object:\n')
diff --git a/examples/conversation_read_webhook.py b/examples/conversation_read_webhook.py
@@ -21,9 +21,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  webhook = client.read_webhook(WEBHOOK_ID)
+  webhook = client.conversation_read_webhook(WEBHOOK_ID)
 
   # Print the object information.
   print('\nThe following information was returned as a Webhook object:\n')
diff --git a/examples/conversation_start.py b/examples/conversation_start.py
@@ -36,9 +36,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  msg = client.start({ 'channelId':  CHANNEL_ID, 'to': PHONE_NUMBER, 'type': MESSAGE_TYPE_TEXT, 'content': { 'text': TEXT_MESSAGE } })
+  msg = client.conversation_start({ 'channelId':  CHANNEL_ID, 'to': PHONE_NUMBER, 'type': MESSAGE_TYPE_TEXT, 'content': { 'text': TEXT_MESSAGE } })
 
   # Print the object information.
   print('\nThe following information was returned as a Conversation object:\n')
diff --git a/examples/conversation_update.py b/examples/conversation_update.py
@@ -21,9 +21,9 @@
   sys.exit(1)
 
 try:
-  client = messagebird.ConversationClient(ACCESS_KEY)
+  client = messagebird.Client(ACCESS_KEY)
 
-  conversation = client.update(CONVERSATION_ID, {'status': 'active'})
+  conversation = client.conversation_update(CONVERSATION_ID, {'status': 'active'})
 
   # Print the object information.
   print('\nThe following information was returned as a Conversation object:\n')
diff --git a/messagebird/__init__.py b/messagebird/__init__.py
@@ -1,2 +1 @@
 from messagebird.client import Client, ErrorException
-from messagebird.conversation_client import ConversationClient
diff --git a/messagebird/client.py b/messagebird/client.py
@@ -1,22 +1,36 @@
 import sys
 import json
 
-from messagebird.base         import Base
-from messagebird.balance      import Balance
-from messagebird.contact      import Contact, ContactList
-from messagebird.error        import Error
-from messagebird.group        import ContactReference, Group, GroupList
-from messagebird.hlr          import HLR
-from messagebird.http_client  import HttpClient
-from messagebird.message      import Message
-from messagebird.voicemessage import VoiceMessage
-from messagebird.lookup       import Lookup
-from messagebird.verify       import Verify
+from messagebird.balance              import Balance
+from messagebird.contact              import Contact, ContactList
+from messagebird.error                import Error
+from messagebird.group                import Group, GroupList
+from messagebird.hlr                  import HLR
+from messagebird.message              import Message
+from messagebird.voicemessage         import VoiceMessage
+from messagebird.lookup               import Lookup
+from messagebird.verify               import Verify
+from messagebird.http_client          import HttpClient
+from messagebird.conversation_message import ConversationMessage, ConversationMessageList
+from messagebird.conversation         import Conversation, ConversationList
+from messagebird.conversation_webhook import ConversationWebhook, ConversationWebhookList
+
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
 
 ENDPOINT       = 'https://rest.messagebird.com'
 CLIENT_VERSION = '1.3.1'
 PYTHON_VERSION = '%d.%d.%d' % (sys.version_info[0], sys.version_info[1], sys.version_info[2])
 USER_AGENT = 'MessageBird/ApiClient/%s Python/%s' % (CLIENT_VERSION, PYTHON_VERSION)
+REST_TYPE = 'rest'
+
+CONVERSATION_API_ROOT = 'https://conversations.messagebird.com/v1/'
+CONVERSATION_PATH = 'conversations'
+CONVERSATION_MESSAGES_PATH = 'messages'
+CONVERSATION_WEB_HOOKS_PATH = 'webhooks'
+CONVERSATION_TYPE = 'conversation'
 
 
 class ErrorException(Exception):
@@ -29,15 +43,20 @@ def __init__(self, errors):
 class Client(object):
   def __init__(self, access_key, http_client=None):
     self.access_key = access_key
+    self.http_client = http_client
+
+  def getHttpClient(self, type=REST_TYPE):
+    if self.http_client:
+      return self.http_client
+
+    if type == REST_TYPE:
+      return HttpClient(ENDPOINT, self.access_key, USER_AGENT)
 
-    if http_client is None:
-      self.http_client = HttpClient(ENDPOINT, access_key, USER_AGENT)
-    else:
-      self.http_client = http_client
+    return HttpClient(CONVERSATION_API_ROOT, self.access_key, USER_AGENT)
 
-  def request(self, path, method='GET', params=None):
+  def request(self, path, method='GET', params=None, type=REST_TYPE):
     """Builds a request, gets a response and decodes it."""
-    response_text = self.http_client.request(path, method, params)
+    response_text = self.getHttpClient(type).request(path, method, params)
 
     if not response_text:
         return response_text
@@ -49,9 +68,9 @@ def request(self, path, method='GET', params=None):
 
     return response_json
 
-  def request_plain_text(self, path, method='GET', params=None):
+  def request_plain_text(self, path, method='GET', params=None, type=REST_TYPE):
     """Builds a request, gets a response and returns the body."""
-    response_text = self.http_client.request(path, method, params)
+    response_text = self.getHttpClient(type).request(path, method, params)
 
     try:
       # Try to decode the response to JSON to see if the API returned any
@@ -189,3 +208,56 @@ def __group_add_contacts_query(self, contactIds):
 
   def group_remove_contact(self, groupId, contactId):
     self.request_plain_text('groups/' + str(groupId) + '/contacts/' + str(contactId), 'DELETE', None)
+
+  def conversation_list(self, options=None):
+    uri = CONVERSATION_PATH
+    if options is not None:
+      uri += '?' + urlencode(options)
+
+    return ConversationList().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
+
+  def conversation_start(self, start_request):
+    uri = CONVERSATION_PATH + '/start'
+    return Conversation().load(self.request(uri, 'POST', start_request, CONVERSATION_TYPE))
+
+  def conversation_update(self, id, update_request):
+    uri = CONVERSATION_PATH + '/' + str(id)
+    return Conversation().load(self.request(uri, 'PATCH', update_request, CONVERSATION_TYPE))
+
+  def conversation_read(self, id):
+    uri = CONVERSATION_PATH + '/' + str(id)
+    return Conversation().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
+
+  def conversation_list_messages(self, conversation_id, options=None):
+    uri = CONVERSATION_PATH + '/' + str(conversation_id) + '/' + CONVERSATION_MESSAGES_PATH
+
+    if options is not None:
+      uri += '?' + urlencode(options)
+
+    return ConversationMessageList().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
+
+  def conversation_create_message(self, conversation_id, message_create_request):
+    uri = CONVERSATION_PATH + '/' + str(conversation_id) + '/' + CONVERSATION_MESSAGES_PATH
+    return ConversationMessage().load(self.request(uri, 'POST', message_create_request, CONVERSATION_TYPE))
+
+  def conversation_read_message(self, message_id):
+    uri = CONVERSATION_MESSAGES_PATH + '/' + str(message_id)
+    return ConversationMessage().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
+
+  def conversation_create_webhook(self, webhook_create_request):
+    return ConversationWebhook().load(self.request(CONVERSATION_WEB_HOOKS_PATH, 'POST', webhook_create_request, CONVERSATION_TYPE))
+
+  def conversation_delete_webhook(self, id):
+    uri = CONVERSATION_WEB_HOOKS_PATH + '/' + str(id)
+    self.request(uri, 'DELETE', None, CONVERSATION_TYPE)
+
+  def conversation_list_webhooks(self, options=None):
+    uri = CONVERSATION_WEB_HOOKS_PATH
+    if options is not None:
+      uri += '?' + urlencode(options)
+
+    return ConversationWebhookList().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
+
+  def conversation_read_webhook(self, id):
+    uri = CONVERSATION_WEB_HOOKS_PATH + '/' + str(id)
+    return ConversationWebhook().load(self.request(uri, 'GET', None, CONVERSATION_TYPE))
diff --git a/messagebird/conversation_client.py b/messagebird/conversation_client.py
diff --git a/tests/test_conversation.py b/tests/test_conversation.py
diff --git a/tests/test_conversation_message.py b/tests/test_conversation_message.py
diff --git a/tests/test_conversation_webhook.py b/tests/test_conversation_webhook.py
