0002-csv_import-adapt-user-csv-logic-to-new-phone_number-.patch

Paul Marillonnet, 22 septembre 2022 11:36

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

Subject: [PATCH 2/3] csv_import adapt user csv logic to new phone_number kind
 (#69365)

 src/authentic2/csv_import.py | 31 ++++++++++++++++++++++++++++++-
 tests/test_csv_import.py     | 30 ++++++++++++++++--------------
 tests/test_user_manager.py   | 14 ++++++--------
 3 files changed, 52 insertions(+), 23 deletions(-)

     import io
     import attr
     import phonenumbers
     from chardet.universaldetector import UniversalDetector
     from django import forms
     from django.conf import settings
     from django.contrib.auth.hashers import identify_hasher
     from django.core.exceptions import FieldDoesNotExist, ValidationError
     from django.core.validators import RegexValidator
     from django.db import IntegrityError, models
     from django.db.transaction import atomic
     from django.utils.encoding import force_bytes, force_text
     from django.utils.timezone import now
     from django.utils.translation import ugettext as _
     from authentic2 import app_settings
-...
                         header.key = True
                 elif header.name not in SPECIAL_COLUMNS:
                     try:
                         if header.name in ['email', 'first_name', 'last_name', 'username']:
                         if header.name in ['email', 'phone', 'first_name', 'last_name', 'username']:
                             User._meta.get_field(header.name)
                             header.field = True
                             if header.name == 'email':
-...
                 except IndexError:
                     pass
             if 'phone' in data:
                 # ensure E.164 international representation of phone numbers
                 code = settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE]
                 national_number = ''
                 pn = None
                 try:
                     pn = phonenumbers.parse(data['phone'])
                 except phonenumbers.NumberParseException:
                     try:
                         # fallback on default local dial
                         pn = phonenumbers.parse(
                             data['phone'],
                             settings.PHONE_COUNTRY_CODES[settings.DEFAULT_COUNTRY_CODE],
+                        )
                     except phonenumbers.NumberParseException:
                         pass
                 if pn:
                     code = str(pn.country_code)
                     national_number = '0' * (pn.number_of_leading_zeros or 0) + str(pn.national_number)
                 data.pop('phone')
                 # fill multi value field
                 data['phone_0'] = code
                 data['phone_1'] = national_number
             form = form_class(data=data)
             form.is_valid()
-...
                         setattr(user, cell.header.name, cell.value)
                         if cell.header.name == 'email' and cell.header.verified:
                             user.set_email_verified(True)
                         if cell.header.name == 'phone' and cell.header.verified:
                             user.phone_verified_on = now()
                         cell.action = 'updated'
                         continue
                 cell.action = 'nothing'

             CsvHeader(1, 'email', field=True, key=True, verified=True),
             CsvHeader(2, 'first_name', field=True),
             CsvHeader(3, 'last_name', field=True),
             CsvHeader(4, 'phone', attribute=True),
             CsvHeader(4, 'phone', field=True),
+        ]
         assert importer.has_errors
         assert len(importer.rows) == 3
-...
         assert thomas.attributes.first_name == 'Thomas'
         assert thomas.last_name == 'Noël'
         assert thomas.attributes.last_name == 'Noël'
         assert thomas.attributes.phone == '1234'
         # phonenumbers' e.164 representation from a settings.DEFAULT_COUNTRY_CODE dial:
         assert thomas.attributes.phone == '+331234'
         assert thomas.password
         fpeters = User.objects.get(email='fpeters@entrouvert.com')
-...
         assert fpeters.attributes.first_name == 'Frédéric'
         assert fpeters.last_name == 'Péters'
         assert fpeters.attributes.last_name == 'Péters'
         assert fpeters.attributes.phone == '5678'
         # phonenumbers' e.164 representation from a settings.DEFAULT_COUNTRY_CODE dial:
         assert fpeters.attributes.phone == '+335678'
     def test_simulate(profile, user_csv_importer_factory):
-...
             CsvHeader(1, 'email', field=True, key=True, verified=True),
             CsvHeader(2, 'first_name', field=True),
             CsvHeader(3, 'last_name', field=True),
             CsvHeader(4, 'phone', attribute=True),
             CsvHeader(4, 'phone', field=True),
+        ]
         assert importer.has_errors
         assert len(importer.rows) == 3
