fix scoring (mostly... I managed to get a 500 while refreshing)

1 files changed, 12 insertions, 7 deletions

diff --git a/app/models/statistic.rb b/app/models/statistic.rb
index fefa3a8..d62d413 100644
--- a/app/models/statistic.rb
+++ b/app/models/statistic.rb
@@ -2,9 +2,11 @@ class Statistic < ActiveRecord::Base
 	belongs_to :user
 	belongs_to :match
 
+	validates(:name, presence: true, length: { minimum: 1 })
+
 	def value
 		begin
-			return JSON.parse(self.json_value)
+			return JSON::restore(self.json_value)
 		rescue
 			return {}
 		end
@@ -16,12 +18,15 @@ class Statistic < ActiveRecord::Base
 
 	after_save :update_match
 	def update_match
-		if (self.name == "win") and (self.value)
-			self.match.winner = self.match.teams.find{|t| t.users.include? self.user}
-		end
-		if 	(self.match.status == 2) and (self.match.finished?)
-			self.match.status = 3
+		ActiveRecord::Base.transaction do
+			if (self.name == "win") and (self.value)
+				self.match.winner = self.match.teams.find{|t| t.users.include? self.user}
+			end
+			if 	(self.match.status == 2) and (self.match.finished?)
+				#self.match.tournament_stage.scoring.score(self.match)
+				self.match.status = 3
+			end
+			self.match.save!
 		end
-		self.match.save
 	end
 end