Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
fc6f8f20
Commit
fc6f8f20
authored
8 years ago
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added new summary serializers and refactor all of the summary stuff into separate logical classes
parent
dc6ea14b
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
182 additions
and
89 deletions
+182
-89
app/controllers/projects/cycle_analytics_controller.rb
app/controllers/projects/cycle_analytics_controller.rb
+5
-45
app/models/cycle_analytics.rb
app/models/cycle_analytics.rb
+1
-1
app/models/cycle_analytics/summary.rb
app/models/cycle_analytics/summary.rb
+0
-43
app/serializers/analytics_summary_entity.rb
app/serializers/analytics_summary_entity.rb
+7
-0
app/serializers/analytics_summary_serializer.rb
app/serializers/analytics_summary_serializer.rb
+3
-0
lib/gitlab/cycle_analytics/summary.rb
lib/gitlab/cycle_analytics/summary.rb
+36
-0
lib/gitlab/cycle_analytics/summary/base.rb
lib/gitlab/cycle_analytics/summary/base.rb
+20
-0
lib/gitlab/cycle_analytics/summary/commit.rb
lib/gitlab/cycle_analytics/summary/commit.rb
+36
-0
lib/gitlab/cycle_analytics/summary/deploy.rb
lib/gitlab/cycle_analytics/summary/deploy.rb
+11
-0
lib/gitlab/cycle_analytics/summary/issue.rb
lib/gitlab/cycle_analytics/summary/issue.rb
+15
-0
spec/serializers/analytics_stage_serializer_spec.rb
spec/serializers/analytics_stage_serializer_spec.rb
+24
-0
spec/serializers/analytics_summary_serializer_spec.rb
spec/serializers/analytics_summary_serializer_spec.rb
+24
-0
No files found.
app/controllers/projects/cycle_analytics_controller.rb
View file @
fc6f8f20
...
...
@@ -8,10 +8,6 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
def
show
@cycle_analytics
=
::
CycleAnalytics
.
new
(
@project
,
current_user
,
from:
start_date
(
cycle_analytics_params
))
stats_values
,
cycle_analytics_json
=
generate_cycle_analytics_data
@cycle_analytics_no_data
=
stats_values
.
blank?
respond_to
do
|
format
|
format
.
html
format
.
json
{
render
json:
cycle_analytics_json
}
...
...
@@ -26,47 +22,11 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
{
start_date:
params
[
:cycle_analytics
][
:start_date
]
}
end
def
generate_cycle_analytics_data
stats_values
=
[]
cycle_analytics_view_data
=
[[
:issue
,
"Issue"
,
"Related Issues"
,
"Time before an issue gets scheduled"
],
[
:plan
,
"Plan"
,
"Related Commits"
,
"Time before an issue starts implementation"
],
[
:code
,
"Code"
,
"Related Merge Requests"
,
"Time spent coding"
],
[
:test
,
"Test"
,
"Relative Builds Trigger by Commits"
,
"The time taken to build and test the application"
],
[
:review
,
"Review"
,
"Relative Merged Requests"
,
"The time taken to review the code"
],
[
:staging
,
"Staging"
,
"Relative Deployed Builds"
,
"The time taken in staging"
],
[
:production
,
"Production"
,
"Related Issues"
,
"The total time taken from idea to production"
]]
stats
=
cycle_analytics_view_data
.
reduce
([])
do
|
stats
,
(
stage_method
,
stage_text
,
stage_legend
,
stage_description
)
|
value
=
@cycle_analytics
.
send
(
stage_method
).
presence
stats_values
<<
value
.
abs
if
value
stats
<<
{
title:
stage_text
,
description:
stage_description
,
legend:
stage_legend
,
value:
value
&&
!
value
.
zero?
?
distance_of_time_in_words
(
value
)
:
nil
def
cycle_analytics_json
{
summary:
@cycle_analytics
.
summary
,
stats:
nil
,
# TODO
permissions:
@cycle_analytics
.
permissions
(
user:
current_user
)
# TODO
}
stats
end
issues
=
@cycle_analytics
.
summary
.
new_issues
commits
=
@cycle_analytics
.
summary
.
commits
deploys
=
@cycle_analytics
.
summary
.
deploys
summary
=
[
{
title:
"New Issue"
.
pluralize
(
issues
),
value:
issues
},
{
title:
"Commit"
.
pluralize
(
commits
),
value:
commits
},
{
title:
"Deploy"
.
pluralize
(
deploys
),
value:
deploys
}
]
cycle_analytics_hash
=
{
summary:
summary
,
stats:
stats
,
permissions:
@cycle_analytics
.
permissions
(
user:
current_user
)
}
[
stats_values
,
cycle_analytics_hash
]
end
end
This diff is collapsed.
Click to expand it.
app/models/cycle_analytics.rb
View file @
fc6f8f20
...
...
@@ -7,7 +7,7 @@ class CycleAnalytics
end
def
summary
@summary
||=
Summary
.
new
(
@project
,
from:
@options
[
:from
])
@summary
||=
Gitlab
::
CycleAnalytics
::
Summary
.
new
(
@project
,
from:
@options
[
:from
]).
data
end
def
method_missing
(
method_sym
,
*
arguments
,
&
block
)
...
...
This diff is collapsed.
Click to expand it.
app/models/cycle_analytics/summary.rb
View file @
fc6f8f20
class
CycleAnalytics
class
Summary
def
initialize
(
project
,
current_user
,
from
:)
@project
=
project
@current_user
=
current_user
@from
=
from
end
def
new_issues
IssuesFinder
.
new
(
@current_user
,
project_id:
@project
.
id
).
execute
.
created_after
(
@from
).
count
end
def
commits
ref
=
@project
.
default_branch
.
presence
count_commits_for
(
ref
)
end
def
deploys
@project
.
deployments
.
where
(
"created_at > ?"
,
@from
).
count
end
private
# Don't use the `Gitlab::Git::Repository#log` method, because it enforces
# a limit. Since we need a commit count, we _can't_ enforce a limit, so
# the easiest way forward is to replicate the relevant portions of the
# `log` function here.
def
count_commits_for
(
ref
)
return
unless
ref
repository
=
@project
.
repository
.
raw_repository
sha
=
@project
.
repository
.
commit
(
ref
).
sha
cmd
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
--git-dir=
#{
repository
.
path
}
log)
cmd
<<
'--format=%H'
cmd
<<
"--after=
#{
@from
.
iso8601
}
"
cmd
<<
sha
raw_output
=
IO
.
popen
(
cmd
)
{
|
io
|
io
.
read
}
raw_output
.
lines
.
count
end
end
end
This diff is collapsed.
Click to expand it.
app/serializers/analytics_summary_entity.rb
0 → 100644
View file @
fc6f8f20
class
AnalyticsSummaryEntity
<
Grape
::
Entity
expose
:value
,
safe:
true
expose
:title
do
|
object
|
object
.
title
.
pluralize
(
object
.
value
)
end
end
This diff is collapsed.
Click to expand it.
app/serializers/analytics_summary_serializer.rb
0 → 100644
View file @
fc6f8f20
class
AnalyticsSummarySerializer
<
BaseSerializer
entity
AnalyticsSummaryEntity
end
This diff is collapsed.
Click to expand it.
lib/gitlab/cycle_analytics/summary.rb
0 → 100644
View file @
fc6f8f20
module
Gitlab
module
CycleAnalytics
module
Summary
extend
self
def
initialize
(
project
,
from
:)
@project
=
project
@from
=
from
end
def
data
[
serialize
(
issue
),
serialize
(
commit
),
serialize
(
deploy
)]
end
private
def
serialize
(
summary_object
)
AnalyticsSummarySerializer
.
new
.
represent
(
summary_object
).
as_json
end
def
issue
Summary
::
Issue
.
new
(
project:
@project
,
from:
@from
)
end
def
deploy
Summary
::
Deploy
.
new
(
project:
@project
,
from:
@from
)
end
def
commit
Summary
::
Commit
.
new
(
project:
@project
,
from:
@from
)
end
end
end
end
This diff is collapsed.
Click to expand it.
lib/gitlab/cycle_analytics/summary/base.rb
0 → 100644
View file @
fc6f8f20
module
Gitlab
module
CycleAnalytics
module
Summary
class
Base
def
initialize
(
project
:,
from
:)
@project
=
project
@from
=
from
end
def
title
self
.
name
end
def
value
raise
NotImplementedError
.
new
(
"Expected
#{
self
.
name
}
to implement value"
)
end
end
end
end
end
This diff is collapsed.
Click to expand it.
lib/gitlab/cycle_analytics/summary/commit.rb
0 → 100644
View file @
fc6f8f20
module
Gitlab
module
CycleAnalytics
module
Summary
class
Commit
<
Base
def
value
@value
||=
count_commits
end
private
# Don't use the `Gitlab::Git::Repository#log` method, because it enforces
# a limit. Since we need a commit count, we _can't_ enforce a limit, so
# the easiest way forward is to replicate the relevant portions of the
# `log` function here.
def
count_commits
return
unless
ref
repository
=
@project
.
repository
.
raw_repository
sha
=
@project
.
repository
.
commit
(
ref
).
sha
cmd
=
%W(git --git-dir=
#{
repository
.
path
}
log)
cmd
<<
'--format=%H'
cmd
<<
"--after=
#{
@from
.
iso8601
}
"
cmd
<<
sha
raw_output
=
IO
.
popen
(
cmd
)
{
|
io
|
io
.
read
}
raw_output
.
lines
.
count
end
def
ref
@ref
||=
@project
.
default_branch
.
presence
end
end
end
end
end
This diff is collapsed.
Click to expand it.
lib/gitlab/cycle_analytics/summary/deploy.rb
0 → 100644
View file @
fc6f8f20
module
Gitlab
module
CycleAnalytics
module
Summary
class
Deploy
<
Base
def
value
@value
||=
@project
.
deployments
.
where
(
"created_at > ?"
,
@from
).
count
end
end
end
end
end
This diff is collapsed.
Click to expand it.
lib/gitlab/cycle_analytics/summary/issue.rb
0 → 100644
View file @
fc6f8f20
module
Gitlab
module
CycleAnalytics
module
Summary
class
Issue
<
Base
def
title
'New Issue'
end
def
value
@value
||=
@project
.
issues
.
created_after
(
@from
).
count
end
end
end
end
end
This diff is collapsed.
Click to expand it.
spec/serializers/analytics_stage_serializer_spec.rb
0 → 100644
View file @
fc6f8f20
require
'spec_helper'
describe
AnalyticsStageSerializer
do
let
(
:serializer
)
do
described_class
.
new
.
represent
(
resource
)
end
let
(
:json
)
{
serializer
.
as_json
}
let
(
:resource
)
{
Gitlab
::
CycleAnalytics
::
CodeStage
.
new
(
project:
double
,
options:
{},
stage: :code
)
}
before
do
allow_any_instance_of
(
Gitlab
::
CycleAnalytics
::
MetricsFetcher
).
to
receive
(
:calculate_metric
).
and_return
(
1.12
)
allow_any_instance_of
(
Gitlab
::
CycleAnalytics
::
BaseEvent
).
to
receive
(
:event_result
).
and_return
({})
end
it
'it generates payload for single object'
do
expect
(
json
).
to
be_an_instance_of
Hash
end
it
'contains important elements of AnalyticsStage'
do
expect
(
json
).
to
include
(
:title
,
:description
,
:value
)
end
end
This diff is collapsed.
Click to expand it.
spec/serializers/analytics_summary_serializer_spec.rb
0 → 100644
View file @
fc6f8f20
require
'spec_helper'
describe
AnalyticsSummarySerializer
do
let
(
:serializer
)
do
described_class
.
new
.
represent
(
resource
)
end
let
(
:json
)
{
serializer
.
as_json
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:resource
)
{
Gitlab
::
CycleAnalytics
::
Summary
::
Issue
.
new
(
project:
double
,
from:
1
.
day
.
ago
)
}
before
do
allow_any_instance_of
(
Gitlab
::
CycleAnalytics
::
Summary
::
Issue
).
to
receive
(
:value
).
and_return
(
1.12
)
end
it
'it generates payload for single object'
do
expect
(
json
).
to
be_an_instance_of
Hash
end
it
'contains important elements of AnalyticsStage'
do
expect
(
json
).
to
include
(
:title
,
:value
)
end
end
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment