change from votes to voters in Comment + attempt to sort comments

news/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.5 on 2019-09-10 14:19
+# Generated by Django 2.2.5 on 2019-09-13 13:56
 
 from django.conf import settings
 from django.db import migrations, models
@@ -23,6 +23,7 @@ class Migration(migrations.Migration):
                 ('url', models.CharField(max_length=200)),
                 ('date', models.DateTimeField(verbose_name='date published')),
                 ('state', models.IntegerField(default=0)),
+                ('style', models.IntegerField(default=0)),
                 ('image_url', models.CharField(max_length=100)),
                 ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
@@ -49,11 +50,11 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('body', models.CharField(max_length=100)),
-                ('votes', models.IntegerField(default=0)),
                 ('date', models.DateTimeField(verbose_name='date published')),
                 ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
                 ('parent_comment', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='news.Comment')),
                 ('post', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='news.Post')),
+                ('voters', models.ManyToManyField(related_name='voted_comments', to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

news/migrations/0002_post_style.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.5 on 2019-09-11 14:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('news', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='post',
-            name='style',
-            field=models.IntegerField(default=0),
-        ),
-    ]

news/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.contrib.auth.models import User
 from django.conf import settings
 from enum import Enum
 
@@ -22,17 +23,20 @@ class Post(models.Model):
         return self.title
 
     def top_comments(self):
-        return self.comment_set.all()[:3]
+        return self.comment_set.all()[:5]
+        # return self.comment_set.annotate(ratings_num=count('voters')).order_by('-ratings_num')[:5]
+        # return self.comment_set.order_by('voters_num').all()[:5]
+
 
 class Comment(models.Model):
     author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
     post = models.ForeignKey(Post, on_delete=models.CASCADE, null=True)
     parent_comment = models.ForeignKey("self", on_delete=models.CASCADE, null=True)
     body = models.CharField(max_length=100)
-    votes = models.IntegerField(default=0)
+    voters = models.ManyToManyField(User, related_name='voted_comments')
     date = models.DateTimeField('date published')
     def __str__(self):
-        return self.content
+        return self.body
 
 class Player(models.Model):
     name = models.CharField(max_length=100)

news/templates/news/post.html

@@ -17,7 +17,7 @@
 </div>
 <br/>
 
-<form action="{% url 'news:comment' post.id  %}" method="post">
+<form action="{% url 'news:comment' post.id %}" method="post">
   {% csrf_token %}
 
   <p>Add comment</p>
@@ -32,6 +32,10 @@
 <p>----Comments----</p>
 {% for comment in post.comment_set.all %}
     <p>
+      <form action="{% url 'news:upvote' comment.id %}" method="post">
+        {% csrf_token %}
+        <input type="submit" value="+1">
+      </form>
       <span class="info">{{ comment.author.username }} - {{ comment.date }}</span>
       <br/>
       {{ comment.body }}

news/urls.py

@@ -8,6 +8,7 @@ urlpatterns = [
     path('<int:post_id>', views.post, name='post'),
     path('submission', views.submission, name='submission'),
     path('<int:post_id>/comment', views.comment, name='comment'),
+    path('upvote/<int:comment_id>', views.upvote, name='upvote'),
     path('submitted', views.submitted, name='submitted'),
     path('account', views.account, name='account'),
     path('signin', views.signin, name='signin'),

news/views.py

@@ -22,7 +22,7 @@ def register(request):
         if f.is_valid():
             f.save()
             messages.success(request, 'Account created successfully')
-            return redirect('register')
+            return HttpResponseRedirect(reverse('news:index'))
     else:
         f = CustomUserCreationForm()
 
@@ -104,9 +104,9 @@ def submission(request):
 
             post.image_url = filename
             if request.user.is_staff:
-                post.state = PostState.PUBLISHED
+                post.state = PostState.PUBLISHED.value
             else:
-                post.state = PostState.USER_SUBMITTED
+                post.state = PostState.USER_SUBMITTED.value
             post.save()
 
             return HttpResponseRedirect(reverse('news:submitted'))
@@ -128,5 +128,12 @@ def comment(request, post_id):
     comment = Comment(author=request.user,date=datetime.today())
     comment.post = get_object_or_404(Post, pk=post_id)
     comment.body = request.POST['body']
+    comment.voters.add(request.user)
     comment.save()
     return HttpResponseRedirect(reverse('news:post', args=(post_id,)))
+
+def upvote(request, comment_id):
+    comment = get_object_or_404(Comment, pk=comment_id)
+    comment.voters.add(request.user)
+    comment.save()
+    return render(request, 'news/post.html', {'post': comment.post})