django tutorial #5 completed

pedro/django-tutorial/mysite/polls/models.py

@@ -11,7 +11,10 @@ class Question(models.Model):
   def __str__(self):
     return self.question_text
   def was_published_recently(self):
-    return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
+    # bug
+    #return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
+    now = timezone.now()
+    return now - datetime.timedelta(days=1) <= self.pub_date <= now
 
 class Choice(models.Model):
   question = models.ForeignKey(Question, on_delete=models.CASCADE)

pedro/django-tutorial/mysite/polls/tests.py

@@ -1,3 +1,128 @@
+import datetime
+
 from django.test import TestCase
 
-# Create your tests here.
+from django.utils import timezone
+
+from .models import Question
+
+from django.urls import reverse
+
+
+class QuestionModelTests(TestCase):
+
+  def test_was_published_recently_with_future_question(self):
+    """
+    was_published_recently() returns False for questions whose pub_date
+    is in the future.
+    """
+    time = timezone.now() + datetime.timedelta(days=30)
+    future_question = Question(pub_date=time)
+    self.assertIs(future_question.was_published_recently(), False)
+
+  def test_was_published_recently_with_old_question(self):
+    """
+    was_published_recently() returns False for questions whose pub_date
+    is older than 1 day.
+    """
+    time = timezone.now() - datetime.timedelta(days=1, seconds=1)
+    old_question = Question(pub_date=time)
+    self.assertIs(old_question.was_published_recently(), False)
+
+  def test_was_published_recently_with_recent_question(self):
+    """
+    was_published_recently() returns True for questions whose pub_date
+    is within the last day.
+    """
+    time = timezone.now() - datetime.timedelta(hours=23, minutes=59, seconds=59)
+    recent_question = Question(pub_date=time)
+    self.assertIs(recent_question.was_published_recently(), True)
+
+
+
+def create_question(question_text, days):
+  """
+  Create a question with the given `question_text` and published the
+  given number of `days` offset to now (negative for questions published
+  in the past, positive for questions that have yet to be published).
+  """
+  time = timezone.now() + datetime.timedelta(days=days)
+  return Question.objects.create(question_text=question_text, pub_date=time)
+
+class QuestionIndexViewTests(TestCase):
+  def test_no_questions(self):
+    """
+    If no questions exist, an appropriate message is displayed.
+    """
+    response = self.client.get(reverse('polls:index'))
+    self.assertEqual(response.status_code, 200)
+    self.assertContains(response, "No polls are available.")
+    self.assertQuerysetEqual(response.context['latest_question_list'], [])
+
+  def test_past_question(self):
+    """
+    Questions with a pub_date in the past are displayed on the
+    index page.
+    """
+    create_question(question_text="Past question.", days=-30)
+    response = self.client.get(reverse('polls:index'))
+    self.assertQuerysetEqual(
+      response.context['latest_question_list'],
+      ['<Question: Past question.>']
+    )
+
+  def test_future_question(self):
+    """
+    Questions with a pub_date in the future aren't displayed on
+    the index page.
+    """
+    create_question(question_text="Future question.", days=30)
+    response = self.client.get(reverse('polls:index'))
+    self.assertContains(response, "No polls are available.")
+    self.assertQuerysetEqual(response.context['latest_question_list'], [])
+
+  def test_future_question_and_past_question(self):
+    """
+    Even if both past and future questions exist, only past questions
+    are displayed.
+    """
+    create_question(question_text="Past question.", days=-30)
+    create_question(question_text="Future question.", days=30)
+    response = self.client.get(reverse('polls:index'))
+    self.assertQuerysetEqual(
+      response.context['latest_question_list'],
+      ['<Question: Past question.>']
+    )
+
+  def test_two_past_questions(self):
+    """
+    The questions index page may display multiple questions.
+    """
+    create_question(question_text="Past question 1.", days=-30)
+    create_question(question_text="Past question 2.", days=-5)
+    response = self.client.get(reverse('polls:index'))
+    self.assertQuerysetEqual(
+      response.context['latest_question_list'],
+      ['<Question: Past question 2.>', '<Question: Past question 1.>']
+    )
+
+class QuestionDetailViewTests(TestCase):
+  def test_future_question(self):
+    """
+    The detail view of a question with a pub_date in the future
+    returns a 404 not found.
+    """
+    future_question = create_question(question_text='Future question.', days=5)
+    url = reverse('polls:detail', args=(future_question.id,))
+    response = self.client.get(url)
+    self.assertEqual(response.status_code, 404)
+
+  def test_past_question(self):
+    """
+    The detail view of a question with a pub_date in the past
+    displays the question's text.
+    """
+    past_question = create_question(question_text='Past Question.', days=-5)
+    url = reverse('polls:detail', args=(past_question.id,))
+    response = self.client.get(url)
+    self.assertContains(response, past_question.question_text)

pedro/django-tutorial/mysite/polls/views.py

@@ -11,6 +11,8 @@ from .models import Choice, Question
 
 from django.http import Http404
 
+from django.utils import timezone
+
 ## simple index
 #def index(request):
 #  return HttpResponse("Hello, world. You're at the polls index.")
@@ -43,9 +45,20 @@ class IndexView(generic.ListView):
   template_name = 'polls/index.html'
   context_object_name = 'latest_question_list'
 
+## has bug
+#  def get_queryset(self):
+#    """Return the last five published questions."""
+#    return Question.objects.order_by('-pub_date')[:5]
+
+# refactor
   def get_queryset(self):
-    """Return the last five published questions."""
-    return Question.objects.order_by('-pub_date')[:5]
+    """
+    Return the last five published questions (not including those set to be
+    published in the future).
+    """
+    return Question.objects.filter(
+      pub_date__lte=timezone.now()
+    ).order_by('-pub_date')[:5]
 
 ## simple detail
 #def detail(request, question_id):
@@ -68,6 +81,11 @@ class IndexView(generic.ListView):
 class DetailView(generic.DetailView):
   model = Question
   template_name = 'polls/detail.html'
+  def get_queryset(self):
+    """
+    Excludes any questions that aren't published yet.
+    """
+    return Question.objects.filter(pub_date__lte=timezone.now())
 
 #def results(request, question_id):
 #  response = "You're looking at the results of question %s."