Skip to content

Commit

Permalink
Merge pull request #368 from sciyoshi/convert-date-time
Browse files Browse the repository at this point in the history
Convert Date/Time/DateTime form fields to appropriate Graphene types
  • Loading branch information
syrusakbary committed Feb 8, 2018
2 parents adde400 + bb2d24e commit 94ee970
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
16 changes: 16 additions & 0 deletions graphene_django/form_converter.py
Expand Up @@ -2,6 +2,7 @@
from django.forms.fields import BaseTemporalField

from graphene import ID, Boolean, Float, Int, List, String, UUID
from graphene.types.datetime import Date, DateTime, Time

from .forms import GlobalIDFormField, GlobalIDMultipleChoiceField
from .utils import import_single_dispatch
Expand Down Expand Up @@ -63,6 +64,21 @@ def convert_form_field_to_list(field):
return List(ID, required=field.required)


@convert_form_field.register(forms.DateField)
def convert_form_field_to_date(field):
return Date(description=field.help_text, required=field.required)


@convert_form_field.register(forms.DateTimeField)
def convert_form_field_to_datetime(field):
return DateTime(description=field.help_text, required=field.required)


@convert_form_field.register(forms.TimeField)
def convert_form_field_to_time(field):
return Time(description=field.help_text, required=field.required)


@convert_form_field.register(forms.ModelChoiceField)
@convert_form_field.register(GlobalIDFormField)
def convert_form_field_to_id(field):
Expand Down
12 changes: 6 additions & 6 deletions graphene_django/tests/test_form_converter.py
Expand Up @@ -23,18 +23,18 @@ def test_should_unknown_django_field_raise_exception():
assert 'Don\'t know how to convert the Django form field' in str(excinfo.value)


def test_should_date_convert_string():
assert_conversion(forms.DateField, graphene.String)
def test_should_date_convert_date():
assert_conversion(forms.DateField, graphene.types.datetime.Date)


def test_should_time_convert_string():
assert_conversion(forms.TimeField, graphene.String)
def test_should_time_convert_time():
assert_conversion(forms.TimeField, graphene.types.datetime.Time)

def test_should_date_convert_string():
assert_conversion(forms.DateField, graphene.String)

def test_should_date_time_convert_string():
assert_conversion(forms.DateTimeField, graphene.String)
def test_should_date_time_convert_date_time():
assert_conversion(forms.DateTimeField, graphene.types.datetime.DateTime)


def test_should_char_convert_string():
Expand Down

0 comments on commit 94ee970

Please sign in to comment.