0001-sms-improve-SMSGatewayMixin.clean_numbers.patch

Benjamin Dauvergne, 21 juillet 2015 23:59

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

Subject: [PATCH] sms: improve SMSGatewayMixin.clean_numbers()

- normalize numbers to the 00... international format
- a default_trunk_prefix setting to all sms backends
- set default_trunk_prefix and default_country_code to French ones
- modify test

 .../0002_choositsmsgateway_default_trunk_prefix.py   | 20 ++++++++++++++++++++
 passerelle/apps/choosit/models.py                    |  4 +++-
 .../0002_mobytsmsgateway_default_trunk_prefix.py     | 20 ++++++++++++++++++++
 passerelle/apps/mobyt/models.py                      |  5 ++++-
 .../0002_ovhsmsgateway_default_trunk_prefix.py       | 20 ++++++++++++++++++++
 passerelle/apps/ovh/models.py                        |  6 ++++--
 .../0002_oxydsmsgateway_default_trunk_prefix.py      | 20 ++++++++++++++++++++
 passerelle/apps/oxyd/models.py                       |  5 +++--
 passerelle/sms/__init__.py                           | 19 ++++++++++++-------
 tests/test_sms.py                                    | 12 ++++++------
 10 files changed, 112 insertions(+), 19 deletions(-)
 create mode 100644 passerelle/apps/choosit/migrations/0002_choositsmsgateway_default_trunk_prefix.py
 create mode 100644 passerelle/apps/mobyt/migrations/0002_mobytsmsgateway_default_trunk_prefix.py
 create mode 100644 passerelle/apps/ovh/migrations/0002_ovhsmsgateway_default_trunk_prefix.py
 create mode 100644 passerelle/apps/oxyd/migrations/0002_oxydsmsgateway_default_trunk_prefix.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('choosit', '0001_initial'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='choositsmsgateway',
                 name='default_trunk_prefix',
                 field=models.CharField(default='0', max_length=2),
                 preserve_default=True,
             ),
+        ]

     class ChoositSMSGateway(BaseResource, SMSGatewayMixin):
         key = models.CharField(max_length=64)
         default_country_code = models.CharField(max_length=3, default=u'33')
         default_trunk_prefix = models.CharField(max_length=2, default=u'0')
         # FIXME: add regexp field, to check destination and from format
         class Meta:
-...
             # from http://sms.choosit.com/documentation_technique.html
             # unfortunately it lacks a batch API...
             destinations = self.clean_numbers(destinations,
                     self.default_country_code, prefix='')
                                               self.default_country_code,
                                               self.default_trunk_prefix)
             for dest in destinations:
                 params = {
                     'key': self.key,

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('mobyt', '0001_initial'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='mobytsmsgateway',
                 name='default_trunk_prefix',
                 field=models.CharField(default='0', max_length=2),
                 preserve_default=True,
             ),
+        ]

         quality = models.CharField(max_length=4, choices=MESSAGES_QUALITIES,
                 default='l', verbose_name=_('message quality'))
         default_country_code = models.CharField(max_length=3, default=u'33')
         default_trunk_prefix = models.CharField(max_length=2, default=u'0')
         # FIXME: add regexp field, to check destination and from format
         class Meta:
-...
         def send(self, text, sender, destinations):
             """Send a SMS using the Mobyt provider"""
             # unfortunately it lacks a batch API...
             destinations = self.clean_numbers(destinations, self.default_country_code)
             destinations = self.clean_numbers(destinations,
                                               self.default_country_code,
                                               self.default_trunk_prefix)
             rcpt = ','.join(destinations)
             params = urllib.urlencode({
                 'user': self.username,

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('ovh', '0001_initial'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='ovhsmsgateway',
                 name='default_trunk_prefix',
                 field=models.CharField(default='0', max_length=2),
                 preserve_default=True,
             ),
+        ]

                 default=1, verbose_name=_('message class'))
         credit_threshold_alert = models.PositiveIntegerField(default=100)
         default_country_code = models.CharField(max_length=3, default=u'33')
         default_trunk_prefix = models.CharField(max_length=2, default=u'0')
         credit_left = models.PositiveIntegerField(default=0)
         # FIXME: add regexp field, to check destination and from format
