fix(fcm): Support datetime.timedelta in V2 vibrate_timings_millis validation

Author: jonathanedey

firebase_admin/_messaging_encoder.py

@@ -225,6 +225,23 @@ def check_number_list(cls, label, value):
             raise ValueError(f'{label} must not contain non-number values.')
         return value
 
+    @classmethod
+    def check_vibrate_timings(cls, label, value):
+        """Checks if the given value is a list comprised of numbers or datetime.timedelta
+        instances.
+        """
+        if value is None or value == []:
+            return None
+        if not isinstance(value, list):
+            raise ValueError(f'{label} must be a list of numbers or datetime.timedelta instances.')
+        non_valid = [
+            k for k in value
+            if not isinstance(k, (numbers.Number, datetime.timedelta))
+        ]
+        if non_valid:
+            raise ValueError(f'{label} must not contain non-number or non-timedelta values.')
+        return value
+
     @classmethod
     def check_analytics_label(cls, label, value):
         """Checks if the given value is a valid analytics label."""
@@ -573,7 +590,7 @@ def encode_android_notification_v2(cls, notification):
             'notification_priority': _Validators.check_string(
                 'AndroidNotificationV2.notification_priority', notification.notification_priority,
                 non_empty=True),
-            'vibrate_timings': _Validators.check_number_list(
+            'vibrate_timings': _Validators.check_vibrate_timings(
                 'AndroidNotificationV2.vibrate_timings_millis',
                 notification.vibrate_timings_millis),
             'default_vibrate_timings': notification.default_vibrate_timings,

tests/test_messaging.py

@@ -615,7 +615,7 @@ def test_android_v2_remote_notification(self):
             default_sound=True,
             default_vibrate_timings=True,
             default_light_settings=True,
-            vibrate_timings_millis=[500, 1000],
+            vibrate_timings_millis=[500, datetime.timedelta(seconds=1)],
             visibility='private',
             notification_count=5,
             light_settings=messaging.LightSettings('#ff0000', 500, 1000),
@@ -793,18 +793,22 @@ def test_invalid_title_loc_args(self):
     @pytest.mark.parametrize('data', NON_LIST_ARGS)
     def test_invalid_vibrate_timings_millis(self, data):
         notification = messaging.AndroidNotificationV2(vibrate_timings_millis=data)
-        if isinstance(data, list) and not [x for x in data if not isinstance(x, numbers.Number)]:
+        is_valid_list = (
+            isinstance(data, list)
+            and not [x for x in data if not isinstance(x, (numbers.Number, datetime.timedelta))]
+        )
+        if is_valid_list:
             return
         excinfo = self._check_notification(notification)
         if isinstance(data, list):
             expected = (
                 'AndroidNotificationV2.vibrate_timings_millis must not contain '
-                'non-number values.'
+                'non-number or non-timedelta values.'
             )
         else:
             expected = (
                 'AndroidNotificationV2.vibrate_timings_millis must be a list of '
-                'numbers.'
+                'numbers or datetime.timedelta instances.'
             )
         assert str(excinfo.value) == expected