Simplify stats caching #3510

javierm · 2019-05-20T11:57:29Z

References

Backports Simplify stats caching AyuntamientoMadrid/consul#1749

Objectives

Simplify the code in Poll::Stats and Budget::Stats so it's easier to read
Introduce a common concern to handle stats

houndci-bot · 2019-05-20T11:57:36Z

app/models/poll/stats.rb

+       total_participants_booth total_booth_valid total_booth_white total_booth_null
+       total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth
+       total_valid_percentage white_percentage_web white_percentage_booth total_white_percentage
+       null_percentage_web null_percentage_booth total_null_percentage total_participants_web_percentage


Metrics/LineLength: Line is too long. [104/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:36Z

app/models/poll/stats.rb

+  def self.stats_methods
+    %i[total_participants total_participants_web total_web_valid total_web_white total_web_null
+       total_participants_booth total_booth_valid total_booth_white total_booth_null
+       total_valid_votes total_white_votes total_null_votes valid_percentage_web valid_percentage_booth


Metrics/LineLength: Line is too long. [103/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:36Z

app/models/budget/stats.rb

-      end
-  end
+    def supports(supportable)
+      ActsAsVotable::Vote.where(votable_type: "Budget::Investment", votable_id: supportable.investments.pluck(:id))


Metrics/LineLength: Line is too long. [115/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:36Z

app/models/budget/stats.rb

+        percentage_participants_vote_phase: participants_percent(heading_totals, groups_totals, :total_participants_vote_phase),
+        percentage_district_population_vote_phase: population_percent(population, heading_totals[:total_participants_vote_phase]),
+        percentage_participants_all_phase: participants_percent(heading_totals, groups_totals, :total_participants_all_phase),
+        percentage_district_population_all_phase: population_percent(population, heading_totals[:total_participants_all_phase])


Metrics/LineLength: Line is too long. [127/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:36Z

app/models/budget/stats.rb

+        percentage_district_population_support_phase: population_percent(population, heading_totals[:total_participants_support_phase]),
+        percentage_participants_vote_phase: participants_percent(heading_totals, groups_totals, :total_participants_vote_phase),
+        percentage_district_population_vote_phase: population_percent(population, heading_totals[:total_participants_vote_phase]),
+        percentage_participants_all_phase: participants_percent(heading_totals, groups_totals, :total_participants_all_phase),


Metrics/LineLength: Line is too long. [126/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:38Z

app/models/budget/stats.rb

-          groups
-        end
-      end
+      groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum


Metrics/LineLength: Line is too long. [133/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:38Z

app/models/budget/stats.rb

-          supports(heading).pluck(:voter_id)
-        end
+      budget.headings.each do |heading|
+        groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population))


Metrics/LineLength: Line is too long. [126/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:38Z

app/models/budget/stats.rb

+      groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum
+      groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum
+      groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum
+      groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum


Metrics/LineLength: Line is too long. [115/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:38Z

app/models/budget/stats.rb

+      groups[:total] = Hash.new(0)
+      groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum
+      groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum
+      groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum


Metrics/LineLength: Line is too long. [117/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T11:57:38Z

app/models/budget/stats.rb

-      end
+      groups[:total] = Hash.new(0)
+      groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum
+      groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum


Metrics/LineLength: Line is too long. [123/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T12:53:40Z

app/models/budget/stats.rb

-        end
-      end
+      groups[:total] = Hash.new(0)
+      groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum


Metrics/LineLength: Line is too long. [105/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-05-20T12:53:40Z

app/models/budget/stats.rb

-        stats_cache("balloters") { @budget.ballots.where("ballot_lines_count > ?", 0).pluck(:user_id) }
+    def balloters_by_heading(heading_id)
+      stats_cache("balloters_by_heading_#{heading_id}") do
+        budget.ballots.joins(:lines).where(budget_ballot_lines: {heading_id: heading_id}).pluck(:user_id)


Metrics/LineLength: Line is too long. [105/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

javierm added the Backport label May 20, 2019

javierm self-assigned this May 20, 2019

houndci-bot reviewed May 20, 2019

View reviewed changes

javierm force-pushed the backport-blank_votes branch from d442fe8 to 963b5f8 Compare May 20, 2019 12:16

javierm force-pushed the backport-refactor_stats_module branch from 24a1288 to cc84060 Compare May 20, 2019 12:53

houndci-bot reviewed May 20, 2019

View reviewed changes

javierm changed the base branch from backport-blank_votes to master May 20, 2019 12:54

javierm changed the base branch from master to backport-blank_votes May 20, 2019 12:54

voodoorai2000 approved these changes May 21, 2019

View reviewed changes

javierm added 3 commits May 21, 2019 13:27

Add a common concern for budget and poll stats

62a97f9

Share method to generate stats

313ffb5

Use symbols for method names

d627215

javierm force-pushed the backport-refactor_stats_module branch from cc84060 to a942e78 Compare May 21, 2019 11:27

javierm force-pushed the backport-blank_votes branch from 963b5f8 to b8dbdaf Compare May 21, 2019 11:27

Simplify the way we cache stats

1882782

javierm force-pushed the backport-refactor_stats_module branch from a942e78 to 1882782 Compare May 21, 2019 11:49

javierm changed the base branch from backport-blank_votes to master May 21, 2019 12:23

javierm merged commit 07d5511 into master May 21, 2019

javierm deleted the backport-refactor_stats_module branch May 21, 2019 15:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Simplify stats caching #3510

Simplify stats caching #3510

javierm commented May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

Simplify stats caching #3510

Simplify stats caching #3510

Conversation

javierm commented May 20, 2019

References

Objectives

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment