8000 Merge pull request #241 from twilio/ip-messaging-updates · sangsiri/twilio-python@b4b6813 · GitHub
[go: up one dir, main page]
Skip to content

Commit b4b6813

Browse files
senthgitsenthgit
committed
Merge pull request twilio#241 from twilio/ip-messaging-updates
Ip messaging updates
2 parents 8809992 + 0c2323b commit b4b6813

File tree

7 files changed

+50
-8
lines changed

7 files changed

+50
-8
lines changed

‎tests/ip_messaging/test_channels.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ def test_create_channel(self, mock):
2020
mock.return_value = resp
2121

2222
uri = "%s/Channels" % (BASE_URI)
23-
list_resource.create(friendly_name='TestChannel')
23+
list_resource.create(friendly_name='TestChannel', unique_name='Unique')
2424
exp_params = {
25-
'FriendlyName': "TestChannel"
25+
'FriendlyName': "TestChannel",
26+
'UniqueName': 'Unique'
2627
}
2728

2829
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,

‎tests/ip_messaging/test_messages.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,21 @@ def test_get(self, mock):
3939
mock.assert_called_with("GET", uri, auth=AUTH,
4040
use_json_extension=False)
4141

42+
@patch("twilio.rest.resources.base.make_twilio_request")
43+
def test_update(self, mock):
44+
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
45+
mock.return_value = resp
46+
47+
update_params = {
48+
'UniqueName': 'unique'
49+
}
50+
51+
uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
52+
list_resource.update(MESSAGE_SID, unique_name='unique')
53+
54+
mock.assert_called_with("POST", uri, data=update_params, auth=AUTH,
55+
use_json_extension=False)
56+
4257
@patch("twilio.rest.resources.base.Resource.request")
4358
def test_delete(self, req):
4459
""" Deleting a call should work """

‎tests/ip_messaging/test_users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def test_create_user(self, mock):
2222
uri = "%s/Users" % (BASE_URI)
2323
list_resource.create('test_id')
2424
exp_params = {
25-
'Id': "test_id"
25+
'Identity': "test_id"
2626
}
2727

2828
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,

‎tests/resources/ip_messaging/channel_instance.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
44
"service_sid": "ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
55
"friendly_name": "update",
6+
"unique_name": "unique",
67
"attributes": "",
78
"date_created": "2015-08-20T09:30:24Z",
89
"date_updated": "2015-08-20T09:30:24Z",

‎twilio/rest/resources/ip_messaging/channels.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def update(self, **kwargs):
1616
:param sid: Channel instance identifier
1717
:param type: Channel type
1818
:param friendly_name: Channel's friendly name
19+
:param unique_name: Channel's Unique name
1920
:param attributes: Additional attributes that needs to be stored with
2021
channel
2122
:return: the updated instance
@@ -49,8 +50,9 @@ def create(self, **kwargs):
4950
"""
5051
Create a channel.
5152
52-
:param str friendly_name: The friendly name of the channel.
53-
:param str attributes: An attribute string with arbitrary
53+
:param str friendly_name: Channel's friendly name
54+
:param unique_name: Channel's Unique name
55+
:param str attributes: Developer-specific data (json) storage
5456
5557
:return: A :class:`Channel` object
5658
"""
@@ -68,6 +70,7 @@ def update(self, sid, **kwargs):
6870
:param sid: Channel instance identifier
6971
:param type: Channel type
7072
:param friendly_name: Channel's friendly name
73+
:param unique_name: Channel's Unique name
7174
:param attributes: Additional attributes that needs to be stored with
7275
channel
7376
:return: Updated instance

‎twilio/rest/resources/ip_messaging/messages.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33

44
class Message(NextGenInstanceResource):
55

6+
def update(self, **kwargs):
7+
"""
8+
Updates the Message instance
9+
:param sid: Message instance identifier
10+
:param service_sid: Service instance identifier
11+
:param channel_sid: Channel instance identifier
12+
:param body: Message's body
13+
:return: the updated instance
14+
"""
15+
return self.update_instance(**kwargs)
16+
617
def delete(self):
718
"""
819
Delete this message
@@ -44,3 +55,14 @@ def delete(self, sid):
4455
Delete a given Message
4556
"""
4657
return self.delete_instance(sid)
58+
59+
def update(self, sid, **kwargs):
60+
"""
61+
Updates the Message instance identified by sid
62+
:param sid: Message instance identifier
63+
:param service_sid: Service instance identifier
64+
:param channel_sid: Channel instance identifier
65+
:param body: Message's body
66+
:return: the updated instance
67+
"""
68+
return self.update_instance(sid, kwargs)

‎twilio/rest/resources/ip_messaging/users.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ def list(self, **kwargs):
3535
"""
3636
return self.get_instances(kwargs)
3737

38-
def create(self, id, **kwargs):
38+
def create(self, identity, **kwargs):
3939
"""
4040
Creates a User
4141
42-
:param str id: The identity of the user.
42+
:param str identity: The identity of the user.
4343
:param str role_sid: The role to assign the user.
4444
4545
:return: A :class:`User` object
4646
"""
47-
kwargs["id"] = id
47+
kwargs["identity"] = identity
4848
return self.create_instance(kwargs)
4949

5050
def delete(self, sid):

0 commit comments

Comments
 (0)
0