- {% for question in latest_question_list %}
+ {% for question in latest_question_list.all_poll %}
diff --git a/polls/tests/test_index_views.py b/polls/tests/test_index_views.py
index 4cf0ad2..911dac1 100644
--- a/polls/tests/test_index_views.py
+++ b/polls/tests/test_index_views.py
@@ -12,7 +12,7 @@ class QuestionIndexViewTests(TestCase):
"""
response = self.client.get(reverse("polls:index"))
self.assertEqual(response.status_code, 200)
- self.assertQuerySetEqual(response.context["latest_question_list"], [])
+ self.assertQuerySetEqual(response.context["latest_question_list"]["all_poll"], [])
def test_past_question(self):
"""
@@ -24,7 +24,7 @@ class QuestionIndexViewTests(TestCase):
question.save()
response = self.client.get(reverse("polls:index"))
self.assertQuerySetEqual(
- response.context["latest_question_list"],
+ response.context["latest_question_list"]["all_poll"],
[question],
)
@@ -37,7 +37,7 @@ class QuestionIndexViewTests(TestCase):
future_question.pub_date = timezone.now() + timezone.timedelta(days=30)
future_question.save()
response = self.client.get(reverse("polls:index"))
- self.assertQuerySetEqual(response.context["latest_question_list"], [])
+ self.assertQuerySetEqual(response.context["latest_question_list"]["all_poll"], [])
def test_future_question_and_past_question(self):
"""
@@ -54,7 +54,7 @@ class QuestionIndexViewTests(TestCase):
response = self.client.get(reverse("polls:index"))
self.assertQuerySetEqual(
- response.context["latest_question_list"],
+ response.context["latest_question_list"]["all_poll"],
[past_question],
)
@@ -72,6 +72,6 @@ class QuestionIndexViewTests(TestCase):
response = self.client.get(reverse("polls:index"))
self.assertQuerySetEqual(
- response.context["latest_question_list"],
+ response.context["latest_question_list"]["all_poll"],
[question2, question1],
)
diff --git a/polls/tests/test_question_model.py b/polls/tests/test_question_model.py
index 6514de0..f0cdd07 100644
--- a/polls/tests/test_question_model.py
+++ b/polls/tests/test_question_model.py
@@ -52,7 +52,7 @@ class QuestionModelTests(TestCase):
response = self.client.get(reverse("polls:index"))
self.assertQuerySetEqual(
- response.context["latest_question_list"],
+ response.context["latest_question_list"]["all_poll"],
[question],
)
diff --git a/polls/tests/test_sentiment_model.py b/polls/tests/test_sentiment_model.py
new file mode 100644
index 0000000..c1ede3b
--- /dev/null
+++ b/polls/tests/test_sentiment_model.py
@@ -0,0 +1,42 @@
+from django.test import TransactionTestCase, Client
+from django.contrib.auth.models import User
+
+from .base import create_question
+from ..views import up_down_vote
+
+# ! https://stackoverflow.com/questions/24588520/testing-several-integrityerrors-in-the-same-django-unittest-test-case
+# * https://stackoverflow.com/questions/44450533/difference-between-testcase-and-transactiontestcase-classes-in-django-test
+class UpDownVoteViewTest(TransactionTestCase):
+ @classmethod
+ def setUp(cls) -> None:
+ cls.user = User.objects.create_user(username="test_user", password="12345abc")
+ cls.q1 = create_question(question_text="test 1")
+ cls.client = Client()
+
+ def test_vote_up_once(self):
+ self.client.login(username="test_user", password="12345abc")
+ self.q1.upvote(self.user)
+ self.assertFalse(self.q1.upvote(self.user))
+
+ def test_vote_down_once(self):
+ self.client.login(username="test_user", password="12345abc")
+ self.q1.downvote(self.user)
+ self.assertFalse(self.q1.downvote(self.user))
+
+ def test_can_change_up_to_down(self):
+ self.client.login(username="test_user", password="12345abc")
+ self.q1.upvote(self.user)
+ self.q1.downvote(self.user)
+ count_up = self.q1.sentimentvote_set.filter(vote_types=True).count()
+ count_down = self.q1.sentimentvote_set.filter(vote_types=False).count()
+ self.assertEqual(count_up, 0)
+ self.assertEqual(count_down, 1)
+
+ def test_can_change_up_to_down(self):
+ self.client.login(username="test_user", password="12345abc")
+ self.q1.downvote(self.user)
+ self.q1.upvote(self.user)
+ count_up = self.q1.sentimentvote_set.filter(vote_types=True).count()
+ count_down = self.q1.sentimentvote_set.filter(vote_types=False).count()
+ self.assertEqual(count_up, 1)
+ self.assertEqual(count_down, 0)
\ No newline at end of file
diff --git a/polls/views.py b/polls/views.py
index 1af2b09..9bd06d5 100644
--- a/polls/views.py
+++ b/polls/views.py
@@ -8,6 +8,7 @@ from django.utils import timezone
from django.urls import reverse_lazy, reverse
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib import messages
+from django.contrib.auth import authenticate, login
from django.contrib.auth.decorators import login_required
from django.db.models import Q
@@ -29,10 +30,18 @@ class IndexView(generic.ListView):
Return the last published questions that is published and haven't ended yet.
"""
now = timezone.now()
- return Question.objects.filter(
+ all_poll_queryset = Question.objects.filter(
Q(pub_date__lte=now) & ((Q(end_date__gte=now) | Q(end_date=None)))
).order_by("-pub_date")
+ trend_poll_queryset = Question.objects.filter(
+ Q(pub_date__lte=now) & ((Q(end_date__gte=now) | Q(end_date=None))) & Q(trend_score__gte=100)
+ ).order_by("trend_score", "end_date")[:3]
+
+ queryset = {'all_poll' : all_poll_queryset,
+ 'trend_poll' : trend_poll_queryset,}
+ return queryset
+
class DetailView(LoginRequiredMixin, generic.DetailView):
"""
@@ -105,6 +114,13 @@ class SignUpView(generic.CreateView):
success_url = reverse_lazy('login')
template_name = 'registration/signup.html'
+ def form_valid(self, form):
+ valid = super(SignUpView, self).form_valid(form)
+ username, password = form.cleaned_data.get("username"), form.cleaned_data.get("password1")
+ user = authenticate(username=username, password=password)
+ login(self.request, user)
+ return valid
+
@login_required
def vote(request, question_id):