Made field mapping use mix/max kwargs for DurationField validators.

carltongibson · carltongibson · commit 77200f6b76af · 2018-02-22T15:34:27.000+01:00
diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
@@ -12,7 +12,7 @@
 from rest_framework.validators import UniqueValidator
 
 NUMERIC_FIELD_TYPES = (
-    models.IntegerField, models.FloatField, models.DecimalField
+    models.IntegerField, models.FloatField, models.DecimalField, models.DurationField,
 )
 
 
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
@@ -7,6 +7,7 @@
 """
 from __future__ import unicode_literals
 
+import datetime
 import decimal
 from collections import OrderedDict
 
@@ -16,7 +17,6 @@
     MaxValueValidator, MinLengthValidator, MinValueValidator
 )
 from django.db import models
-from django.db.models import DurationField as ModelDurationField
 from django.test import TestCase
 from django.utils import six
 
@@ -347,7 +347,7 @@ class DurationFieldModel(models.Model):
             """
             A model that defines DurationField.
             """
-            duration_field = ModelDurationField()
+            duration_field = models.DurationField()
 
         class TestSerializer(serializers.ModelSerializer):
             class Meta:
@@ -361,6 +361,27 @@ class Meta:
         """)
         self.assertEqual(unicode_repr(TestSerializer()), expected)
 
+    def test_duration_field_with_validators(self):
+        class ValidatedDurationFieldModel(models.Model):
+            """
+            A model that defines DurationField with validators.
+            """
+            duration_field = models.DurationField(
+                validators=[MinValueValidator(datetime.timedelta(days=1)), MaxValueValidator(datetime.timedelta(days=3))]
+            )
+
+        class TestSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = ValidatedDurationFieldModel
+                fields = '__all__'
+
+        expected = dedent("""
+            TestSerializer():
+                id = IntegerField(label='ID', read_only=True)
+                duration_field = DurationField(max_value=datetime.timedelta(3), min_value=datetime.timedelta(1))
+        """)
+        self.assertEqual(unicode_repr(TestSerializer()), expected)
+
 
 class TestGenericIPAddressFieldValidation(TestCase):
     def test_ip_address_validation(self):

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`from rest_framework.validators import UniqueValidator`
`13`	`13`
`14`	`14`	`NUMERIC_FIELD_TYPES = (`
`15`		`- models.IntegerField, models.FloatField, models.DecimalField`
	`15`	`+ models.IntegerField, models.FloatField, models.DecimalField, models.DurationField,`
`16`	`16`	`)`
`17`	`17`
`18`	`18`