Merge pull request #825 from marshmallow-code/serialize_range

field2range: serialize min/max values

src/apispec/ext/marshmallow/field_converter.py

@@ -320,7 +320,12 @@ def field2range(self, field: marshmallow.fields.Field, ret) -> dict:
             if set(make_type_list(ret.get("type"))) & {"number", "integer"}
             else ("x-minimum", "x-maximum")
         )
-        return make_min_max_attributes(validators, min_attr, max_attr)
+
+        # Serialize min/max values with the field to which the validator is applied
+        return {
+            k: field._serialize(v, None, None)
+            for k, v in make_min_max_attributes(validators, min_attr, max_attr).items()
+        }
 
     def field2length(
         self, field: marshmallow.fields.Field, **kwargs: typing.Any

tests/test_ext_marshmallow_field.py

@@ -238,6 +238,19 @@ class NullableInteger(fields.Field):
     assert res["type"] == ["string", "null"]
 
 
+def test_field_with_range_datetime_type(spec_fixture):
+    field = fields.DateTime(
+        validate=validate.Range(
+            min=dt.datetime(1900, 1, 1),
+            max=dt.datetime(2000, 1, 1),
+        )
+    )
+    res = spec_fixture.openapi.field2property(field)
+    assert res["x-minimum"] == "1900-01-01T00:00:00"
+    assert res["x-maximum"] == "2000-01-01T00:00:00"
+    assert isinstance(res["type"], str)
+
+
 def test_field_with_str_regex(spec_fixture):
     regex_str = "^[a-zA-Z0-9]$"
     field = fields.Str(validate=validate.Regexp(regex_str))

tests/test_ext_marshmallow_openapi.py

@@ -666,7 +666,7 @@ class ValidationSchema(Schema):
             ("custom_field_length", {"minLength": 1, "maxLength": 10}),
             ("multiple_lengths", {"minLength": 3, "maxLength": 7}),
             ("equal_length", {"minLength": 5, "maxLength": 5}),
-            ("date_range", {"x-minimum": datetime(1900, 1, 1)}),
+            ("date_range", {"x-minimum": "1900-01-01T00:00:00"}),
         ],
     )
     def test_properties(self, field, properties, spec):