1 files changed, 14 insertions, 18 deletions

diff --git a/app/controllers/projects/cycle_analytics/events_controller.rb b/app/controllers/projects/cycle_analytics/events_controller.rb
index 13b3eec761f..b69d46f2c41 100644
--- a/app/controllers/projects/cycle_analytics/events_controller.rb
+++ b/app/controllers/projects/cycle_analytics/events_controller.rb
@@ -9,56 +9,52 @@ module Projects
       before_action :authorize_read_merge_request!, only: [:code, :review]
 
       def issue
-        render_events(events.issue_events)
+        render_events(cycle_analytics[:issue].events)
       end
     
       def plan
-        render_events(events.plan_events)
+        render_events(cycle_analytics[:plan].events)
       end
     
       def code
-        render_events(events.code_events)
+        render_events(cycle_analytics[:code].events)
       end
     
       def test
-        options[:branch] = events_params[:branch_name]
+        options(events_params)[:branch] = events_params[:branch_name]
     
-        render_events(events.test_events)
+        render_events(cycle_analytics[:test].events)
       end
     
       def review
-        render_events(events.review_events)
+        render_events(cycle_analytics[:review].events)
       end
     
       def staging
-        render_events(events.staging_events)
+        render_events(cycle_analytics[:staging].events)
       end
     
       def production
-        render_events(events.production_events)
+        render_events(cycle_analytics[:production].events)
       end
     
       private
-    
-      def render_events(events_list)
+
+      def render_events(events)
         respond_to do |format|
           format.html
-          format.json { render json: { events: events_list } }
+          format.json { render json: { events: events } }
         end
       end
     
-      def events
-        @events ||= Gitlab::CycleAnalytics::Events.new(project: project, options: options)
-      end
-    
-      def options
-        @options ||= { from: start_date(events_params), current_user: current_user }
+      def cycle_analytics
+        @cycle_analytics ||= ::CycleAnalytics.new(project, options(events_params))
       end
     
       def events_params
         return {} unless params[:events].present?
     
-        params[:events].slice(:start_date, :branch_name)
+        params[:events].permit(:start_date, :branch_name)
       end
     end
   end