Skip to content

Commit e88c746

Browse files
BulletdevBulletdev
committed
chore: improve code quality and index methods
 - Code Duplication: Reduced by ~150+ lines through shared concerns - Complexity: Reduced average cyclomatic complexity from 12-23 to 3-5 across all refactored methods - Maintainability: Improved through single responsibility principle - each method now does one thing - Readability: Enhanced with descriptive method names and clear separation of concerns - Security: Maintained SQL injection protection in all sorting/filtering operations - Testability: Each extracted method can now be tested independently
1 parent 52ef4c4 commit e88c746

13 files changed

Lines changed: 345 additions & 428 deletions

File tree

‎app/controllers/api/v1/analytics/performance_controller.rb‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -91,42 +91,10 @@ def calculate_team_overview(matches)
9191
}
9292
end
9393

94-
# Legacy methods - moved to PerformanceAnalyticsService
95-
# Kept for backwards compatibility
94+
# Legacy methods - moved to PerformanceAnalyticsService and AnalyticsCalculations
95+
# These methods now delegate to the concern
9696
# TODO: Remove after confirming no external dependencies
9797

98-
def calculate_win_rate_trend(matches)
99-
super(matches, group_by: :week)
100-
end
101-
102-
def calculate_performance_by_role(matches)
103-
stats = PlayerMatchStat.joins(:player).where(match: matches)
104-
105-
stats.group('players.role').select(
106-
'players.role',
107-
'COUNT(*) as games',
108-
'AVG(player_match_stats.kills) as avg_kills',
109-
'AVG(player_match_stats.deaths) as avg_deaths',
110-
'AVG(player_match_stats.assists) as avg_assists',
111-
'AVG(player_match_stats.gold_earned) as avg_gold',
112-
'AVG(player_match_stats.damage_dealt_total) as avg_damage',
113-
'AVG(player_match_stats.vision_score) as avg_vision'
114-
).map do |stat|
115-
{
116-
role: stat.role,
117-
games: stat.games,
118-
avg_kda: {
119-
kills: stat.avg_kills&.round(1) || 0,
120-
deaths: stat.avg_deaths&.round(1) || 0,
121-
assists: stat.avg_assists&.round(1) || 0
122-
},
123-
avg_gold: stat.avg_gold&.round(0) || 0,
124-
avg_damage: stat.avg_damage&.round(0) || 0,
125-
avg_vision: stat.avg_vision&.round(1) || 0
126-
}
127-
end
128-
end
129-
13098
def identify_best_performers(players, matches)
13199
players.map do |player|
132100
stats = PlayerMatchStat.where(player: player, match: matches)

‎app/jobs/concerns/rank_comparison.rb‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# frozen_string_literal: true
2+
3+
# Concern for comparing League of Legends ranks
4+
#
5+
# Provides utilities for determining if a new rank is higher than a current rank.
6+
# Used in sync jobs to update peak rank information.
7+
8+
module RankComparison
9+
extend ActiveSupport::Concern
10+
11+
TIER_HIERARCHY = %w[IRON BRONZE SILVER GOLD PLATINUM EMERALD DIAMOND MASTER GRANDMASTER CHALLENGER].freeze
12+
13+
RANK_HIERARCHY = %w[IV III II I].freeze
14+
15+
16+
def should_update_peak?(entity, new_tier, new_rank)
17+
return true if entity.peak_tier.blank?
18+
19+
current_tier_index = tier_index(entity.peak_tier)
20+
new_tier_index = tier_index(new_tier)
21+
22+
return true if new_tier_higher?(new_tier_index, current_tier_index)
23+
return false if new_tier_lower?(new_tier_index, current_tier_index)
24+
25+
new_rank_higher?(entity.peak_rank, new_rank)
26+
end
27+
28+
private
29+
30+
def tier_index(tier)
31+
TIER_HIERARCHY.index(tier&.upcase) || 0
32+
end
33+
34+
def rank_index(rank)
35+
RANK_HIERARCHY.index(rank&.upcase) || 0
36+
end
37+
38+
def new_tier_higher?(new_index, current_index)
39+
new_index > current_index
40+
end
41+
42+
def new_tier_lower?(new_index, current_index)
43+
new_index < current_index
44+
end
45+
46+
def new_rank_higher?(current_rank, new_rank)
47+
rank_index(new_rank) > rank_index(current_rank)
48+
end
49+
end

