kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Helper methods are meant for views
This commit is contained in:
Timothy Andrew 2016-09-20 18:50:48 +05:30
parent c9247c05eb
commit a4a0ce9500
2 changed files with 34 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/controllers/projects/cycle_analytics_controller.rb
View file

@ -1,5 +1,5 @@
class Projects::CycleAnalyticsController < Projects::ApplicationController
include CycleAnalyticsHelper
include ActionView::Helpers::DateHelper
before_action :authorize_read_cycle_analytics!
@ -8,7 +8,7 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
respond_to do |format|
format.html
format.json { render json: cycle_analytics_json(@cycle_analytics) }
format.json { render json: cycle_analytics_json }
end
end
@ -27,4 +27,36 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
{ start_date: params[:cycle_analytics][:start_date] }
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

35
app/helpers/cycle_analytics_helper.rb
View file

@ -1,35 +0,0 @@
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