From 607e44e86181a760d555e9d61e4d43e514486c62 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Sun, 12 Jun 2016 21:09:52 +0200
Subject: [PATCH] topics, tests

---
 accounts/models.py                              | 12 +++++++++++-
 accounts/tests.py                               | 17 ++++++++++-------
 proposals/forms.py                              |  2 +-
 proposals/models.py                             |  2 +-
 .../speaker_list.html}                          |  4 ++--
 proposals/templates/proposals/talk_detail.html  |  2 +-
 proposals/templates/proposals/talk_list.html    |  6 +++---
 proposals/templates/proposals/talks.html        |  6 +++---
 proposals/tests.py                              | 13 ++++++++++---
 proposals/urls.py                               |  2 +-
 proposals/views.py                              |  6 ++++--
 11 files changed, 47 insertions(+), 25 deletions(-)
 rename proposals/templates/{auth/user_list.html => proposals/speaker_list.html} (62%)

diff --git a/accounts/models.py b/accounts/models.py
index 29c9598..804d9bc 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -3,6 +3,7 @@ from enum import IntEnum
 from django.contrib.auth.models import User
 from django.contrib.sites.managers import CurrentSiteManager
 from django.contrib.sites.models import Site
+from django.core.urlresolvers import reverse
 from django.db import models
 
 __all__ = ['Profile', 'Speaker']
@@ -17,6 +18,12 @@ class Profile(models.Model):
     user = models.OneToOneField(User)
     biography = models.TextField(blank=True, verbose_name='Biography')
 
+    def __str__(self):
+        return self.user.get_full_name() or self.user.username
+
+    def get_absolute_url(self):
+        return reverse('profile')
+
 
 class Speaker(models.Model):
 
@@ -39,7 +46,10 @@ class Speaker(models.Model):
         unique_together = ('site', 'user')
 
     def __str__(self):
-        return self.user.get_full_name() or self.user.username
+        return str(self.user.profile)
+
+    def get_absolute_url(self):
+        return reverse('show-speaker', kwargs={'username': self.user.username})
 
 
 def create_profile(sender, instance, created, **kwargs):
diff --git a/accounts/tests.py b/accounts/tests.py
index 526e930..6c8293f 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -1,8 +1,9 @@
 from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from .models import Profile
+from .models import Profile, Speaker
 
 ROOT_URL = 'accounts'
 
@@ -11,15 +12,17 @@ class AccountTests(TestCase):
     def setUp(self):
         for guy in 'ab':
             User.objects.create_user(guy, email='%s@example.org' % guy, password=guy)
+        Speaker.objects.create(user=User.objects.first(), site=Site.objects.first())
 
-    # MODELS
-
-    def test_create_profile(self):
+    def test_models(self):
         self.assertEqual(Profile.objects.count(), 2)
+        self.client.login(username='b', password='b')
+        for model in [Profile, Speaker]:
+            item = model.objects.first()
+            self.assertEqual(self.client.get(item.get_absolute_url()).status_code, 200)
+            self.assertTrue(str(item))
 
-    # VIEWS
-
-    def test_profile(self):
+    def test_views(self):
         # User b wants to update its username, email and biography
         user = User.objects.get(username='b')
         self.assertEqual(user.email, 'b@example.org')
diff --git a/proposals/forms.py b/proposals/forms.py
index 11801b1..07eeacd 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -5,4 +5,4 @@ from proposals.models import Talk
 __all__ = ['TalkForm']
 
 
-TalkForm = modelform_factory(Talk, fields=['title', 'description'])
+TalkForm = modelform_factory(Talk, fields=['title', 'description', 'topics'])
diff --git a/proposals/models.py b/proposals/models.py
index cab911b..634e078 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -18,7 +18,7 @@ class Topic(models.Model):
         return self.name
 
     def get_absolute_url(self):
-        return reverse('list-talks-by-topic', kwargs={'slug': self.slug})
+        return reverse('list-talks-by-topic', kwargs={'topic': self.slug})
 
 
 class Talk(models.Model):
