0001-add-sms-delivery-12665.patch

Serghei Mihai, 02 novembre 2017 01:28

Voir les différences: en ligne côte à côte

Subject: [PATCH] add sms delivery (12665)

 corbo/models.py                                  |  13 ++-
 corbo/settings.py                                |   6 ++
 corbo/utils.py                                   |  27 ++++++
 corbo/views.py                                   |   2 +-
 requirements.txt                                 |   1 +
 tests/test_api.py                                |   2 +-
 tests/{test_emailing.py => test_broadcasting.py} | 100 ++++++++++++++++++++++-
 7 files changed, 144 insertions(+), 7 deletions(-)
 rename tests/{test_emailing.py => test_broadcasting.py} (55%)

     channel_choices = (
         ('mailto', _('Email')),
         ('sms', _('SMS')),
+    )
-...
         def send(self):
             destinations = [s.identifier for s in self.announce.category.subscription_set.all() if s.identifier]
             self.delivery_count = utils.send_email(self.announce.title, self.announce.text, destinations, category_id=self.announce.category.pk)
             emails = []
             mobile_numbers = []
             for destination in destinations:
                 if destination.startswith('mailto:'):
                     emails.append(destination.replace('mailto:', ''))
                 elif destination.startswith('sms:'):
                     mobile_numbers.append(destination.replace('sms:', ''))
             self.delivery_count += utils.send_email(self.announce.title, self.announce.text,
                                         emails, category_id=self.announce.category.pk)
             self.delivery_count += utils.send_sms(self.announce.text, mobile_numbers)
             self.deliver_time = timezone.now()
             self.save()

     # default site
     SITE_BASE_URL = 'http://localhost'
     # default SMS Gateway
     SMS_GATEWAY_URL = None
     # sms expeditor
     SMS_EXPEDITOR = 'Corbo'
     local_settings_file = os.environ.get('CORBO_SETTINGS_FILE',
             os.path.join(os.path.dirname(__file__), 'local_settings.py'))
     if os.path.exists(local_settings_file):

     import os
     import logging
     import requests
     import urlparse
     import hashlib
     from html2text import HTML2Text
-...
                 logger.warning('Error occured while sending announce "%s" to %s.',
                                title, dest)
         return total_sent
     def send_sms(content, destinations):
         from django.conf import settings
         logger = logging.getLogger(__name__)
         sent = 0
         if not destinations:
             return sent
         if settings.SMS_GATEWAY_URL:
             # remove all HTML formatting from content
             html_content = etree.HTML(content)
             data = {'to': destinations,
                     'message': etree.tostring(html_content, method='text'),
                     'from': settings.SMS_EXPEDITOR}
             try:
                 response = requests.post(settings.SMS_GATEWAY_URL, json=data)
                 response.raise_for_status()
                 if not response.json()['err']:
                     # if no error returned by SMS gateway presume the that content
                     # was delivered to all destinations
                     sent = len(destinations)
                 else:
                     logger.warning('Error occured while sending sms: %s', response.json()['err_desc'])
             except requests.RequestException as e:
                 logger.warning('Failed to reach SMS gateway: %s', e)
                 return sent
         return sent

             data = signing.loads(self.kwargs['unsubscription_token'])
             try:
                 return models.Subscription.objects.get(category__pk=data['category'],
                                                        identifier=data['identifier'])
                                                        identifier='mailto:%(identifier)s' % data)
             except models.Subscription.DoesNotExist:
                 raise Http404

requirements.txt
6	6	feedparser
7	7	requests
8	8	lxml
	9	nltk
9	10	-e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo

             assert category['id'] in [slugify(c) for c in CATEGORIES]
             assert category['text'] in CATEGORIES
             assert 'transports' in category
             assert category['transports'] == [{'id': 'mailto', 'text': 'Email'}]
             assert category['transports'] == [{'id': 'mailto', 'text': 'Email'}, {'id': 'sms', 'text': 'SMS'}]
     def test_get_subscriptions_by_email(app, categories, announces, user):

     import os
     import re
     import urllib
     import logging
     import mock
     import random
     import requests
     from django.core.urlresolvers import reverse
     from django.core import mail, signing
     from django.utils import timezone
     from django.core.files.storage import DefaultStorage
     from django.utils.text import slugify
     from django.test import override_settings
     from corbo.models import Category, Announce, Subscription, Broadcast
     from corbo.models import channel_choices
-...
     CATEGORIES = (u'Alerts', u'News')
     def get_random_number():
         number_generator = range(10)
         random.shuffle(number_generator)
         number = ''.join(map(str, number_generator))
         return number
     @pytest.fixture
     def categories():
-...
         for category in categories:
             uuid = uuid4()
             Subscription.objects.create(category=category,
                                         identifier='%s@example.net' % uuid, uuid=uuid)
                                         identifier='mailto:%s@example.net' % uuid, uuid=uuid)
         for i, announce in enumerate(announces):
             broadcast = Broadcast.objects.get(announce=announce)
             broadcast.send()
