0001-standardize-phonenumber-format-23443.patch

Josué Kouka, 30 avril 2018 11:55

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

Subject: [PATCH] standardize phonenumber format (#23443)

 corbo/migrations/0011_auto_20180426_1334.py | 26 +++++++++++++++++++++++
 corbo/models.py                             | 11 +++++++++-
 corbo/utils.py                              |  9 ++++++++
 tests/conftest.py                           |  6 ++++++
 tests/test_api.py                           | 10 ++++++---
 tests/test_data_migrations.py               | 32 +++++++++++++++++++++++++++++
 6 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 corbo/migrations/0011_auto_20180426_1334.py
 create mode 100644 tests/test_data_migrations.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations
     from corbo.utils import format_phonenumber
     def format_sms_identifiers(apps, schema_editor):
         Subscription = apps.get_model('corbo', 'Subscription')
         uri = 'sms:'
         for subscription in Subscription.objects.filter(identifier__startswith=uri):
             _, phonenumber = subscription.identifier.split(':')
             subscription.identifier = uri + format_phonenumber(phonenumber)
             subscription.save()
     class Migration(migrations.Migration):
         dependencies = [
             ('corbo', '0010_broadcast_delivery_count'),
+        ]
         operations = [
             migrations.RunPython(format_sms_identifiers, format_sms_identifiers),
+        ]

     from django.conf import settings
     from django.db import models
     from django.core.files.storage import DefaultStorage
     from django.core.exceptions import ValidationError
     from django.utils.translation import ugettext_lazy as _
     from ckeditor.fields import RichTextField
-...
             self.deliver_time = timezone.now()
             self.save()
         class Meta:
             verbose_name = _('sent')
             ordering = ('-deliver_time',)
-...
         class Meta:
             unique_together = ('category', 'identifier', 'uuid')
         def clean(self):
             if 'sms:' in self.identifier:
                 uri, phonenumber = self.identifier.split(':')
                 self.identifier = '%s:%s' % (uri, utils.format_phonenumber(phonenumber))
         def save(self, *args, **kwargs):
             self.clean()
             return super(Subscription, self).save(*args, **kwargs)

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import os
     import re
     import logging
     import requests
     import urlparse
-...
         else:
             logger.error('SMS send requested but no SMS gateway defined.')
         return sent
     def format_phonenumber(phonenumber):
         phonenumber = re.sub('\(.*?\)', '', phonenumber)
         phonenumber = re.sub('[^\d+]', '', phonenumber)
         if phonenumber:
             phonenumber = phonenumber[0] + re.sub('[^\d]', '', phonenumber[1:])
         return phonenumber

             return Tenant(domain_url=name,
                           schema_name=name.replace('-', '_').replace('.', '_'))
         return make_tenant('corbo.example.net')
     @pytest.fixture(params=['06 10 20 30 40', '+33 6 10 20 30 40',
                     '0033610203040', '+33 (0) 6 10 20 30 40', '0033+610203040+'])
     def phonenumber(request):
         return request.param

     import pytest
     import urllib
     from uuid import uuid4
-...
         for identifier, name in channel_choices:
             for category in categories:
                 uri = '%s:%s' % (identifier, uuid)
                 uri = '%s:%s' % (identifier, '00339988776655')
                 Subscription.objects.create(identifier=uri, uuid=uuid, category=category)
             resp = app.get(reverse('subscriptions'), params={'uuid': uuid})
             assert len(resp.json['data']) == 2
-...
         assert transport['id'] == 'mailto'
         assert transport['text'] == 'mailto'
     def test_simple_sms_subscription(app, categories, user):
     def test_simple_sms_subscription(app, categories, user, phonenumber):
         payload = {'category_id': 'alerts', 'transports': ['sms']}
         uuid = uuid4()
         url = '/api/subscribe/?uuid=%s&mobile=0607080900' % uuid
         url_params = urllib.urlencode({'uuid': uuid, 'mobile': phonenumber})
         url = '/api/subscribe/?' + url_params
         app.authorization = ('Basic', ('john.doe', 'password'))
         resp = app.post_json(url, params=payload, status=200)
         assert Subscription.objects.get(uuid=uuid).identifier in ['sms:0610203040', 'sms:+33610203040', 'sms:0033610203040']
         resp = app.get('/api/subscriptions/?uuid=%s' % uuid)
         data = resp.json['data']
         print resp.json

     import uuid
     import pytest
     from django.db import connection
     from django.db.migrations.executor import MigrationExecutor
     pytestmark = pytest.mark.django_db
     def test_subscription_sms_identifier_format_migration():
         executor = MigrationExecutor(connection)
         app = 'corbo'
         migrate_from = [(app, '0009_auto_20170120_1533')]
         migrate_to = [(app, '0011_auto_20180426_1334')]
         executor.migrate(migrate_from)
         executor.loader.build_graph()
         old_apps = executor.loader.project_state(migrate_from).apps
         Category = old_apps.get_model('corbo', 'Category')
         Subscription = old_apps.get_model('corbo', 'Subscription')
         category = Category.objects.create(name='Science', slug='science')
         for identifier in ('sms:06 10 20 30 40', 'sms:+33 6 10 20 30 40', 'sms:0033610203040',
                            'mailto:john@doe.com', 'sms:+33 (0) 6 10 20 30 40'):
             Subscription.objects.create(uuid=uuid.uuid4().hex, category=category, identifier=identifier)
         executor.migrate(migrate_to)
         executor.loader.build_graph()
         apps = executor.loader.project_state(migrate_from).apps
         Subscription = apps.get_model('corbo', 'Subscription')
         assert Subscription.objects.count() == 5
         valid_sms_identifier = ['sms:0610203040', 'sms:+33610203040', 'sms:0033610203040']
         for subscription in Subscription.objects.filter(identifier__startswith='sms:'):
             assert subscription.identifier in valid_sms_identifier
+    -

Projet

Général

Profil

Produits Entr'ouvert » Corbo

0001-standardize-phonenumber-format-23443.patch