Fixed generating Marshmallow DateTime formats

marshmallow-code · Aug 28, 2024 · 47f20ce · 47f20ce
1 parent 5ec8e5c
commit 47f20ce
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/apispec/ext/marshmallow/field_converter.py b/src/apispec/ext/marshmallow/field_converter.py
@@ -574,13 +574,25 @@ def datetime2properties(self, field, **kwargs: typing.Any) -> dict:
                     "example": "1676451277514.654",
                     "min": "0",
                 }
+            elif field.format is not None:
+                ret = {
+                    "type": "string",
+                    "format": None,
+                    "pattern": (
+                        field.metadata["pattern"]
+                        if field.metadata.get("pattern")
+                        else None
+                    ),
+                }
             else:
                 ret = {
                     "type": "string",
                     "format": None,
-                    "pattern": field.metadata["pattern"]
-                    if field.metadata.get("pattern")
-                    else None,
+                    "pattern": (
+                        field.metadata["pattern"]
+                        if field.metadata.get("pattern")
+                        else None
+                    ),
                 }
         return ret