From d7f9ea067f8ee19fee0fc5c90f52872c7664952d Mon Sep 17 00:00:00 2001 From: rnlee0054 Date: Tue, 12 May 2015 20:58:53 -0700 Subject: [PATCH] Fix timezone error in Flashcard Serializer --- flashcards/serializers.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/flashcards/serializers.py b/flashcards/serializers.py index 4e2385d..168bd84 100644 --- a/flashcards/serializers.py +++ b/flashcards/serializers.py @@ -1,4 +1,5 @@ from django.utils.datetime_safe import datetime +import pytz from flashcards.models import Section, LecturePeriod, User, Flashcard from flashcards.validators import FlashcardMask, OverlapIntervalException from rest_framework import serializers @@ -116,9 +117,11 @@ class FlashcardSerializer(ModelSerializer): mask = MaskFieldSerializer() def validate_material_date(self, value): + utc = pytz.UTC # TODO: make this dynamic - quarter_start = datetime(2015, 3, 15) - quarter_end = datetime(2015, 6, 15) + quarter_start = utc.localize(datetime(2015, 3, 15)) + quarter_end = utc.localize(datetime(2015, 6, 15)) + if quarter_start <= value <= quarter_end: return value else: @@ -136,11 +139,6 @@ class FlashcardSerializer(ModelSerializer): raise serializers.ValidationError("Invalid creation date for the Flashcard") return value - def validate_section(self, value): - if Section.objects.filter(pk=value).count() > 0: - return value - raise serializers.ValidationError("Invalid section for the flashcard") - def validate_text(self, value): if len(value) > 255: raise serializers.ValidationError("Flashcard text limit exceeded") -- 1.9.1