Skip to content

Commit

Permalink
Merge pull request #166 from praekelt/feature/MOMZA-836-create-messag…
Browse files Browse the repository at this point in the history 
…e-endpoints

Disable channel messages endpoint
  • Loading branch information
@erikh360
erikh360 committed Jan 18, 2018
2 parents 3cfff00 + 218a212 commit b7130a6
Show file tree
Hide file tree
Showing 2 changed files with 114 additions and 14 deletions.
26 changes: 20 additions & 6 deletions junebug/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,20 +267,34 @@ def get_logs(self, request, channel_id):
@inlineCallbacks
def send_message(self, request, body, channel_id):
'''Send an outbound (mobile terminated) message'''
msg = yield self.send_messsage_on_channel(channel_id, body)
channel = yield Channel.from_id(
self.redis, self.config, channel_id, self.service, self.plugins)

returnValue(response(
request, 'message submitted', msg, code=http.CREATED))
if (channel.has_destination):
msg = yield self.send_messsage_on_channel(channel_id, body)

returnValue(response(
request, 'message submitted', msg, code=http.CREATED))
else:
raise ApiUsageError(
'This channel has no "mo_url" or "amqp_queue"')

@app.route(
'/channels/<string:channel_id>/messages/<string:message_id>',
methods=['GET'])
@inlineCallbacks
def get_message_status(self, request, channel_id, message_id):
'''Retrieve the status of a message'''
data = yield self.get_message_events(
request, channel_id, message_id)
returnValue(response(request, 'message status', data))
channel = yield Channel.from_id(
self.redis, self.config, channel_id, self.service, self.plugins)

if (channel.has_destination):
data = yield self.get_message_events(
request, channel_id, message_id)
returnValue(response(request, 'message status', data))
else:
raise ApiUsageError(
'This channel has no "mo_url" or "amqp_queue"')

@app.route('/routers/', methods=['GET'])
def get_router_list(self, request):
Expand Down
102 changes: 94 additions & 8 deletions junebug/tests/test_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,18 @@ def test_send_message_reply(self):

@inlineCallbacks
def test_send_message_no_to_or_reply_to(self):
channel = Channel(
redis_manager=(yield self.get_redis()),
config=(yield self.create_channel_config()),
properties=self.create_channel_properties(),
id='test-channel')

yield channel.save()
yield channel.start(self.service)

resp = yield self.post(
'/channels/foo-bar/messages/', {'from': None, 'content': None})
'/channels/{}/messages/'.format(channel.id),
{'from': None, 'content': None})
yield self.assert_response(
resp, http.BAD_REQUEST, 'api usage error', {
'errors': [{
Expand All @@ -714,6 +724,33 @@ def test_send_message_no_to_or_reply_to(self):
}]
})

@inlineCallbacks
def test_send_message_no_destination(self):
'''Sending a message on a channel endpoint without a destination should
raise a ApiUsageError
'''
properties = self.create_channel_properties()
del properties['mo_url']
channel = Channel(
redis_manager=(yield self.get_redis()),
config=(yield self.create_channel_config()),
properties=properties,
id='test-channel')

yield channel.save()
yield channel.start(self.service)

resp = yield self.post(
'/channels/{}/messages/'.format(channel.id),
{'from': None, 'content': 'test message', 'to': '+1234'})
yield self.assert_response(
resp, http.BAD_REQUEST, 'api usage error', {
'errors': [{
'message': 'This channel has no "mo_url" or "amqp_queue"',
'type': 'ApiUsageError',
}]
})

@inlineCallbacks
def test_send_message_additional_properties(self):
'''Additional properties should result in an error being returned.'''
Expand Down Expand Up @@ -883,7 +920,16 @@ def test_send_message_over_character_limit(self):
@inlineCallbacks
def test_get_message_status_no_events(self):
'''Returns `None` for last event fields, and empty list for events'''
resp = yield self.get('/channels/foo-bar/messages/message-id')

properties = self.create_channel_properties(character_limit=10)
config = yield self.create_channel_config()
redis = yield self.get_redis()
channel = Channel(redis, config, properties, id='test-channel')
yield channel.save()
yield channel.start(self.service)

resp = yield self.get(
'/channels/{}/messages/message-id'.format(channel.id))
yield self.assert_response(
resp, http.OK, 'message status', {
'id': 'message-id',
Expand All @@ -892,16 +938,47 @@ def test_get_message_status_no_events(self):
'events': [],
})

@inlineCallbacks
def test_get_message_status_with_no_destination(self):
'''Returns error if the channel has no destination'''
properties = self.create_channel_properties(character_limit=10)
del properties['mo_url']
config = yield self.create_channel_config()
redis = yield self.get_redis()
channel = Channel(redis, config, properties, id='test-channel')
yield channel.save()
yield channel.start(self.service)

resp = yield self.get(
'/channels/{}/messages/message-id'.format(channel.id))

yield self.assert_response(
resp, http.BAD_REQUEST, 'api usage error', {
'errors': [{
'message': 'This channel has no "mo_url" or "amqp_queue"',
'type': 'ApiUsageError',
}]
})

@inlineCallbacks
def test_get_message_status_one_event(self):
'''Returns the event details for last event fields, and list with
single event for `events`'''

properties = self.create_channel_properties(character_limit=10)
config = yield self.create_channel_config()
redis = yield self.get_redis()
channel = Channel(redis, config, properties, id='test-channel')
yield channel.save()
yield channel.start(self.service)

event = TransportEvent(
user_message_id='message-id', sent_message_id='message-id',
event_type='nack', nack_reason='error error')
yield self.outbounds.store_event('channel-id', 'message-id', event)
resp = yield self.get('/channels/channel-id/messages/message-id')
event_dict = api_from_event('channel-id', event)
yield self.outbounds.store_event(channel.id, 'message-id', event)
resp = yield self.get(
'/channels/{}/messages/message-id'.format(channel.id))
event_dict = api_from_event(channel.id, event)
event_dict['timestamp'] = str(event_dict['timestamp'])
yield self.assert_response(
resp, http.OK, 'message status', {
Expand All @@ -915,19 +992,28 @@ def test_get_message_status_one_event(self):
def test_get_message_status_multiple_events(self):
'''Returns the last event details for last event fields, and list with
all events for `events`'''

properties = self.create_channel_properties(character_limit=10)
config = yield self.create_channel_config()
redis = yield self.get_redis()
channel = Channel(redis, config, properties, id='test-channel')
yield channel.save()
yield channel.start(self.service)

events = []
event_dicts = []
for i in range(5):
event = TransportEvent(
user_message_id='message-id', sent_message_id='message-id',
event_type='nack', nack_reason='error error')
yield self.outbounds.store_event('channel-id', 'message-id', event)
yield self.outbounds.store_event(channel.id, 'message-id', event)
events.append(event)
event_dict = api_from_event('channel-id', event)
event_dict = api_from_event(channel.id, event)
event_dict['timestamp'] = str(event_dict['timestamp'])
event_dicts.append(event_dict)

resp = yield self.get('/channels/channel-id/messages/message-id')
resp = yield self.get(
'/channels/{}/messages/message-id'.format(channel.id))
yield self.assert_response(
resp, http.OK, 'message status', {
'id': 'message-id',
Expand Down

0 comments on commit b7130a6

Please sign in to comment.