Extract drafts/recent query logic from controller into Node

Node.drafts_and_autosaves and Node.recently_changed replace inline
query logic in NodesController#drafts/#recent -- pure refactor, no
behavior change for either action. The real reason: the dashboard's
upcoming abridged widgets need the exact same queries the full pages
already use, just limited and (for drafts) sorted with the current
user's own locked nodes first. Better to share one method than let a
widget and a full page quietly drift onto two versions of "what counts
as a current draft."

current_user_id: is an explicit, optional argument rather than a
separate method -- ordering by lock ownership only applies when a user
is given; omitted entirely, it's pure recency, exactly today's
behavior. Needed Arel.sql wrapping a sanitized CASE expression before
.order would accept it -- sanitize_sql_array only vouches for the
values inside the string, a separate Rails safety check still refuses
any string shaped like more than a plain column reference unless it's
explicitly marked as already-vetted.

1 files changed, 24 insertions, 0 deletions

diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 15e908b..de540f8 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -537,4 +537,28 @@ class NodeTest < ActiveSupport::TestCase
     assert_includes Node.editor_search("Backspace Spiegelgraben"), node
     assert_equal 0, Node.editor_search("Backspace Nonexistentstreet").count
   end
+
+  test "drafts_and_autosaves without a user sorts by recency only" do
+    older = Node.root.children.create!(:slug => "drafts_order_older")
+    older.find_or_create_draft(@user1)
+    newer = Node.root.children.create!(:slug => "drafts_order_newer")
+    newer.find_or_create_draft(@user1)
+
+    result = Node.drafts_and_autosaves.to_a
+    assert result.index(newer) < result.index(older)
+  end
+
+  test "drafts_and_autosaves with a user puts their own locked nodes first, regardless of recency" do
+    mine = Node.root.children.create!(:slug => "drafts_order_mine")
+    mine.lock_for_editing!(@user1)
+    mine.autosave!({:title => "mine"}, @user1)
+
+    someone_elses_newer = Node.root.children.create!(:slug => "drafts_order_theirs")
+    other_user = User.find_by_login("quentin")
+    someone_elses_newer.lock_for_editing!(other_user)
+    someone_elses_newer.autosave!({:title => "theirs"}, other_user)
+
+    result = Node.drafts_and_autosaves(current_user_id: @user1.id).to_a
+    assert result.index(mine) < result.index(someone_elses_newer)
+  end
 end