-...
             announce.save()
             uuid = uuid4()
             Subscription.objects.create(category=announce.category,
                                         identifier='%s@example.net' % uuid, uuid=uuid)
                                         identifier='mailto:%s@example.net' % uuid, uuid=uuid)
             broadcast = Broadcast.objects.get(announce=announce)
             broadcast.send()
             assert broadcast.delivery_count
-...
             announce.save()
             uuid = uuid4()
             Subscription.objects.create(category=announce.category,
                                         identifier='%s@example.net' % uuid, uuid=uuid)
                                         identifier='mailto:%s@example.net' % uuid, uuid=uuid)
             broadcast = Broadcast.objects.get(announce=announce)
             mocked_get.return_value = mock.Mock(status_code=200,
                                                 headers={'content-type': 'image/png'},
-...
                     assert unsubscription_link in mail.outbox[index].text
                     assert unsubscription_link_sentinel != unsubscription_link
                     assert signing.loads(signature) == {
                         'category': announce.category.pk, 'identifier': destination.identifier}
                         'category': announce.category.pk, 'identifier': destination.identifier.replace(scheme, '')}
                     unsubscription_link_sentinel = unsubscription_link
                     # make sure the uri schema is not in the page
                     resp = app.get(unsubscription_link)
                     assert scheme not in resp.content
     def test_send_sms_with_no_gateway_defined(app, categories, announces):
         for category in categories:
             uuid = uuid4()
             Subscription.objects.create(category=category,
                                         identifier='sms:%s' % get_random_number(), uuid=uuid)
         for i, announce in enumerate(announces):
             broadcast = Broadcast.objects.get(announce=announce)
             broadcast.send()
             assert broadcast.delivery_count == 0
     @mock.patch('corbo.utils.requests.post')
     def test_send_sms_with_gateway_api_error(mocked_post, app, categories, announces, caplog):
         for category in categories:
             for i in range(3):
                 uuid = uuid4()
                 Subscription.objects.create(category=category,
                                 identifier='sms:%s' % get_random_number(), uuid=uuid)
         for i, announce in enumerate(announces):
             broadcast = Broadcast.objects.get(announce=announce)
             with override_settings(SMS_GATEWAY_URL='http://sms.gateway'):
                 mocked_response = mock.Mock()
                 mocked_response.json.return_value = {'err': 1, 'data': None,
                                 'err_desc': 'Payload error: missing "message" in JSON payload'}
                 mocked_post.return_value = mocked_response
                 broadcast.send()
                 assert broadcast.delivery_count == 0
                 records = caplog.records()
                 assert len(records) == 1 + i
                 for record in records:
                     assert record.name == 'corbo.utils'
                     assert record.levelno == logging.WARNING
                     assert record.getMessage() == 'Error occured while sending sms: Payload error: missing "message" in JSON payload'
     @mock.patch('corbo.utils.requests.post')
     def test_send_sms_with_gateway_connection_error(mocked_post, app, categories, announces, caplog):
         for category in categories:
             for i in range(3):
                 uuid = uuid4()
                 Subscription.objects.create(category=category,
                                 identifier='sms:%s' % get_random_number(), uuid=uuid)
         for i, announce in enumerate(announces):
             broadcast = Broadcast.objects.get(announce=announce)
             with override_settings(SMS_GATEWAY_URL='http://sms.gateway'):
                 mocked_response = mock.Mock()
                 def mocked_requests_connection_error(*args, **kwargs):
                     raise requests.ConnectionError('unreachable')
                 mocked_post.side_effect = mocked_requests_connection_error
                 mocked_post.return_value = mocked_response
                 broadcast.send()
                 assert broadcast.delivery_count == 0
                 records = caplog.records()
                 assert len(records) == 1 + i
                 for record in records:
                     assert record.name == 'corbo.utils'
                     assert record.levelno == logging.WARNING
                     assert record.getMessage() == 'Failed to reach SMS gateway: unreachable'
     @mock.patch('corbo.utils.requests.post')
     def test_send_sms(mocked_post, app, categories, announces):
         for category in categories:
             for i in range(3):
                 uuid = uuid4()
                 Subscription.objects.create(category=category,
                                 identifier='sms:%s' % get_random_number(), uuid=uuid)
         for announce in announces:
             broadcast = Broadcast.objects.get(announce=announce)
             with override_settings(SMS_GATEWAY_URL='http://sms.gateway'):
                 mocked_response = mock.Mock()
                 mocked_response.json.return_value = {'err': 0, 'err_desc': None, 'data': 'gateway response'}
         for announce in announces:
             broadcast = Broadcast.objects.get(announce=announce)
             with override_settings(SMS_GATEWAY_URL='http://sms.gateway'):
                 mocked_response = mock.Mock()
                 mocked_response.json.return_value = {'err': 0, 'err_desc': None, 'data': 'gateway response'}
                 mocked_post.return_value = mocked_response
                 broadcast.send()
                 assert mocked_post.call_args[0][0] == 'http://sms.gateway'
                 assert mocked_post.call_args[1]['json']['from'] == 'Corbo'
                 assert isinstance(mocked_post.call_args[1]['json']['to'], list)
                 assert broadcast.delivery_count == 3
+    -

Projet

Général

Profil

Produits Entr'ouvert » Corbo

0001-add-sms-delivery-12665.patch