Merge pull request #72 from StemvanGroningen/budget_admin_stats

Count only positive supports on admin budget stats
StemvanGroningen · Oct 20, 2020 · 0973af4 · 0973af4
2 parents e59c942 + 21d1e84
commit 0973af4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb
@@ -58,7 +58,7 @@ def budget_supporting
     @budget = Budget.find(params[:budget_id])
     heading_ids = @budget.heading_ids
 
-    votes = Vote.where(votable_type: "Budget::Investment").
+    votes = Vote.where(votable_type: "Budget::Investment", vote_flag: true).
             includes(:budget_investment).
             where(budget_investments: { heading_id: heading_ids })
 

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
@@ -14,7 +14,6 @@ def index
     @debate_votes = daily_cache("debate_votes") { Vote.where(votable_type: "Debate").count }
     @proposal_votes = daily_cache("proposal_votes") { Vote.where(votable_type: "Proposal").count }
     @comment_votes = daily_cache("comment_votes") { Vote.where(votable_type: "Comment").count }
-    @investment_votes = daily_cache("budget_investment_votes") { Vote.where(votable_type: "Budget::Investment").count }
     @votes = daily_cache("votes") { Vote.count }
 
     @verified_users = daily_cache("verified_users") { User.with_hidden.level_two_or_three_verified.count }

diff --git a/spec/features/admin/stats_spec.rb b/spec/features/admin/stats_spec.rb
@@ -104,6 +104,9 @@
 
         create(:budget_investment, heading: create(:budget_heading, group: group_2), voters: [create(:user)])
         create(:budget_investment, heading: heading_all_city, voters: [create(:user), create(:user)])
+        investment_retired_supports = create(:budget_investment, heading: heading_all_city)
+
+        3.times { create(:vote, votable: investment_retired_supports, vote_flag: false) }
 
         visit admin_stats_path
         click_link "Participatory Budgets"