0001-profile-format-phone-numbers-at-cell-rendering-time-.patch

Paul Marillonnet, 03 janvier 2023 15:34

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

Subject: [PATCH] profile: format phone numbers at cell-rendering time (#72769)

 combo/profile/models.py |  3 +++
 combo/profile/utils.py  | 24 ++++++++++++++++++++++++
 setup.py                |  1 +
 tests/settings.py       |  8 ++++++++
 tests/test_profile.py   | 12 +++++++++++-
 5 files changed, 47 insertions(+), 1 deletion(-)

     from combo.data.library import register_cell_class
     from combo.data.models import JsonCellBase
     from combo.profile import utils as profile_utils
     class Profile(models.Model):
-...
                     if value:
                         if attribute['kind'] in ('birthdate', 'date'):
                             value = parse_date(value)
                         if attribute['kind'] == 'phone_number':
                             value = profile_utils.get_formatted_phone(value)
                     extra_context['profile_fields'][attribute['name']]['value'] = value
             else:
                 extra_context['error'] = 'unknown user'

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import phonenumbers
     from django.conf import settings
     from django.contrib.auth.models import User
     from phonenumbers.phonenumberutil import region_code_for_country_code
     if 'mellon' in settings.INSTALLED_APPS:
         from mellon.models import UserSAMLIdentifier
-...
             if raise_on_missing:
                 raise User.DoesNotExist()
             return ProxiedUser(name_id=name_id)
     def get_formatted_phone(value, country_code=None):
         if country_code is None:
             country_code = settings.DEFAULT_COUNTRY_CODE
         region_code = 'ZZ'  # phonenumbers' default value for unknown regions
         try:
             region_code = region_code_for_country_code(int(country_code))
         except ValueError:
             pass
         if region_code == 'ZZ':
             return value
         try:
             pn = phonenumbers.parse(value, region_code)
         except phonenumbers.NumberParseException:
             return value
         if not phonenumbers.is_valid_number(pn):
             return value
         return phonenumbers.format_number(pn, phonenumbers.PhoneNumberFormat.NATIONAL)

setup.py
181	181	'pywebpush',
182	182	'pygal',
183	183	'lxml',
	184	'phonenumbers',
184	185	],
185	186	zip_safe=False,
186	187	cmdclass={

tests/settings.py
105	105	'label': 'Birth Date',
106	106	'user_visible': True,
107	107	},
	108	{
	109	'name': 'phone',
	110	'kind': 'phone_number',
	111	'label': 'Phone',
	112	'user_visible': True,
	113	},
108	114	]
109	115	}
110	116
...	...
121	127	'rest_framework.authentication.BasicAuthentication',
122	128	]
123	129	}
	130
	131	DEFAULT_COUNTRY_CODE = '33'

         cell = ProfileCell(page=page, order=0)
         cell.save()
         data = {'first_name': 'Foo', 'birthdate': '2018-08-10'}
         data = {
             'first_name': 'Foo',
             'birthdate': '2018-08-10',
             'phone': '+33612345678',
+        }
         requests_get.return_value = mock.Mock(content=json.dumps(data), json=lambda: data, status_code=200)
         admin_user.get_name_id = lambda: '123456'
-...
         context = cell.get_cell_extra_context({'synchronous': True, 'selected_user': admin_user})
         assert context['profile_fields']['first_name']['value'] == 'Foo'
         assert context['profile_fields']['birthdate']['value'] == datetime.date(2018, 8, 10)
         assert context['profile_fields']['phone']['value'] == '06 12 34 56 78'
         assert requests_get.call_args[0][0] == 'http://example.org/api/users/123456/'
         data['phone'] = '+336a23c5678'
         requests_get.return_value = mock.Mock(content=json.dumps(data), json=lambda: data, status_code=200)
         context = cell.get_cell_extra_context({'synchronous': True, 'selected_user': admin_user})
         assert context['profile_fields']['phone']['value'] == '+336a23c5678'
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-profile-format-phone-numbers-at-cell-rendering-time-.patch