Merge pull request #43 from upwork/v1.3.7

Add Room Messages API
upwork · May 8, 2020 · 147fa24 · 147fa24
2 parents 19d4c89 + a5a9d96
commit 147fa24
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/changelog.rst b/changelog.rst
@@ -5,6 +5,12 @@
 Changelog
 ***************
 
+.. _1.3.7:
+
+Version 1.3.7
+-------------
+* Add Room Messages API
+
 .. _1.3.6:
 
 Version 1.3.6

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 README = readme.read()
 readme.close()
 
-VERSION = (1, 3, 6, 0, 0)
+VERSION = (1, 3, 7, 0, 0)
 
 
 def get_version():

diff --git a/upwork/__init__.py b/upwork/__init__.py
@@ -13,7 +13,7 @@
 
 """
 
-VERSION = '1.3.6'
+VERSION = '1.3.7'
 
 
 def get_version():

diff --git a/upwork/routers/messages.py b/upwork/routers/messages.py
@@ -41,6 +41,22 @@ def get_room_details(self, company, room_id, params = {}):
         result = self.get(url, data=params)
         return result.get(url, result)
 
+    def get_room_messages(self, company, room_id, params = {}):
+        """
+        Get messages from a specific room
+
+        *Parameters:*
+          :company:          Company ID
+
+          :room_id           Room ID
+
+          :params:           List of parameters
+
+        """
+        url = '{0}/rooms/{1}/stories'.format(company, room_id)
+        result = self.get(url, data=params)
+        return result.get(url, result)
+
     def get_room_by_offer(self, company, offer_id, params = {}):
         """
         Get a specific room by offer ID

diff --git a/upwork/tests.py b/upwork/tests.py
@@ -861,6 +861,14 @@ def test_get_room_details():
     assert messages.get_room_details("testcompany", "room-id") ==\
 	room_dict, messages.get_room_details("testcompany", "room-id")
 
+@patch('urllib3.PoolManager.urlopen', patched_urlopen_room)
+def test_get_room_messages():
+    messages = get_client().messages
+
+    #test get_room_messages
+    assert messages.get_room_messages("testcompany", "room-id") ==\
+	room_dict, messages.get_room_messages("testcompany", "room-id")
+
 @patch('urllib3.PoolManager.urlopen', patched_urlopen_room)
 def test_get_room_by_offer():
     messages = get_client().messages
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
     """
-    VERSION = '1.3.6'
+    VERSION = '1.3.7'
     def get_version():
@@ Expand Down @@