-...
         assert all(error == Error('data-error') for error in importer.rows[2].cells[0].errors)
         assert not importer.rows[2].cells[1].errors
         assert not importer.rows[2].cells[2].errors
         assert importer.rows[2].cells[3].errors
         assert not importer.rows[2].cells[3].errors
         assert all(error == Error('data-error') for error in importer.rows[2].cells[3].errors)
         assert importer.updated == 0
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create(ou=get_default_ou())
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         assert importer.run()
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create()
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         assert importer.run()
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create()
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         assert importer.run()
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create(ou=get_default_ou())
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         user = User.objects.create(email='tnoel@entrouvert.com', ou=get_default_ou())
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create()
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         User.objects.create(email='tnoel@entrouvert.com', ou=get_default_ou())
-...
         importer = user_csv_importer_factory(content)
         user = User.objects.create()
         user.attributes.phone = '1234'
         user.attributes.phone = '+331234'
         thomas = User.objects.create(email='tnoel@entrouvert.com', ou=get_default_ou())
-...
         thomas.refresh_from_db()
         assert not thomas.first_name
         assert not thomas.last_name
         assert thomas.attributes.phone == '1234'
         assert thomas.attributes.phone == '+331234'
     def test_external_id(profile, user_csv_importer_factory):
-...
             CsvHeader(3, 'email', field=True, verified=True),
             CsvHeader(4, 'first_name', field=True),
             CsvHeader(5, 'last_name', field=True),
             CsvHeader(6, 'phone', attribute=True),
             CsvHeader(6, 'phone', field=True),
+        ]
         assert not importer.has_errors
         assert len(importer.rows) == 2
-...
             assert thomas.attributes.first_name == 'Thomas'
             assert thomas.last_name == 'Noël'
             assert thomas.attributes.last_name == 'Noël'
             assert thomas.attributes.phone == '1234'
             assert thomas.attributes.phone == '+331234'
         importer = user_csv_importer_factory(content)
         assert importer.run(), importer.errors

                 'users.csv',
                 '''email key verified,first_name,last_name,phone
     tnoel@entrouvert.com,Thomas,Noël,1234
     fpeters@entrouvert.com,Frédéric,Péters,5678
     fpeters@entrouvert.com,Frédéric,Péters,+325678
     john.doe@entrouvert.com,John,Doe,9101112
     x,x,x,x'''.encode(
                     encoding
-...
         assert len(response.pyquery('tr.row-errors')) == 0
         assert len(response.pyquery('tr.row-cells-errors')) == 1
         assert sum(bool(response.pyquery(td).text()) for td in response.pyquery('tr.row-cells-errors td li')) == 2
         assert sum(bool(response.pyquery(td).text()) for td in response.pyquery('tr.row-cells-errors td li')) == 1
         assert 'Enter a valid email address' in response.pyquery('tr.row-cells-errors td.cell-email li').text()
         assert 'Phone number can start with' in response.pyquery('tr.row-cells-errors td.cell-phone li').text()
         assert User.objects.count() == user_count
-...
                 email='tnoel@entrouvert.com',
                 first_name='Thomas',
                 last_name='Noël',
                 attribute_values__content='1234',
                 attribute_values__content='+331234',
             ).count()
             == 1
+        )
-...
                 email='fpeters@entrouvert.com',
                 first_name='Frédéric',
                 last_name='Péters',
                 attribute_values__content='5678',
                 attribute_values__content='+325678',
             ).count()
             == 1
+        )
-...
                 email='john.doe@entrouvert.com',
                 first_name='John',
                 last_name='Doe',
                 attribute_values__content='9101112',
                 attribute_values__content='+339101112',
             ).count()
             == 1
+        )
-...
         assert 'Enter a valid date.' in response.text
         assert 'birthdate must be in the past and greater or equal than 1900-01-01.' in response.text
         assert 'The value must be a valid french postcode' in response.text
         assert 'Phone number can start with a + and must contain only digits' in response.text
         assert User.objects.count() == user_count + 1
         elliot = User.objects.filter(email='elliot@universalpictures.com')[0]
-...
         assert elliot.attributes.values['saintsday'].content == '2019-07-20'
         assert elliot.attributes.values['birthdate'].content == '1972-05-26'
         assert elliot.attributes.values['zip'].content == '75014'
         assert elliot.attributes.values['phone'].content == '1234'
         assert elliot.attributes.values['phone'].content == '+331234'
         csv_lines[2] = "et@universalpictures.com,ET,the Extra-Terrestrial,,,,,,42000,+888 5678"
         response = import_csv('\n'.join(csv_lines), app)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0002-csv_import-adapt-user-csv-logic-to-new-phone_number-.patch