first commit

Author: mfbx9da4

.coverage

@@ -0,0 +1 @@
+!coverage.py: This is a private format, don't read it directly!{"lines":{"/Users/da/code/misc/u2me-assignment/u2me/polls/serializers.py":[1,2,4,7,8,10,11,12],"/Users/da/code/misc/u2me-assignment/u2me/polls/tests/test_views.py":[1,3,4,6,9,10,12,14,16,17,19,21,22,24,25,26,28,29],"/Users/da/code/misc/u2me-assignment/u2me/polls/__init__.py":[1],"/Users/da/code/misc/u2me-assignment/u2me/polls/tests/test_models.py":[1,3,4,6,7,10,11,13,14,16,21,22,23],"/Users/da/code/misc/u2me-assignment/u2me/polls/views.py":[1,2,3,4,5,7,10,11,12,14,19,20,21,24,25,26,29],"/Users/da/code/misc/u2me-assignment/u2me/polls/tests/__init__.py":[1],"/Users/da/code/misc/u2me-assignment/u2me/polls/urls.py":[1,2,4,5,8,9,11,14,15,16,17,18],"/Users/da/code/misc/u2me-assignment/u2me/polls/api_views.py":[1,2,4,5,8,9,10,11,12],"/Users/da/code/misc/u2me-assignment/u2me/polls/data.py":[1,2,5,6,7,8],"/Users/da/code/misc/u2me-assignment/u2me/polls/tests/test_data.py":[1,3,4,7,8,10,12,14,15,17,19,20,22,23,24,25,26],"/Users/da/code/misc/u2me-assignment/u2me/polls/tests/factories.py":[1,2,3,5,8,9,10,12,15,16,17,19],"/Users/da/code/misc/u2me-assignment/u2me/polls/apps.py":[1,3,6,7],"/Users/da/code/misc/u2me-assignment/u2me/polls/admin.py":[1,3,5,6],"/Users/da/code/misc/u2me-assignment/u2me/polls/models.py":[1,2,4,5,8,9,10,12,13,14,16,17,20,21,22,23,25]}}

.gitignore

@@ -0,0 +1,19 @@
+# Python
+*.py[cod]
+
+# Installer logs
+pip-log.txt
+
+# Misc UNIX Files
+nohup.out
+venv/
+
+# Database
+db.sqlite3
+
+# Client-side
+npm-debug.log
+node_modules/
+
+# OSX stuff
+.DS_Store

client/static/app.js

@@ -0,0 +1,26 @@
+var App = angular.module('App', []);
+
+App.config(function($interpolateProvider, $httpProvider) {
+  $interpolateProvider.startSymbol('{[{');
+  $interpolateProvider.endSymbol('}]}');
+  $httpProvider.defaults.xsrfCookieName = 'csrftoken';
+  $httpProvider.defaults.xsrfHeaderName = 'X-CSRFToken';
+});
+
+App.controller('AppController', function ($scope, $http) {
+    $scope.items = [];
+
+    $http({
+        method: 'GET',
+        url: '/polls/questions/'
+    }).then(success, error);
+
+    function success(response) {
+        console.log(response.data);
+        $scope.items = response.data;
+    }
+
+    function error(response) {
+        console.log('Error retrieving items.');
+    }
+});

client/static/lib.css

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+import os
+import sys
+
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "u2me.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)

client/static/lib.js

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .models import Question, Choice
+
+admin.site.register(Question)
+admin.site.register(Choice)

manage.py

@@ -0,0 +1,18 @@
+from rest_framework.response import Response
+from rest_framework.viewsets import ViewSet
+from django_timer import Timer
+
+from polls.serializers import QuestionSerializer
+from polls.data import list_all_questions_with_total_votes
+
+
+class QuestionSet(ViewSet):
+    def list(self, request):
+    	with Timer() as t:
+	        questions = list_all_questions_with_total_votes()
+        serializer = QuestionSerializer(questions, many=True)
+        res = {
+        	'data': serializer.data,
+        	'took': t.delta
+    	}
+        return Response(res)

