fix regex and remove pytz

Samfundet · Sep 28, 2023 · 317f8ee · 317f8ee
1 parent 7880f92
commit 317f8ee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/backend/Pipfile b/backend/Pipfile
@@ -42,7 +42,6 @@ debugpy = "*"
 gunicorn = "*"
 django-admin-autocomplete-filter = "*"
 django-notifications-hq = "*"
-pytz = "*"
 
 [dev-packages]
 yapf = "*"

diff --git a/backend/samfundet/models/utils/fields.py b/backend/samfundet/models/utils/fields.py
@@ -15,7 +15,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         kwargs['max_length'] = 15
         self.validators = [
             RegexValidator(
-                regex=r'^([\+]?[(]?[0-9]{3}[)]?[-\s\.]?)?[0-9]{3}[-\s\.]?[0-9]{4,6}$',
+                regex=r'^(\+?\(?\d{3}\)?[-\s\.]?)?\d{3}[-\s\.]?\d{4,6}$',
                 message='Enter a valid phonenumber',
             ),
         ]

diff --git a/backend/samfundet/serializers.py b/backend/samfundet/serializers.py
@@ -257,7 +257,7 @@ class RegisterSerializer(serializers.Serializer):
     email = serializers.EmailField(label='Email', write_only=True)
     phone_number = serializers.RegexField(
         label='Phonenumber',
-        regex=r'^([\+]?[(]?[0-9]{3}[)]?[-\s\.]?)?[0-9]{3}[-\s\.]?[0-9]{4,6}$',
+        regex=r'^(\+?\(?\d{3}\)?[-\s\.]?)?\d{3}[-\s\.]?\d{4,6}$',
         write_only=True,
     )
     firstname = serializers.CharField(label='First name', write_only=True)