fix: Accept French Postal Services identifiers in forms

django · Aug 13, 2024 · f673d11 · f673d11
1 parent 1f13beb
commit f673d11
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/docs/authors.rst b/docs/authors.rst
@@ -33,6 +33,7 @@ Authors
 * Ben Konrath
 * Bruno M. Custódio
 * Burhan Khalid
+* Célia Prat
 * Claude Paroz
 * Daniel Ampuero
 * Daniela Ponader

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -17,6 +17,8 @@ Modifications to existing flavors:
 - Fix Belarus passport field description punctuation
   (`gh-484 <https://github.com/django/django-localflavor/pull/484>`_).
 - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA
+- Accept French Postal Services identifiers in forms
+  (`gh-505 <https://github.com/django/django-localflavor/pull/505>`_).
 
 Other changes:
 

diff --git a/localflavor/fr/forms.py b/localflavor/fr/forms.py
@@ -184,21 +184,7 @@ def _check_foreign_countries(self, commune_of_origin, current_year, department_o
             raise ValidationError(self.error_messages['invalid'], code='invalid')
 
 
-class FRSIRENENumberMixin:
-    """Abstract class for SIREN and SIRET numbers, from the SIRENE register."""
-
-    def clean(self, value):
-        value = super().clean(value)
-        if value in self.empty_values:
-            return value
-
-        value = value.replace(' ', '').replace('-', '')
-        if not self.r_valid.match(value) or not luhn.is_valid(value):
-            raise ValidationError(self.error_messages['invalid'], code='invalid')
-        return value
-
-
-class FRSIRENField(FRSIRENENumberMixin, CharField):
+class FRSIRENField(CharField):
     """
     SIREN stands for "Système d'identification du répertoire des entreprises".
 
@@ -220,8 +206,18 @@ def prepare_value(self, value):
         value = value.replace(' ', '').replace('-', '')
         return ' '.join((value[:3], value[3:6], value[6:]))
 
+    def clean(self, value):
+        value = super().clean(value)
+        if value in self.empty_values:
+            return value
 
-class FRSIRETField(FRSIRENENumberMixin, CharField):
+        value = value.replace(' ', '').replace('-', '')
+        if not self.r_valid.match(value) or not luhn.is_valid(value):
+            raise ValidationError(self.error_messages['invalid'], code='invalid')
+        return value
+
+
+class FRSIRETField(CharField):
     """
     SIRET stands for "Système d'identification du répertoire des établissements".
 
@@ -254,6 +250,17 @@ def prepare_value(self, value):
         value = value.replace(' ', '').replace('-', '')
         return ' '.join((value[:3], value[3:6], value[6:9], value[9:]))
 
+    def clean(self, value):
+        value = super().clean(value)
+        if value in self.empty_values:
+            return value
+
+        value = value.replace(' ', '').replace('-', '')
+        if ((not self.r_valid.match(value) or not luhn.is_gvalid(value)) and not
+                (value.startswith("356000000") and sum(int(x) for x in value) % 5 == 0)):
+            raise ValidationError(self.error_messages['invalid'], code='invalid')
+        return value
+
 
 class FRRNAField(CharField):
     """

diff --git a/tests/test_fr.py b/tests/test_fr.py
@@ -271,10 +271,12 @@ def test_FRSIRENNumber(self):
             '752932715': '752932715',
             '752 932 715': '752932715',
             '752-932-715': '752932715',
+            '35600000014597' : '35600000014597'
         }
         invalid = {
             '1234': error_format,               # wrong size
             '752932712': error_format,     # Bad luhn on SIREN
+            '35600000014596' : error_format
         }
         self.assertFieldOutput(FRSIRENField, valid, invalid)