From 4310a7bb42466266281b216bca1f7121cc74c1f4 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Wed, 6 Jan 2016 20:08:28 +0000
Subject: [PATCH] Pool wins are worth 2pts

---
 app/models/wrestler.rb                    |  2 +-
 app/views/static_pages/about.html.erb     |  2 +-
 test/integration/pool_advancement_test.rb | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/wrestler.rb b/app/models/wrestler.rb
index 162c7a0..e37d1d0 100644
--- a/app/models/wrestler.rb
+++ b/app/models/wrestler.rb
@@ -27,7 +27,7 @@ class Wrestler < ActiveRecord::Base
 	
 	def teamPointsEarned
 		points = 0.0
-		points = points + (poolWins.size * 1) + (pinWins.size * 2) + (techWins.size * 1.5)	+ (majorWins.size * 1) + placementPoints
+		points = points + (poolWins.size * 2) + (pinWins.size * 2) + (techWins.size * 1.5)	+ (majorWins.size * 1) + placementPoints
 	end
 	
 	def placementPoints
diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb
index fd76fe1..bd4b70b 100644
--- a/app/views/static_pages/about.html.erb
+++ b/app/views/static_pages/about.html.erb
@@ -20,7 +20,7 @@
 <p>If three wrestlers are tied, they will be put through this sequence until two wrestlers are left. Once two wrestlers are left, the pool runner up will be decided by head to head.</p>
 <p>For pool to bracket tournaments, team points will be calculated as follows:</p>
 <ul>
-    <li>Pool win: 1pt</li>
+    <li>Pool win: 2pt</li>
     <li>Win by major: 1pt extra</li>
     <li>Win by tech fall: 1.5pt extra</li>
     <li>Win by fall, default, dq: 2pt extra</li>
diff --git a/test/integration/pool_advancement_test.rb b/test/integration/pool_advancement_test.rb
index 1f2556d..d7a02ae 100644
--- a/test/integration/pool_advancement_test.rb
+++ b/test/integration/pool_advancement_test.rb
@@ -424,9 +424,9 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
     wrestler1 = Wrestler.where("name = ?", "Guy2").first
     wrestler2 = Wrestler.where("name = ?", "Guy3").first
     #Won four in pool
-    assert_equal 16, wrestler1.totalTeamPoints
+    assert_equal 20, wrestler1.totalTeamPoints
     #Won two in pool but was deducted a point
-    assert_equal 13, wrestler2.totalTeamPoints
+    assert_equal 15, wrestler2.totalTeamPoints
   end
   
   test "advancement points 1/2" do
@@ -488,25 +488,25 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
   test "bonus points major" do
     endMatchWithMajor(2002,"Guy2",@matches)
     wrestler1 = Wrestler.where("name = ?", "Guy2").first
-    assert_equal 2, wrestler1.teamPointsEarned
+    assert_equal 3, wrestler1.teamPointsEarned
   end
   
   test "bonus points pin" do
     endMatchWithPin(2002,"Guy2",@matches)
     wrestler1 = Wrestler.where("name = ?", "Guy2").first
-    assert_equal 3, wrestler1.teamPointsEarned
+    assert_equal 4, wrestler1.teamPointsEarned
   end
   
   test "bonus points tech fall" do
     endMatchWithTech(2002,"Guy2",@matches)
     wrestler1 = Wrestler.where("name = ?", "Guy2").first
-    assert_equal 2.5, wrestler1.teamPointsEarned
+    assert_equal 3.5, wrestler1.teamPointsEarned
   end
   
   test "pool team points win" do
     endMatch(2002,"Guy2",@matches)
     wrestler1 = Wrestler.where("name = ?", "Guy2").first
-    assert_equal 1, wrestler1.teamPointsEarned
+    assert_equal 2, wrestler1.teamPointsEarned
   end
   
   test "advancement points fourPoolsToQuarter Quarter" do
@@ -552,7 +552,7 @@ class PoolAdvancementTest < ActionDispatch::IntegrationTest
     wrestler = Wrestler.where("name = ?", "Guy22").first
     
     assert_equal 0, wrestler.totalTeamPoints
-    assert_equal 1, wrestler.teamPointsEarned
+    assert_equal 2, wrestler.teamPointsEarned
   end