✨ add leancloud.InboxQuery

Author: aisk

leancloud/__init__.py

@@ -39,6 +39,7 @@
 from .query import Query
 from .relation import Relation
 from .role import Role
+from .status import InboxQuery
 from .status import Status
 from .sys_message import SysMessage
 from .user import User
@@ -55,6 +56,7 @@
     'FriendshipQuery',
     'GeoPoint',
     'HttpsRedirectMiddleware',
+    'InboxQuery',
     'Installation',
     'LeanCloudError',
     'LeanEngineError',

leancloud/status.py

@@ -17,13 +17,14 @@
 __author__ = 'asaka'
 
 
-
 StatusesCount = namedtuple('StatusesCount', ['total', 'unread'])
 
+
 class Status(object):
     def __init__(self, **data):
         self.id = None  # type: str
         self.created_at = None  # type: datetime
+        self.updated_at = None  # type: datetime
         self._data = data
         self.inbox_type = 'default'
 
@@ -76,6 +77,12 @@ def destroy(self):
             raise ValueError('This status is not saved')
         client.delete('/statuses/' + self.id)
 
+    def _update_data(self, server_data):
+        self.id = server_data.pop('objectId')
+        self.created_at = utils.decode('createdAt', server_data.pop('createdAt'))
+        self.updated_at = utils.decode('updatedAt', server_data.pop('updatedAt'))
+        self._data = utils.decode(None, server_data)
+
     @staticmethod
     def count_unread_statuses(owner, inbox_type='default'):
         params = {
@@ -84,3 +91,42 @@ def count_unread_statuses(owner, inbox_type='default'):
         }
         content = client.get('/subscribe/statuses/count', params).json()
         return StatusesCount(total=content['total'], unread=content['unread'])
+
+
+class InboxQuery(Query):
+    def __init__(self):
+        super(InboxQuery, self).__init__('_Status')
+        self._since_id = 0
+        self._max_id = 0
+        self._inbox_type = 'default'
+        self._owner = None
+
+    def since_id(self, value):
+        self._since_id = value
+        return self
+
+    def max_id(self, value):
+        self._max_id = value
+        return self
+
+    def owner(self, value):
+        self._owner = value
+        return self
+
+    def inbox_type(self, value):
+        self._inbox_type = value
+        return self
+
+    def _new_object(self):
+        return Status()
+
+    def _do_request(self, params):
+        return client.get('/subscribe/statuses', params).json()
+
+    def dump(self):
+        result = super(InboxQuery, self).dump()
+        result['owner'] = utils.encode(self._owner)
+        result['inboxType'] = self._inbox_type
+        result['sinceId'] = self._since_id
+        result['maxId'] = self._max_id
+        return result

tests/test_status.py

@@ -9,10 +9,10 @@
 import time
 
 from nose.tools import assert_equal
-from nose.tools import assert_true
 
 import leancloud
 from leancloud import Status
+from leancloud import InboxQuery
 
 
 def setup():
@@ -59,10 +59,20 @@ def test_send_private_status():
     status.destroy()
 
 
-def test_count_():
+def test_statuses_count():
     status = Status(image='http://www.example.com', message='hello world!')
     status.send_private_status(leancloud.User.get_current())
+    time.sleep(1)  # wait server to sync
     result = Status.count_unread_statuses(leancloud.User.get_current(), 'private')
     assert_equal(result.total, 1)
     assert_equal(result.unread, 1)
     status.destroy()
+
+
+def test_inbox_query():
+    status = Status(image='http://www.example.com', message='hello world!')
+    status.send_private_status(leancloud.User.get_current())
+    time.sleep(1)  # wait server to sync
+    saved = InboxQuery().inbox_type('private').owner(leancloud.User.get_current()).first()
+    assert_equal(saved.get('image'), status.get('image'))
+    assert_equal(saved.id, status.id)