Simplify the way we cache stats

app/models/poll/stats.rb

@@ -3,7 +3,7 @@ class Poll::Stats
   include StatsHelper
   alias_method :poll, :resource
 
-  def stats_methods
+  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
@@ -15,105 +15,108 @@ class Poll::Stats
   private
 
     def total_participants
-      stats_cache("total_participants") { total_participants_web + total_participants_booth }
+      total_participants_web + total_participants_booth
     end
 
     def total_participants_web
-      stats_cache("total_participants_web") { total_web_valid + total_web_white + total_web_null }
+      total_web_valid + total_web_white + total_web_null
     end
 
     def total_participants_web_percentage
-      stats_cache("total_participants_web_percentage") { calculate_percentage(total_participants_web, total_participants) }
+      calculate_percentage(total_participants_web, total_participants)
     end
 
     def total_participants_booth
-      stats_cache("total_participants_booth") { total_booth_valid + total_booth_white + total_booth_null }
+      total_booth_valid + total_booth_white + total_booth_null
     end
 
     def total_participants_booth_percentage
-      stats_cache("total_participants_booth_percentage") { calculate_percentage(total_participants_booth, total_participants) }
+      calculate_percentage(total_participants_booth, total_participants)
     end
 
     def total_web_valid
-      stats_cache("total_web_valid") { voters.where(origin: "web").count - total_web_white }
+      voters.where(origin: "web").count - total_web_white
     end
 
     def valid_percentage_web
-      stats_cache("valid_percentage_web") { calculate_percentage(total_web_valid, total_valid_votes) }
+      calculate_percentage(total_web_valid, total_valid_votes)
     end
 
     def total_web_white
-      stats_cache("total_web_white") { 0 }
+      0
     end
 
     def white_percentage_web
-      stats_cache("white_percentage_web") { calculate_percentage(total_web_white, total_white_votes) }
+      calculate_percentage(total_web_white, total_white_votes)
     end
 
     def total_web_null
-      stats_cache("total_web_null") { 0 }
+      0
     end
 
     def null_percentage_web
-      stats_cache("null_percentage_web") { calculate_percentage(total_web_null, total_null_votes) }
+      calculate_percentage(total_web_null, total_null_votes)
     end
 
     def total_booth_valid
-      stats_cache("total_booth_valid") { recounts.sum(:total_amount) }
+      recounts.sum(:total_amount)
     end
 
     def valid_percentage_booth
-      stats_cache("valid_percentage_booth") { calculate_percentage(total_booth_valid, total_valid_votes) }
+      calculate_percentage(total_booth_valid, total_valid_votes)
     end
 
     def total_booth_white
-      stats_cache("total_booth_white") { recounts.sum(:white_amount) }
+      recounts.sum(:white_amount)
     end
 
     def white_percentage_booth
-      stats_cache("white_percentage_booth") { calculate_percentage(total_booth_white, total_white_votes) }
+      calculate_percentage(total_booth_white, total_white_votes)
     end
 
     def total_booth_null
-      stats_cache("total_booth_null") { recounts.sum(:null_amount) }
+      recounts.sum(:null_amount)
     end
 
     def null_percentage_booth
-      stats_cache("null_percentage_booth") { calculate_percentage(total_booth_null, total_null_votes) }
+      calculate_percentage(total_booth_null, total_null_votes)
     end
 
     def total_valid_votes
-      stats_cache("total_valid_votes") { total_web_valid + total_booth_valid }
+      total_web_valid + total_booth_valid
     end
 
     def total_valid_percentage
-      stats_cache("total_valid_percentage"){ calculate_percentage(total_valid_votes, total_participants) }
+      calculate_percentage(total_valid_votes, total_participants)
     end
 
     def total_white_votes
-      stats_cache("total_white_votes") { total_web_white + total_booth_white }
+      total_web_white + total_booth_white
     end
 
     def total_white_percentage
-      stats_cache("total_white_percentage") { calculate_percentage(total_white_votes, total_participants) }
+      calculate_percentage(total_white_votes, total_participants)
     end
 
     def total_null_votes
-      stats_cache("total_null_votes") { total_web_null + total_booth_null }
+      total_web_null + total_booth_null
     end
 
     def total_null_percentage
-      stats_cache("total_null_percentage") { calculate_percentage(total_null_votes, total_participants) }
+      calculate_percentage(total_null_votes, total_participants)
     end
 
     def voters
-      stats_cache("voters") { poll.voters }
+      poll.voters
     end
 
     def recounts
-      stats_cache("recounts") { poll.recounts }
+      poll.recounts
     end
 
+    stats_cache(*stats_methods)
+    stats_cache :voters, :recounts
+
     def stats_cache(key, &block)
       Rails.cache.fetch("polls_stats/#{poll.id}/#{key}/v12", &block)
     end