diff --git a/proposals/templates/auth/user_list.html b/proposals/templates/proposals/speaker_list.html
similarity index 62%
rename from proposals/templates/auth/user_list.html
rename to proposals/templates/proposals/speaker_list.html
index 1a8cdd5..698b260 100644
--- a/proposals/templates/auth/user_list.html
+++ b/proposals/templates/proposals/speaker_list.html
@@ -7,8 +7,8 @@
 <h1>Speakers:</h1>
 
 <ul>
-{% for speaker in speakers %}
-    <li><a href="{% url 'list-speakers' %}">{{ speaker }}</a></li>
+{% for speaker in user_list %}
+    <li><a href="{% url 'show-speaker' username=speaker.username %}">{{ speaker }}</a></li>
 {% empty %}
     <li><i>No speakers.</i></li>
 {% endfor %}
diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html
index 4d3840c..df75e15 100644
--- a/proposals/templates/proposals/talk_detail.html
+++ b/proposals/templates/proposals/talk_detail.html
@@ -16,7 +16,7 @@
 
 <ul>
 {% for speaker in talk.speakers.all %}
-    <li><a href="{% url 'show-user' speaker.username %}">{{ speaker }}</a></li>
+    <li><a href="{% url 'show-speaker' speaker.username %}">{{ speaker }}</a></li>
 {% empty %}
     <li><i>No speaker.</i></li>
 {% endfor %}
diff --git a/proposals/templates/proposals/talk_list.html b/proposals/templates/proposals/talk_list.html
index e7ce86d..7ed87c4 100644
--- a/proposals/templates/proposals/talk_list.html
+++ b/proposals/templates/proposals/talk_list.html
@@ -7,12 +7,12 @@
 <h1>{{ title }}</h1>
 
 <ul>
-{% for talk in talks %}
+{% for talk in talk_list %}
     <li>
         <a href="{% url 'show-talk' talk.slug %}">{{ talk }}</a>
         <i>by</i>
-        {% for speach in talk.speach_set.all %}
-            <a href="{% url 'show-user' speach.username %}">{{ speach.user }}</a>
+        {% for speaker in talk.speakers.all %}
+            <a href="{% url 'show-speaker' speaker.username %}">{{ speaker }}</a>
             {% if forloop.revcounter == 2 %} and {% elif not forloop.last %}, {% endif %}
         {% endfor %}
     </li>
diff --git a/proposals/templates/proposals/talks.html b/proposals/templates/proposals/talks.html
index f032272..c0a3fa0 100644
--- a/proposals/templates/proposals/talks.html
+++ b/proposals/templates/proposals/talks.html
@@ -13,8 +13,8 @@
     <li>
         <a href="{% url 'show-talk' talk.slug %}">{{ talk }}</a>
         <i>by</i>
-        {% for speach in talk.speach_set.all %}
-            <a href="{% url 'show-user' speach.username %}">{{ speach.user }}</a>
+        {% for speaker in talk.speakers.all %}
+            <a href="{% url 'show-speaker' speaker.username %}">{{ speaker }}</a>
             {% if forloop.revcounter == 2 %} and {% elif not forloop.last %}, {% endif %}
         {% endfor %}
         <a class="btn btn-primary" href="{% url 'edit-talk' talk.slug %}">edit</a>
@@ -32,7 +32,7 @@
         <a href="{% url 'show-talk' talk.slug %}">{{ talk }}</a>
         <i>by</i>
         {% for speach in talk.speach_set.all %}
-            <a href="{% url 'show-user' speach.username %}">{{ speach.user }}</a>
+            <a href="{% url 'show-speaker' speach.username %}">{{ speach.user }}</a>
             {% if forloop.revcounter == 2 %} and {% elif not forloop.last %}, {% endif %}
         {% endfor %}
     </li>
diff --git a/proposals/tests.py b/proposals/tests.py
index 1109764..7454305 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -2,15 +2,16 @@ from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 
-from .models import Talk
+from .models import Talk, Topic, Speach
 
 
 class ProposalsTests(TestCase):
     def setUp(self):
         for guy in 'ab':
             User.objects.create_user(guy, email='%s@example.org' % guy, password=guy)