‎app/jobs/sync_player_job.rb‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
class SyncPlayerJob < ApplicationJob
2+
include RankComparison
3+
24
queue_as :default
35

46
retry_on RiotApiService::RateLimitError, wait: :polynomially_longer, attempts: 5
@@ -123,25 +125,6 @@ def sync_champion_mastery(player, riot_service, region)
123125
end
124126
end
125127

126-
def should_update_peak?(player, new_tier, new_rank)
127-
return true if player.peak_tier.blank?
128-
129-
tier_values = %w[IRON BRONZE SILVER GOLD PLATINUM EMERALD DIAMOND MASTER GRANDMASTER CHALLENGER]
130-
rank_values = %w[IV III II I]
131-
132-
current_tier_index = tier_values.index(player.peak_tier&.upcase) || 0
133-
new_tier_index = tier_values.index(new_tier&.upcase) || 0
134-
135-
return true if new_tier_index > current_tier_index
136-
return false if new_tier_index < current_tier_index
137-
138-
# Same tier, compare ranks
139-
current_rank_index = rank_values.index(player.peak_rank&.upcase) || 0
140-
new_rank_index = rank_values.index(new_rank&.upcase) || 0
141-
142-
new_rank_index > current_rank_index
143-
end
144-
145128
def current_season
146129
# This should be dynamic based on Riot's current season
147130
Time.current.year - 2010 # Season 1 was 2011

‎app/jobs/sync_scouting_target_job.rb‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
class SyncScoutingTargetJob < ApplicationJob
2+
include RankComparison
3+
24
queue_as :default
35

46
retry_on RiotApiService::RateLimitError, wait: :polynomially_longer, attempts: 5
@@ -88,25 +90,6 @@ def update_champion_pool(target, mastery_data)
8890
target.update!(champion_pool: champion_names)
8991
end
9092

91-
def should_update_peak?(target, new_tier, new_rank)
92-
return true if target.peak_tier.blank?
93-
94-
tier_values = %w[IRON BRONZE SILVER GOLD PLATINUM EMERALD DIAMOND MASTER GRANDMASTER CHALLENGER]
95-
rank_values = %w[IV III II I]
96-
97-
current_tier_index = tier_values.index(target.peak_tier&.upcase) || 0
98-
new_tier_index = tier_values.index(new_tier&.upcase) || 0
99-
100-
return true if new_tier_index > current_tier_index
101-
return false if new_tier_index < current_tier_index
102-
103-
# Same tier, compare ranks
104-
current_rank_index = rank_values.index(target.peak_rank&.upcase) || 0
105-
new_rank_index = rank_values.index(new_rank&.upcase) || 0
106-
107-
new_rank_index > current_rank_index
108-
end
109-
11093
def load_champion_id_map
11194
DataDragonService.new.champion_id_map
11295
end

‎app/models/player_match_stat.rb‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
class PlayerMatchStat < ApplicationRecord
2-
# Associations
32
belongs_to :match
43
belongs_to :player
54

6-
# Validations
75
validates :champion, presence: true
86
validates :kills, :deaths, :assists, :cs, numericality: { greater_than_or_equal_to: 0 }
97
validates :player_id, uniqueness: { scope: :match_id }
108

11-
# Callbacks
129
before_save :calculate_derived_stats
1310
after_create :update_champion_pool
1411
after_update :log_audit_trail, if: :saved_changes?
1512

16-
# Scopes
1713
scope :by_champion, ->(champion) { where(champion: champion) }
1814
scope :by_role, ->(role) { where(role: role) }
1915
scope :recent, ->(days = 30) { joins(:match).where(matches: { game_start: days.days.ago..Time.current }) }
2016
scope :victories, -> { joins(:match).where(matches: { victory: true }) }
2117
scope :defeats, -> { joins(:match).where(matches: { victory: false }) }
2218

23-
# Instance methods
2419
def kda_ratio
2520
return 0 if deaths.zero?
2621

