Improve phone number validator type validation

care/utils/models/validators.py

@@ -104,10 +104,20 @@ class PhoneNumberValidator(RegexValidator):
     }
 
     def __init__(self, types: Iterable[str], *args, **kwargs):
-        if not isinstance(types, Iterable) or isinstance(types, str) or len(types) == 0:
+        if not isinstance(types, Iterable) or isinstance(types, str):
             msg = "The `types` argument must be a non-empty iterable."
             raise ValueError(msg)
 
+        types = tuple(types)
+        if not types:
+            msg = "The `types` argument must be a non-empty iterable."
+            raise ValueError(msg)
+
+        unsupported_types = [type_ for type_ in types if type_ not in self.regex_map]
+        if unsupported_types:
+            msg = f"Unsupported phone number type(s): {', '.join(unsupported_types)}."
+            raise ValueError(msg)
+
         self.types = types
         self.message = f"Invalid phone number. Must be one of the following types: {', '.join(self.types)}. Received: %(value)s"
         self.code = "invalid_phone_number"

care/utils/tests/test_phone_number_validator.py

@@ -130,3 +130,27 @@ def test_invalid_support_numbers(self):
         for number in self.invalid_support_numbers:
             with self.assertRaises(ValidationError, msg=f"Failed for {number}"):
                 self.support_validator(number)
+
+    def test_types_must_be_non_empty_iterable(self):
+        invalid_types = ["mobile", ()]
+
+        for types in invalid_types:
+            with self.assertRaisesMessage(
+                ValueError,
+                "The `types` argument must be a non-empty iterable.",
+            ):
+                PhoneNumberValidator(types=types)
+
+    def test_unsupported_types_raise_value_error(self):
+        with self.assertRaisesMessage(
+            ValueError,
+            "Unsupported phone number type(s): pager.",
+        ):
+            PhoneNumberValidator(types=("mobile", "pager"))
+
+    def test_types_accepts_generator(self):
+        types = (type_ for type_ in ("mobile", "landline"))
+        validator = PhoneNumberValidator(types=types)
+
+        self.assertIsNone(validator("+919876543210"))
+        self.assertIsNone(validator("+914902626488"))