Merge pull request #469 from tutorcruncher/catch-msgbird-404

Catch the 404 when HLR data is not found

Author: HenryTraill

src/version.py

@@ -1 +1 @@
-VERSION = '1.0.32'
+VERSION = '1.0.33'

src/worker/sms.py

@@ -20,7 +20,7 @@
 from phonenumbers.geocoder import country_name_for_number, description_for_number
 from typing import Optional
 
-from src.ext import MessageBird
+from src.ext import ApiError, MessageBird
 from src.render.main import MessageTooLong, SmsLength, apply_short_links, sms_length
 from src.schemas.messages import MessageStatus, SmsRecipientModel, SmsSendMethod, SmsSendModel
 from src.settings import Settings
@@ -188,7 +188,11 @@ async def _messagebird_get_number_cost(self, number: Number):
 
                 network, hlr = None, None
                 for i in range(30):
-                    r = await self.messagebird.get(f'hlr/{hlr_id}')
+                    try:
+                        r = await self.messagebird.get(f'hlr/{hlr_id}')
+                    except ApiError:
+                        main_logger.info('Error retrieving HLR data for %s, attempt %d', number.number, i)
+                        continue
                     hlr = r.json()
                     if hlr.get('errors'):
                         continue

tests/dummy_server.py

@@ -106,6 +106,8 @@ async def messagebird_lookup(request):
         if request_number == 2:
             return json_response({'status': 'active', 'network': 'o2'})
         return json_response({})
+    elif '447877777777' in request.path:
+        return web.Response(body="{'error': 'Test error', 'code': 20}", content_type='application/json', status=404)
     return json_response({'status': 'active', 'network': 23430})
 
 

tests/test_sms.py

@@ -250,6 +250,25 @@ def test_messagebird_no_hlr(cli, tmpdir, dummy_server, worker, caplog, loop):
     assert 'No HLR result found for +447888888888 after 30 attempts' in caplog.messages
 
 
+def test_messsagebird_no_hlr_found(cli, tmpdir, dummy_server, worker, caplog, loop):
+    data = {
+        'uid': str(uuid4()),
+        'company_code': 'foobar',
+        'method': 'sms-messagebird',
+        'main_template': 'this is a message',
+        'recipients': [{'number': '07877777777'}],
+    }
+    r = cli.post('/send/sms/', json=data, headers={'Authorization': 'testing-key'})
+    assert r.status_code == 201, r.text
+    assert worker.test_run() == 1
+    assert [
+        'POST /messagebird/hlr > 201',
+        *['GET /messagebird/hlr/447877777777 > 404' for _ in range(30)],
+    ] == dummy_server.log
+    dummy_server.log = []
+    assert 'No HLR result found for +447877777777 after 30 attempts' in caplog.messages
+
+
 def test_messagebird_no_network(cli, tmpdir, dummy_server, worker, caplog, loop):
     data = {
         'uid': str(uuid4()),