From 531587c5cad0e3f78273c0954b91babdd183b424 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Tue, 18 Jun 2013 11:22:09 +0530
Subject: [PATCH] Refactor `TopicsController` and remove code duplication

---
 app/controllers/topics_controller.rb | 37 +++++++++++++++++-----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 318cbf3a4d7..8847a3673b3 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -160,11 +160,7 @@ class TopicsController < ApplicationController
     guardian.ensure_can_move_posts!(topic)
 
     dest_topic = topic.move_posts(current_user, topic.posts.pluck(:id), destination_topic_id: params[:destination_topic_id].to_i)
-    if dest_topic.present?
-      render json: {success: true, url: dest_topic.relative_url}
-    else
-      render json: {success: false}
-    end
+    render_topic_changes(dest_topic)
   end
 
   def move_posts
@@ -173,16 +169,8 @@ class TopicsController < ApplicationController
     topic = Topic.where(id: params[:topic_id]).first
     guardian.ensure_can_move_posts!(topic)
 
-    args = {}
-    args[:title] = params[:title] if params[:title].present?
-    args[:destination_topic_id] = params[:destination_topic_id].to_i if params[:destination_topic_id].present?
-
-    dest_topic = topic.move_posts(current_user, params[:post_ids].map {|p| p.to_i}, args)
-    if dest_topic.present?
-      render json: {success: true, url: dest_topic.relative_url}
-    else
-      render json: {success: false}
-    end
+    dest_topic = move_post_to_destination(topic)
+    render_topic_changes(dest_topic)
   end
 
   def clear_pin
@@ -258,4 +246,23 @@ class TopicsController < ApplicationController
       end
     end
   end
+
+  def render_topic_changes(dest_topic)
+    if dest_topic.present?
+      render json: {success: true, url: dest_topic.relative_url}
+    else
+      render json: {success: false}
+    end
+  end
+
+  private
+
+  def move_post_to_destination(topic)
+    args = {}
+    args[:title] = params[:title] if params[:title].present?
+    args[:destination_topic_id] = params[:destination_topic_id].to_i if params[:destination_topic_id].present?
+
+    topic.move_posts(current_user, params[:post_ids].map {|p| p.to_i}, args)
+  end
+
 end