From 44d4fa9fc422fbbeb3e5cafdef45ac4c00ff2da2 Mon Sep 17 00:00:00 2001
From: David Gil <dgilperez@gmail.com>
Date: Tue, 11 Aug 2015 20:27:37 +0200
Subject: [PATCH] order comments by the most recent first

---
 app/controllers/debates_controller.rb | 8 ++++----
 app/models/comment.rb                 | 2 ++
 app/views/comments/_comment.html.erb  | 4 ++--
 app/views/debates/_debate.html.erb    | 2 +-
 app/views/debates/show.html.erb       | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index cca1e89a2..2c0243681 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -4,11 +4,11 @@ class DebatesController < ApplicationController
 
   def index
     if params[:tag]
-      @debates = Debate.tagged_with(params[:tag]).order("created_at DESC")
-      set_voted_values @debates.map(&:id)
+      @debates = Debate.tagged_with(params[:tag]).order(id: :desc)
+      set_voted_values @debates.pluck(:id)
     else
-      @debates = Debate.all.order("created_at DESC")
-      set_voted_values @debates.map(&:id)
+      @debates = Debate.all.order(id: :desc)
+      set_voted_values @debates.pluck(:id)
     end
   end
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index c2cf75292..d4ceb9e3e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -8,6 +8,8 @@ class Comment < ActiveRecord::Base
   belongs_to :commentable, polymorphic: true
   belongs_to :user
 
+  scope :recent, -> { order(id: :desc) }
+
   def self.build(commentable, user, body)
     new commentable: commentable,
         user_id:     user.id,
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index f8eb903a2..4e375c540 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -22,8 +22,8 @@
     </div>
 
     <div class="comment-children">
-      <%= render comment.children %>
+      <%= render comment.children.reorder('id DESC, lft') %>
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
index 0bcc2e708..4620e1232 100644
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -25,4 +25,4 @@
 
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index d10d0e022..28fefd085 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -43,10 +43,10 @@
           <%= render 'comments/form', {parent: @debate, toggeable: false} %>
         </div>
       <% end %>
-      <%= render @debate.root_comments %>
+      <%= render @debate.root_comments.recent %>
     </div>
     <% if current_user && @debate.editable_by?(current_user) %>
       <%= link_to t("debates.show.edit_debate_link"), edit_debate_path(@debate), :class => 'button radius right' %>
     <% end %>
   </div>
-</section>
\ No newline at end of file
+</section>