polls/__init__.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class PollsConfig(AppConfig):
+    name = 'polls'

polls/admin.py

@@ -0,0 +1,10 @@
+from django.db.models import Sum
+from django.utils import timezone
+from polls.models import Question
+
+
+def list_all_questions_with_total_votes():
+    return Question.objects.all() \
+    					   .filter(pub_date__lte=timezone.now()) \
+                           .annotate(total_votes=Sum('choice__votes')) \
+                           .order_by('-total_votes', '-pub_date')

polls/api_views.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-01-22 23:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Choice',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('choice_text', models.CharField(max_length=200)),
+                ('votes', models.IntegerField(default=0)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Question',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question_text', models.CharField(max_length=200)),
+                ('pub_date', models.DateTimeField(verbose_name=b'date published')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='choice',
+            name='question',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='polls.Question'),
+        ),
+    ]

polls/apps.py

@@ -0,0 +1,26 @@
+from __future__ import unicode_literals
+import datetime
+
+from django.db import models
+from django.utils import timezone
+
+
+class Question(models.Model):
+    question_text = models.CharField(max_length=200)
+    pub_date = models.DateTimeField('date published')
+
+    def was_published_recently(self):
+        now = timezone.now()
+        return self.pub_date >= now - datetime.timedelta(days=1) and now >= self.pub_date
+
+    def __str__(self):
+        return self.question_text
+
+
+class Choice(models.Model):
+    question = models.ForeignKey(Question, on_delete=models.CASCADE)
+    choice_text = models.CharField(max_length=200)
+    votes = models.IntegerField(default=0)
+
+    def __str__(self):
+        return self.choice_text

polls/data.py

@@ -0,0 +1,12 @@
+from rest_framework.serializers import ModelSerializer
+from rest_framework import serializers
+
+from polls.models import Question
+
+
+class QuestionSerializer(ModelSerializer):
+    total_votes = serializers.FloatField(max_value=None, min_value=None)
+
+    class Meta:
+        model = Question
+        fields = ('question_text', 'total_votes')

polls/migrations/0001_initial.py

@@ -0,0 +1,12 @@
+<h1>{{ question.question_text }}</h1>
+
+{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
+
+<form action="{% url 'polls:vote' question.id %}" method="post">
+{% csrf_token %}
+{% for choice in question.choice_set.all %}
+    <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}" />
+    <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br />
+{% endfor %}
+<input type="submit" value="Vote" />
+</form>

polls/migrations/__init__.py

@@ -0,0 +1,48 @@
+{% load staticfiles %}
+
+<!DOCTYPE html>
+<html lang="en" ng-app="App">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Poll</title>
+
+    <script src="{% static 'lib.js' %}"></script>
+    <script src="{% static 'app.js' %}"></script>
+
+    <link rel="stylesheet" type="text/css" href="{% static 'lib.css' %}">
+    <link rel="stylesheet" type="text/css" href="{% static 'ranking.css' %}">
+</head>
+
+<body ng-controller="AppController">
+
+<div class="container-fluid">
+
+    <p>Took {{ took | floatformat:-6 }} seconds for query</p>
+    <div class="row">
+
+        <div class="col-sm-12 table">
+
+            <!-- Table header -->
+            <div class="row header">
+                <div class="col-xs-6">Votes</div>
+                <div class="col-xs-6">Total votes</div>
+            </div>
+
+            {% if latest_question_list %}
+                {% for question in latest_question_list %}
+                    <div class="row">
+                        <div class="col-xs-6"><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></div>
+                        <div class="col-xs-6">{{ question.total_votes }}</div>
+                    </div>
+                {% endfor %}
+            {% else %}
+                <p>No polls are available.</p>
+            {% endif %}
+
+        </div>
+    </div>
+</div>
+</body>
+
+</html>

polls/models.py

@@ -0,0 +1,9 @@
+<h1>{{ question.question_text }}</h1>
+
+<ul>
+{% for choice in question.choice_set.all %}
+    <li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
+{% endfor %}
+</ul>
+
+<a href="{% url 'polls:detail' question.id %}">Vote again?</a>

