Merge pull request #6367 from Abishekcs/refactor/survey-results-to-new-controller

Extract survey results logic into separate SurveyResultsController

Author: ragesoss

app/controllers/survey_results_controller.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class SurveyResultsController < SurveysController
+  layout 'surveys'
+
+  before_action :set_survey
+  before_action :set_question_groups
+
+  def results
+    protect_confidentiality { return }
+    respond_to do |format|
+      format.html
+      format.csv do
+        filename = "#{@survey.name}-results#{Time.zone.today}.csv"
+        send_data @survey.to_csv, filename:
+      end
+    end
+  end
+
+  private
+
+  def set_question_groups
+    super
+    @survey_user_cache = {}
+  end
+end

app/controllers/surveys_controller.rb

@@ -15,14 +15,12 @@ class SurveysController < ApplicationController
     destroy
     edit_question_groups
     course_select
-    results
   ]
   before_action :ensure_logged_in
   before_action :set_question_groups, only: %i[
     show
     edit
     edit_question_groups
-    results
   ]
   before_action :check_if_closed, only: [:show]
   before_action :set_notification, only: [:show]
@@ -41,17 +39,6 @@ def results_index
     @surveys = Survey.all
   end
 
-  def results
-    protect_confidentiality { return }
-    respond_to do |format|
-      format.html
-      format.csv do
-        filename = "#{@survey.name}-results#{Time.zone.today}.csv"
-        send_data @survey.to_csv, filename:
-      end
-    end
-  end
-
   # GET /surveys/1
   # GET /surveys/1.json
   def show
@@ -155,7 +142,6 @@ def set_survey
   def set_question_groups
     @question_groups = Rapidfire::QuestionGroup.all
     @surveys_question_groups = SurveysQuestionGroup.by_position(params[:id])
-    @survey_user_cache = {}
   end
 
   # This removes the question groups that do not apply to the course, because

config/routes.rb

@@ -406,7 +406,7 @@
   resources :survey_assignments, path: 'surveys/assignments'
   post '/survey_assignments/:id/send_test_email' => 'survey_assignments#send_test_email', as: 'send_test_email'
   put '/surveys/question_position' => 'questions#update_position'
-  get '/survey/results/:id' => 'surveys#results', as: 'survey_results'
+  get '/survey/results/:id' => 'survey_results#results', as: 'survey_results'
   get '/survey/question/results/:id' => 'questions#results', as: 'question_results'
   get '/surveys/question_group_question/:id' => 'questions#question'
   get '/surveys/:id/question_group' => 'surveys#edit_question_groups', :as => "edit_question_groups"