Skip to content
This repository was archived by the owner on Dec 3, 2019. It is now read-only.

Commit 990d409

Browse files
committed
Removed open and closed scope from GitHubStatistic model
I did this to prevent warning messages that would occur when creating scopes named open.
1 parent 8a7a2e8 commit 990d409

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

app/lib/git_hub/presenter.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def oc_totals
1010
{
1111
total_repositories: base_query.repository_count,
1212
total_closed_pull_requests: base_query.pull_requests.count,
13-
total_closed_issues: base_query.issues.closed.count,
13+
total_closed_issues: base_query.issues.is_closed.count,
1414
total_commits: base_query.commits.count,
1515
total_users: base_query.users_made_a_commit,
1616
total_additions: base_query.sum(:additions),
@@ -22,7 +22,7 @@ def totals_by_repository
2222
GitHubStatistic.repositories.each_with_object({}) do |repo, totals|
2323
totals[repo.to_sym] = {
2424
total_closed_pull_requests: base_query.for_repository(repo).pull_requests.count,
25-
total_closed_issues: base_query.for_repository(repo).issues.closed.count,
25+
total_closed_issues: base_query.for_repository(repo).issues.is_closed.count,
2626
total_commits: base_query.for_repository(repo).commits.count,
2727
total_users: base_query.for_repository(repo).users_made_a_commit,
2828
total_additions: base_query.for_repository(repo).sum(:additions),
@@ -38,7 +38,7 @@ def totals_for_user
3838

3939
{
4040
total_closed_pull_requests: base_query.for_git_hub_user(user).pull_requests.count,
41-
total_closed_issues: base_query.for_git_hub_user(user).issues.closed.count,
41+
total_closed_issues: base_query.for_git_hub_user(user).issues.is_closed.count,
4242
total_commits: base_query.for_git_hub_user(user).commits.count,
4343
total_additions: base_query.for_git_hub_user(user).sum(:additions),
4444
total_deletions: base_query.for_git_hub_user(user).sum(:deletions),
@@ -61,7 +61,7 @@ def totals_for_user_in_repository
6161

6262
{
6363
total_closed_pull_requests: user_in_repository(user, repo).pull_requests.count,
64-
total_closed_issues: user_in_repository(user, repo).issues.closed.count,
64+
total_closed_issues: user_in_repository(user, repo).issues.is_closed.count,
6565
total_commits: user_in_repository(user, repo).commits.count,
6666
total_additions: user_in_repository(user, repo).sum(:additions),
6767
total_deletions: user_in_repository(user, repo).sum(:deletions),

app/models/git_hub_statistic.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ class GitHubStatistic < ApplicationRecord
1313
scope :pull_requests, -> { where(source_type: GitHubStatistic::PR) }
1414
scope :issues, -> { where(source_type: GitHubStatistic::ISSUE) }
1515
scope :commits, -> { where(source_type: GitHubStatistic::COMMIT) }
16-
scope :closed, -> { where(state: 'closed') }
17-
scope :open, -> { where(state: 'open') }
16+
scope :is_closed, -> { where(state: 'closed') }
17+
scope :is_open, -> { where(state: 'open') }
1818
scope :for_git_hub_user, -> git_hub_user { where(git_hub_user_id: git_hub_user.id) }
1919
scope :for_repository, -> repository { where(repository: repository) }
2020

@@ -62,7 +62,7 @@ def self.users_made_a_commit
6262
#
6363
def self.users_closed_a_pr
6464
self
65-
.closed
65+
.is_closed
6666
.pull_requests
6767
.pluck(:git_hub_user_id)
6868
.uniq
@@ -91,7 +91,7 @@ def self.repository_count
9191
end
9292

9393
def self.average_closed_prs_per_user
94-
grouped_records = pull_requests.closed.group_by(&:git_hub_user_id)
94+
grouped_records = pull_requests.is_closed.group_by(&:git_hub_user_id)
9595

9696
return 0 unless grouped_records.present?
9797

@@ -122,7 +122,7 @@ def self.per_user_average_in(grouped_records)
122122

123123
def self.last_closed_date
124124
self
125-
.closed
125+
.is_closed
126126
.order(completed_on: :desc)
127127
.first
128128
.try(:completed_on)

0 commit comments

Comments
 (0)