-...
         def send(self, text, sender, destinations):
             """Send a SMS using the OVH provider"""
             # unfortunately it lacks a batch API...
             destinations = self.clean_numbers(destinations, self.default_country_code)
             destinations = self.clean_numbers(destinations,
                                               self.default_country_code,
                                               self.default_trunk_prefix)
             text = unicode(text).encode('utf-8')
             to = ','.join(destinations)

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import models, migrations
     class Migration(migrations.Migration):
         dependencies = [
             ('oxyd', '0001_initial'),
+        ]
         operations = [
             migrations.AddField(
                 model_name='oxydsmsgateway',
                 name='default_trunk_prefix',
                 field=models.CharField(default='0', max_length=2),
                 preserve_default=True,
             ),
+        ]

         username = models.CharField(max_length=64)
         password = models.CharField(max_length=64)
         default_country_code = models.CharField(max_length=3, default=u'33')
         default_trunk_prefix = models.CharField(max_length=2, default=u'0')
         # FIXME: add regexp field, to check destination and from format
         class Meta:
-...
         def send(self, text, sender, destinations):
             """Send a SMS using the Oxyd provider"""
             # unfortunately it lacks a batch API...
             destinations = self.clean_numbers(destinations,
                     self.default_country_code, prefix='')
                                               self.default_country_code,
                                               self.default_trunk_prefix)
             for dest in destinations:
                 params = urllib.urlencode({
                     'id': self.username,

         category = _('SMS Providers')
         @classmethod
         def clean_numbers(cls, destinations, default_country_code, prefix='+'):
         def clean_numbers(cls, destinations, default_country_code='33',
                           default_trunk_prefix='0'):  # Yeah France first !
             numbers = []
             for dest in destinations:
                 # most gateways needs the number prefixed by the country code, this is
                 # really unfortunate.
                 dest = dest.strip()
                 number = ''.join(re.findall('[0-9]', dest))
                 if dest.startswith('+'):
                     pass # it already is fully qualified
                     number = '00' + number
                 elif number.startswith('00'):
                     # assumes 00 is international access code, remove it
                     number = number[2:]
                 elif number.startswith('0'):
                     # local prefix, remove 0 and add default country code
                     number = default_country_code + number[1:]
                 numbers.append(prefix + number)
                     pass
                 elif number.startswith(default_trunk_prefix):
                     number = '00' + default_country_code + number[len(default_trunk_prefix):]
                 else:
                     raise NotImplementedError('phone number %r is unsupported (no '
                                               'international prefix, no local '
                                               'trunk prefix)' % number)
                 numbers.append(number)
             return numbers

     from passerelle.sms import SMSGatewayMixin
     def test_clean_numbers():
         assert SMSGatewayMixin.clean_numbers(['+ 33 12'], '33') == ['+3312']
         assert SMSGatewayMixin.clean_numbers(['0 0 33 12'], '33') == ['+3312']
         assert SMSGatewayMixin.clean_numbers(['0 12'], '33') == ['+3312']
         assert SMSGatewayMixin.clean_numbers(['+ 33 12']) == ['003312']
         assert SMSGatewayMixin.clean_numbers(['0 0 33 12']) == ['003312']
         assert SMSGatewayMixin.clean_numbers(['0 12']) == ['003312']
     def test_clean_numbers_no_prefix():
         assert SMSGatewayMixin.clean_numbers(['+ 33 12'], '33', prefix='') == ['3312']
         assert SMSGatewayMixin.clean_numbers(['0 0 33 12'], '33', prefix='') == ['3312']
         assert SMSGatewayMixin.clean_numbers(['0 12'], '33', prefix='') == ['3312']
         assert SMSGatewayMixin.clean_numbers(['+ 33 12']) == ['003312']
         assert SMSGatewayMixin.clean_numbers(['0 0 33 12']) == ['003312']
         assert SMSGatewayMixin.clean_numbers(['0 12']) == ['003312']
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-sms-improve-SMSGatewayMixin.clean_numbers.patch