Merge pull request #435 from datafruits/fix-voting-completion-vote-2

fix voting completion
datafruits · Oct 13, 2024 · 3e2cb35 · 3e2cb35
2 parents 2f6800e + 1d946f1
commit 3e2cb35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/shrimpo.rb b/app/models/shrimpo.rb
@@ -207,7 +207,7 @@ def create_entries_zip
 
   def voting_completion user
     voted_count = ShrimpoVote.where(user: user).where("shrimpo_entry_id in (?)", self.shrimpo_entries.pluck(:id)).select(:shrimpo_entry_id).distinct.count
-    total_count = self.shrimpo_entries.count
+    total_count = self.shrimpo_entries.count - 1 # subtract 1 cuz can't vote on own shrimpo
     ((voted_count.to_f / total_count.to_f) * 100).round(2)
   end
 

diff --git a/spec/models/shrimpo_spec.rb b/spec/models/shrimpo_spec.rb
@@ -114,7 +114,7 @@
     entry4.shrimpo_votes.create! score: 2, user: dj2
     entry3.shrimpo_votes.create! score: 6, user: dj2
 
-    expect(shrimpo.voting_completion(dj2)).to eq 75.0
+    expect(shrimpo.voting_completion(dj2)).to eq 100.0
   end
 
   it 'cant vote on own entry' do