Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions temba_client/v2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,21 +186,16 @@ def get_labels(self, uuid=None, name=None):
"""
return self._get_query("labels", self._build_params(uuid=uuid, name=name), Label)

def get_messages(self, id=None, broadcast=None, contact=None, folder=None, label=None, before=None, after=None):
def get_messages(self, id=None, folder=None, before=None, after=None):
"""
Gets all matching messages
:param id: message id
:param broadcast: broadcast id
:param contact: contact object or UUID
:param folder: folder name
:param label: message label name or UUID
:param datetime before: created before
:param datetime after: created after
:return: message query
"""
params = self._build_params(
id=id, broadcast=broadcast, contact=contact, folder=folder, label=label, before=before, after=after
)
params = self._build_params(id=id, folder=folder, before=before, after=after)
return self._get_query("messages", params, Message)

def get_org(self, retry_on_rate_exceed=False):
Expand Down
6 changes: 0 additions & 6 deletions temba_client/v2/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -629,10 +629,7 @@ def test_get_messages(self, mock_request):
# check with all params
self.client.get_messages(
id=123456,
broadcast=234567,
contact="d33e9ad5-5c35-414c-abd4-e7451c69ff1d",
folder="inbox",
label="Spam",
after=datetime(2014, 12, 12, 22, 34, 36, 978123, tzone.utc),
before=datetime(2014, 12, 12, 22, 56, 58, 917123, tzone.utc),
).all()
Expand All @@ -643,10 +640,7 @@ def test_get_messages(self, mock_request):
"messages",
params={
"id": 123456,
"broadcast": 234567,
"contact": "d33e9ad5-5c35-414c-abd4-e7451c69ff1d",
"folder": "inbox",
"label": "Spam",
"after": "2014-12-12T22:34:36.978123Z",
"before": "2014-12-12T22:56:58.917123Z",
},
Expand Down