polls/serializers.py

@@ -0,0 +1,19 @@
+from factory.declarations import SubFactory
+from factory.django import DjangoModelFactory
+from django.utils import timezone
+
+from polls.models import Question, Choice
+
+
+class QuestionFactory(DjangoModelFactory):
+    class Meta:
+        model = Question
+
+    pub_date = timezone.now()
+
+
+class ChoiceFactory(DjangoModelFactory):
+    class Meta:
+        model = Choice
+
+    question = SubFactory(QuestionFactory)

polls/templates/polls/detail.html

@@ -0,0 +1,26 @@
+from django.test.testcases import TestCase
+
+from .factories import QuestionFactory, ChoiceFactory
+from polls.data import list_all_questions_with_total_votes
+
+
+class QuestionsApiViewTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super(QuestionsApiViewTest, cls).setUpTestData()
+
+        cls.question_a = QuestionFactory()
+
+        cls.choice_a = ChoiceFactory(question=cls.question_a, votes=2)
+        cls.choice_b = ChoiceFactory(question=cls.question_a, votes=2)
+
+        cls.question_b = QuestionFactory()
+
+        cls.choice_c = ChoiceFactory(question=cls.question_b, votes=3)
+        cls.choice_d = ChoiceFactory(question=cls.question_b, votes=3)
+
+    def test_list_all_questions_returns_correct_vote_counts(self):
+        questions = list_all_questions_with_total_votes()
+        self.assertEqual(len(questions), 2)
+        self.assertEqual(questions[0].total_votes, 6)
+        self.assertEqual(questions[1].total_votes, 4)

polls/templates/polls/index.html

@@ -0,0 +1,23 @@
+import datetime
+
+from django.utils import timezone
+from django.test import TestCase
+
+from polls.models import Question
+from .factories import QuestionFactory
+
+
+class QuestionTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super(QuestionTests, cls).setUpTestData()
+        pass
+
+    def test_was_published_recently_with_future_question(self):
+        """
+        was_published_recently() should return False for questions whose
+        pub_date is in the future.
+        """
+        time = timezone.now() + datetime.timedelta(days=30)
+        future_question = QuestionFactory(pub_date=time)
+        self.assertIs(future_question.was_published_recently(), False)

polls/templates/polls/results.html

@@ -0,0 +1,29 @@
+from json import loads
+
+from django.test.testcases import TestCase
+from django.urls import reverse
+
+from .factories import QuestionFactory, ChoiceFactory
+
+
+class QuestionsApiViewTest(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        super(QuestionsApiViewTest, cls).setUpTestData()
+
+        cls.question_a = QuestionFactory()
+
+        cls.choice_a = ChoiceFactory(question=cls.question_a)
+        cls.choice_b = ChoiceFactory(question=cls.question_a)
+
+        cls.question_b = QuestionFactory()
+
+        cls.choice_c = ChoiceFactory(question=cls.question_b)
+        cls.choice_d = ChoiceFactory(question=cls.question_b)
+
+    def test_json_view_returns_all_quesitons(self):
+        response = self.client.get(reverse('polls:api-question-list'))
+        self.assertEqual(200, response.status_code)
+
+        actual = loads(response.content)
+        self.assertEqual(2, len(actual))

polls/tests/__init__.py

@@ -0,0 +1,19 @@
+from django.conf.urls import url, include
+from rest_framework.routers import DefaultRouter
+
+import views
+from .api_views import QuestionSet
+
+
+router = DefaultRouter()
+router.register(r'questions', QuestionSet, base_name='api-question')
+
+app_name = 'polls'
+
+urlpatterns = [
+    url(r'^$', views.IndexView.as_view(), name='index'),
+    url(r'^(?P<pk>[0-9]+)/$', views.DetailView.as_view(), name='detail'),
+    url(r'^(?P<pk>[0-9]+)/results/$', views.ResultsView.as_view(), name='results'),
+    url(r'^(?P<question_id>[0-9]+)/vote/$', views.vote, name='vote'),
+    url(r'^', include(router.urls)),
+]