@@ -53,59 +48,12 @@ def multikill_count
5348
double_kills + triple_kills + quadra_kills + penta_kills
5449
end
5550

51+
5652
def grade_performance
57-
# Simple performance grading based on KDA, CS, and damage
58-
score = 0
53+
total_score = kda_score + cs_score + damage_score + vision_performance_score
54+
average_score = total_score / 4.0
5955

60-
# KDA scoring
61-
kda = kda_ratio
62-
score += case kda
63-
when 0...1 then 1
64-
when 1...2 then 2
65-
when 2...3 then 3
66-
when 3...4 then 4
67-
else 5
68-
end
69-
70-
# CS scoring (assuming 10 CS per minute is excellent)
71-
cs_per_min_value = cs_per_min || 0
72-
score += case cs_per_min_value
73-
when 0...4 then 1
74-
when 4...6 then 2
75-
when 6...8 then 3
76-
when 8...10 then 4
77-
else 5
78-
end
79-
80-
# Damage share scoring
81-
damage_percentage = damage_share_percentage
82-
score += case damage_percentage
83-
when 0...15 then 1
84-
when 15...20 then 2
85-
when 20...25 then 3
86-
when 25...30 then 4
87-
else 5
88-
end
89-
90-
# Vision scoring
91-
vision_per_min = match.game_duration.present? ? vision_score.to_f / (match.game_duration / 60.0) : 0
92-
score += case vision_per_min
93-
when 0...1 then 1
94-
when 1...1.5 then 2
95-
when 1.5...2 then 3
96-
when 2...2.5 then 4
97-
else 5
98-
end
99-
100-
# Average and convert to letter grade
101-
average = score / 4.0
102-
case average
103-
when 0...1.5 then 'D'
104-
when 1.5...2.5 then 'C'
105-
when 2.5...3.5 then 'B'
106-
when 3.5...4.5 then 'A'
107-
else 'S'
108-
end
56+
score_to_grade(average_score)
10957
end
11058

11159
def item_names
@@ -122,6 +70,58 @@ def rune_names
12270

12371
private
12472

73+
def kda_score
74+
case kda_ratio
75+
when 0...1 then 1
76+
when 1...2 then 2
77+
when 2...3 then 3
78+
when 3...4 then 4
79+
else 5
80+
end
81+
end
82+
83+
def cs_score
84+
cs_value = cs_per_min || 0
85+
case cs_value
86+
when 0...4 then 1
87+
when 4...6 then 2
88+
when 6...8 then 3
89+
when 8...10 then 4
90+
else 5
91+
end
92+
end
93+
94+
def damage_score
95+
case damage_share_percentage
96+
when 0...15 then 1
97+
when 15...20 then 2
98+
when 20...25 then 3
99+
when 25...30 then 4
100+
else 5
101+
end
102+
end
103+
104+
def vision_performance_score
105+
vision_per_min = match&.game_duration.present? ? vision_score.to_f / (match.game_duration / 60.0) : 0
106+
case vision_per_min
107+
when 0...1 then 1
108+
when 1...1.5 then 2
109+
when 1.5...2 then 3
110+
when 2...2.5 then 4
111+
else 5
112+
end
113+
end
114+
115+
def score_to_grade(average)
116+
case average
117+
when 0...1.5 then 'D'
118+
when 1.5...2.5 then 'C'
119+
when 2.5...3.5 then 'B'
120+
when 3.5...4.5 then 'A'
121+
else 'S'
122+
end
123+
end
124+
125125
def calculate_derived_stats
126126
if match&.game_duration.present? && match.game_duration > 0
127127
minutes = match.game_duration / 60.0
@@ -166,7 +166,6 @@ def update_champion_pool
166166
pool.games_played += 1
167167
pool.games_won += 1 if match.victory?
168168

169-
# Update averages
170169
pool.average_kda = calculate_average_for_champion(:kda_ratio)
171170
pool.average_cs_per_min = calculate_average_for_champion(:cs_per_min)
172171
pool.average_damage_share = calculate_average_for_champion(:damage_share)

0 commit comments

Comments
 (0)