Commit a4a0ce95 authored by Timothy Andrew's avatar Timothy Andrew

Move JSON generation (cycle analytics) into a controller method.

Helper methods are meant for views
parent c9247c05
class Projects::CycleAnalyticsController < Projects::ApplicationController class Projects::CycleAnalyticsController < Projects::ApplicationController
include CycleAnalyticsHelper include ActionView::Helpers::DateHelper
before_action :authorize_read_cycle_analytics! before_action :authorize_read_cycle_analytics!
...@@ -8,7 +8,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController ...@@ -8,7 +8,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.json { render json: cycle_analytics_json(@cycle_analytics) } format.json { render json: cycle_analytics_json }
end end
end end
...@@ -27,4 +27,36 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController ...@@ -27,4 +27,36 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
{ start_date: params[:cycle_analytics][:start_date] } { start_date: params[:cycle_analytics][:start_date] }
end end
def cycle_analytics_json
cycle_analytics_view_data = [[:issue, "Issue", "Time before an issue gets scheduled"],
[:plan, "Plan", "Time before an issue starts implementation"],
[:code, "Code", "Time until first merge request"],
[:test, "Test", "Total test time for all commits/merges"],
[:review, "Review", "Time between merge request creation and merge/close"],
[:staging, "Staging", "From merge request merge until deploy to production"],
[:production, "Production", "From issue creation until deploy to production"]]
stats = cycle_analytics_view_data.reduce([]) do |stats, (stage_method, stage_text, stage_description)|
value = @cycle_analytics.send(stage_method).presence
stats << {
title: stage_text,
description: stage_description,
value: value && !value.zero? ? distance_of_time_in_words(value) : nil
}
stats
end
summary = [
{ title: "New Issues", value: @cycle_analytics.summary.new_issues },
{ title: "Commits", value: @cycle_analytics.summary.commits },
{ title: "Deploys", value: @cycle_analytics.summary.deploys }
]
{
summary: summary,
stats: stats
}
end
end end
module CycleAnalyticsHelper
include ActionView::Helpers::DateHelper
def cycle_analytics_json(cycle_analytics)
cycle_analytics_view_data = [[:issue, "Issue", "Time before an issue gets scheduled"],
[:plan, "Plan", "Time before an issue starts implementation"],
[:code, "Code", "Time until first merge request"],
[:test, "Test", "Total test time for all commits/merges"],
[:review, "Review", "Time between merge request creation and merge/close"],
[:staging, "Staging", "From merge request merge until deploy to production"],
[:production, "Production", "From issue creation until deploy to production"]]
stats = cycle_analytics_view_data.reduce([]) do |stats, (stage_method, stage_text, stage_description)|
value = cycle_analytics.send(stage_method).presence
stats << {
title: stage_text,
description: stage_description,
value: value && !value.zero? ? distance_of_time_in_words(value) : nil
}
stats
end
summary = [
{ title: "New Issues", value: cycle_analytics.summary.new_issues },
{ title: "Commits", value: cycle_analytics.summary.commits },
{ title: "Deploys", value: cycle_analytics.summary.deploys }
]
{
summary: summary,
stats: stats
}
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment