FEAT: moved sorting from the model to a helper

Author: Christian Kruse

app/controllers/application_controller.rb

@@ -16,6 +16,7 @@ class ApplicationController < ActionController::Base
   include FayeHelper
   include MessageHelper
   include SortablesHelper
+  include SortingHelper
 
   before_filter :do_init, :locked?, :set_forums, :notifications,
                 :run_before_handler, :check_authorizations

app/controllers/cf_forums_controller.rb

@@ -53,7 +53,9 @@ def index
 
   def redirect_archive
     thread = CfThread.find_by_tid(params[:tid][1..-1].to_i)
+
     if thread
+      sort_thread(thread)
       redirect_to cf_message_url(thread, thread.message), status: 301
     else
       raise CForum::NotFoundException.new # TODO: add message

app/controllers/cf_threads_controller.rb

@@ -158,6 +158,7 @@ def create
   def moving
     @id     = CfThread.make_id(params)
     @thread = CfThread.includes(:forum).where(slug: @id).first!
+    @thread.gen_tree
 
     if current_user.admin
       @forums = CfForum.order('name ASC')

app/helpers/rights_helper.rb

@@ -60,7 +60,7 @@ def get_thread
     raise CForum::NotFoundException.new if thread.blank?
 
     # sort messages
-    thread.message
+    sort_thread(thread)
 
     return thread, id
   end

app/helpers/sorting_helper.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+module SortingHelper
+  def sort_thread(thread, message = nil, direction = nil)
+    direction = uconf('sort_messages', 'ascending') if direction.blank?
+
+    if message.blank?
+      thread.gen_tree
+      message = thread.sorted_messages[0]
+    end
+
+    unless message.messages.blank?
+      if direction == 'ascending'
+        message.messages.sort! { |a,b| a.created_at <=> b.created_at }
+      else
+        message.messages.sort! { |a,b| b.created_at <=> a.created_at }
+      end
+
+      message.messages.each do |m|
+        sort_thread(thread, m, direction)
+      end
+    end
+  end
+end
+
+# eof

app/helpers/threads_helper.rb

@@ -78,6 +78,10 @@ def index_threads
       @threads = b.call(@threads)
     end
 
+    @threads.each do |t|
+      sort_thread(t)
+    end
+
     @threads
   end
 end

app/models/cf_thread.rb

@@ -82,18 +82,6 @@ def gen_tree
     end
   end
 
-  def sort_tree(msg = nil)
-    msg = message if msg.nil?
-
-    unless msg.messages.blank?
-      msg.messages.sort! {|a,b| b.created_at <=> a.created_at }
-
-      msg.messages.each do |m|
-        sort_tree(m)
-      end
-    end
-  end
-
   def self.gen_id(thread, num = nil)
     now = thread.message.created_at
     now = Time.now if now.nil?
@@ -124,16 +112,6 @@ def self.make_id(year, mon = nil, day = nil, tid = nil)
     self.flags ||= {} if attributes.has_key? 'flags'
   end
 
-  def sorted_messages
-    if not @generated
-      @generated = true
-      gen_tree
-      sort_tree
-    end
-
-    @sorted_messages
-  end
-
   def acceptance_forbidden?(usr, uuid)
     forbidden = false
 

lib/async/notify_new_task.rb

@@ -56,7 +56,7 @@ def perform_message(args)
     @sent_mails = {}
     @notified   = {}
 
-    @thread.sorted_messages.each do |m|
+    @thread.messages.each do |m|
       Rails.logger.debug "notify new task: perform_message: owner: " + m.owner.inspect
 
       if check_notify(m.owner, @thread, @message, @parent)

test/unit/cf_message_test.rb

@@ -74,6 +74,7 @@ class CfMessageTest < ActiveSupport::TestCase
     m1 = FactoryGirl.create(:cf_message, forum: m.forum, thread: m.thread, parent_id: m.message_id)
 
     t = CfThread.preload(:messages).find(m.thread.thread_id)
+    t.gen_tree
 
     t.sorted_messages[0].delete_with_subtree
     assert m.reload.deleted

test/unit/cf_thread_test.rb

@@ -35,11 +35,13 @@ class CfThreadTest < ActiveSupport::TestCase
     m = FactoryGirl.create(:cf_message, owner: nil, forum: t.forum, thread: t)
 
     t = CfThread.find t.thread_id
+    t.gen_tree
     assert_equal 1, t.sorted_messages.count()
 
     m1 = FactoryGirl.create(:cf_message, owner: nil, forum: t.forum, thread: t, parent_id: m.message_id)
 
     t = CfThread.includes(:messages).find t.thread_id
+    t.gen_tree
     assert_equal 2, t.sorted_messages.count()
     assert_equal m.message_id, t.message.message_id
     assert_equal m1.message_id, t.sorted_messages[0].messages[0].message_id
@@ -89,6 +91,7 @@ class CfThreadTest < ActiveSupport::TestCase
 
   test "acceptance_forbidden?" do
     msg = FactoryGirl.create(:cf_message)
+    msg.thread.gen_tree
 
     assert msg.thread.acceptance_forbidden?(nil, nil)
     assert msg.thread.acceptance_forbidden?('', '')
@@ -103,6 +106,7 @@ class CfThreadTest < ActiveSupport::TestCase
     msg.uuid = '1234'
     msg.save
     msg.reload
+    msg.thread.gen_tree
 
     assert !msg.thread.acceptance_forbidden?(nil, '1234')
     assert msg.thread.acceptance_forbidden?(nil, '12345')