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

Commit a17ee73

Browse files
Merge pull request #421 from OperationCode/test_chatters
Test chatters
2 parents 8ac8f19 + b5486fb commit a17ee73

File tree

10 files changed

+24
-21
lines changed

10 files changed

+24
-21
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
.idea/**/dynamic.xml
2525
.idea/**/uiDesigner.xml
2626

27+
# VSCode
28+
.vscode/*
29+
2730
# Gradle:
2831
.idea/**/gradle.xml
2932
.idea/**/libraries

app/controllers/api/v1/resources_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module Api
22
module V1
33
class ResourcesController < ApiController
44
before_action :authenticate_user!, except: [:index, :show]
5-
before_filter :set_resource, only: [:show, :update, :destroy]
5+
before_action :set_resource, only: [:show, :update, :destroy]
66

77
def index
88
resources = Resource.with_tags params[:tags]

app/lib/git_hub/issues.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ def initialize
99
@date = GitHubStatistic.last_issue_completed_on
1010
end
1111

12-
def fetch_and_save!
12+
def fetch_and_save!(print_results: true)
1313
get_issues.each do |issue|
1414
git_hub_user = GitHub::Committer.find_or_create_user! issue[:git_hub_user]
15+
git_hub_issue_stat = GitHub::Committer.find_or_create_statistic! issue, issue[:source_type], git_hub_user.id
16+
17+
next unless print_results
1518
p 'git_hub_user:'
1619
p git_hub_user
1720

18-
git_hub_issue_stat = GitHub::Committer.find_or_create_statistic! issue, issue[:source_type], git_hub_user.id
1921
p 'git_hub_issue_stat:'
2022
p git_hub_issue_stat
2123
end

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/lib/git_hub/pull_requests.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ def initialize
99
@date = GitHubStatistic.last_pr_completed_on
1010
end
1111

12-
def fetch_and_save!
12+
def fetch_and_save!(print_results: true)
1313
get_pull_requests.each do |pr|
1414
git_hub_user = GitHub::Committer.find_or_create_user! pr[:git_hub_user]
15+
git_hub_pr_stat = GitHub::Committer.find_or_create_statistic! pr, pr[:source_type], git_hub_user.id
16+
17+
next unless print_results
1518
p 'git_hub_user:'
1619
p git_hub_user
1720

18-
git_hub_pr_stat = GitHub::Committer.find_or_create_statistic! pr, pr[:source_type], git_hub_user.id
1921
p 'git_hub_pr_stat:'
2022
p git_hub_pr_stat
2123
end

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)

lib/tasks/schools_from_yml.rake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ namespace :schools do
3030
puts message
3131
Rails.logger.error message
3232
end
33-
34-
p "Created #{CodeSchool.count} code schools"
35-
p "Created #{Location.count} locations"
3633
end
3734
end
3835
end

test/models/request_test.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
class RequestTest < ActiveSupport::TestCase
44
test 'the truth' do
5-
request = create(:request)
6-
p request.requested_mentor
5+
create(:request)
76
end
87

98
end

test/requests/git_hub/issues_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_get_issues
3535
end
3636

3737
def test_fetch_and_save
38-
@issue_instance.fetch_and_save!
38+
@issue_instance.fetch_and_save!(print_results: false)
3939

4040
assert GitHubStatistic.for_repository(@backend).count == 28
4141
assert GitHubStatistic.for_repository(@backend).issues.count == 28

test/requests/git_hub/pull_requests_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def test_get_pull_requests
5151
end
5252

5353
def test_fetch_and_save
54-
@pr_instance.fetch_and_save!
54+
@pr_instance.fetch_and_save!(print_results: false)
5555

5656
assert GitHubStatistic.for_repository(@slash).count == 4
5757
assert GitHubStatistic.for_repository(@slash).pull_requests.count == 2

0 commit comments

Comments
 (0)