encode and test format

zbyte64 · zbyte64 · commit 00b0b0e47ad6 · 2017-10-17T13:45:12.000-07:00
diff --git a/openapi_codec/encode.py b/openapi_codec/encode.py
@@ -128,6 +128,10 @@ def _get_field_type(field):
     }.get(field.schema.__class__, 'string')
 
 
+def _get_field_format(field):
+    return field.schema and field.schema.format
+
+
 def _get_parameters(link, encoding):
     """
     Generates Swagger Parameter Item object.
@@ -140,6 +144,7 @@ def _get_parameters(link, encoding):
         location = get_location(link, field)
         field_description = _get_field_description(field)
         field_type = _get_field_type(field)
+        field_format = _get_field_format(field)
         if location == 'form':
             if encoding in ('multipart/form-data', 'application/x-www-form-urlencoded'):
                 # 'formData' in swagger MUST be one of these media types.
@@ -152,6 +157,8 @@ def _get_parameters(link, encoding):
                 }
                 if field_type == 'array':
                     parameter['items'] = {'type': 'string'}
+                if field_format:
+                    parameter['format'] = field_format
                 parameters.append(parameter)
             else:
                 # Expand coreapi fields with location='form' into a single swagger
@@ -179,6 +186,8 @@ def _get_parameters(link, encoding):
                 'description': field_description,
                 'schema': schema
             }
+            if field_format:
+                parameter['format'] = field_format
             parameters.append(parameter)
         else:
             parameter = {
@@ -190,6 +199,8 @@ def _get_parameters(link, encoding):
             }
             if field_type == 'array':
                 parameter['items'] = {'type': 'string'}
+            if field_format:
+                parameter['format'] = field_format
             parameters.append(parameter)
 
     if properties:
diff --git a/tests/test_encode.py b/tests/test_encode.py
@@ -106,3 +106,26 @@ def test_expected_fields(self):
             'type': 'string'  # Everything is a string for now.
         }
         self.assertEquals(self.swagger[0], expected)
+
+
+class TestFormat(TestCase):
+    def setUp(self):
+        self.field = coreapi.Field(
+            name='published_before',
+            required=True,
+            location='query',
+            schema=coreschema.String(description='Filter by published date.', format='date')
+        )
+        self.swagger = _get_parameters(coreapi.Link(fields=[self.field]), encoding='')
+
+    def test_expected_fields(self):
+        self.assertEquals(len(self.swagger), 1)
+        expected = {
+            'name': self.field.name,
+            'required': self.field.required,
+            'in': 'query',
+            'description': self.field.schema.description,
+            'type': 'string',
+            'format': 'date'
+        }
+        self.assertEquals(self.swagger[0], expected)