+        Topic.objects.create(name='pipo')
 
-    def test_views(self):
+    def test_everything(self):
         # talk-edit
         self.client.login(username='a', password='a')
         self.client.post(reverse('add-talk'), {'title': 'super talk', 'description': 'super'})
@@ -27,9 +28,15 @@ class ProposalsTests(TestCase):
         self.assertEqual(self.client.get(reverse('edit-talk', kwargs={'talk': talk.slug})).status_code, 200)
         self.assertEqual(self.client.get(reverse('show-talk', kwargs={'slug': talk.slug})).status_code, 200)
         self.assertEqual(self.client.get(reverse('list-talks-by-speaker', kwargs={'speaker': 'a'})).status_code, 200)
-        self.assertEqual(self.client.get(reverse('show-user', kwargs={'username': 'a'})).status_code, 200)
+        self.assertEqual(self.client.get(reverse('show-speaker', kwargs={'username': 'a'})).status_code, 200)
 
         self.client.login(username='b', password='b')
         self.assertEqual(self.client.post(reverse('edit-talk', kwargs={'talk': 'super-talk'}),
                                           {'title': 'mega talk', 'description': 'mega'}).status_code, 403)
         self.assertEqual(self.client.get(reverse('list-talks')).status_code, 200)
+
+        # Models str & get_asbolute_url
+        for model in [Talk, Topic, Speach]:
+            item = model.objects.first()
+            self.assertEqual(self.client.get(item.get_absolute_url()).status_code, 200)
+            self.assertTrue(str(item))
diff --git a/proposals/urls.py b/proposals/urls.py
index 8205bcc..ceb13d5 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -12,5 +12,5 @@ urlpatterns = [
     url(r'^talk/by-speaker/(?P<speaker>[\w.@+-]+)$', views.talk_list_by_speaker, name='list-talks-by-speaker'),
     url(r'^topic/$', views.TopicList.as_view(), name='list-topics'),
     url(r'^speakers/$', views.SpeakerList.as_view(), name='list-speakers'),
-    url(r'^user/(?P<username>[\w.@+-]+)$', views.user_details, name='show-user'),
+    url(r'^speaker/(?P<username>[\w.@+-]+)$', views.user_details, name='show-speaker'),
 ]
diff --git a/proposals/views.py b/proposals/views.py
index e56cc28..4f6b851 100644
--- a/proposals/views.py
+++ b/proposals/views.py
@@ -29,7 +29,7 @@ def talk_list_by_topic(request, topic):
     topic = get_object_or_404(Topic, slug=topic)
     return render(request, 'proposals/talk_list.html', {
         'title': 'Talks related to %s:' % topic,
-        'talks': Talk.on_site.filter(topics=topic),
+        'talk_list': Talk.on_site.filter(topics=topic),
     })
 
 
@@ -38,7 +38,7 @@ def talk_list_by_speaker(request, speaker):
     speaker = get_object_or_404(User, username=speaker)
     return render(request, 'proposals/talk_list.html', {
         'title': 'Talks with %s:' % speaker,
-        'talks': Talk.on_site.filter(speakers=speaker),
+        'talk_list': Talk.on_site.filter(speakers=speaker),
     })
 
 
@@ -61,6 +61,7 @@ def talk_edit(request, talk=None):
             talk = form.save(commit=False)
             talk.site = site
             talk.save()
+            form.save_m2m()
             Speaker.on_site.get_or_create(user=request.user, site=site)
             Speach.objects.create(speaker=request.user, talk=talk)
             messages.success(request, 'Talk proposed successfully!')
@@ -80,6 +81,7 @@ class TopicList(LoginRequiredMixin, ListView):
 
 class SpeakerList(LoginRequiredMixin, ListView):
     queryset = User.objects.filter(speach__talk=Talk.on_site.all())
+    template_name = 'proposals/speaker_list.html'
 
 
 @login_required