Revert "Revert "Moving away from matchups_array and saving matches individually""

This reverts commit 7b3fe2aaad.

app/models/match.rb

@@ -2,4 +2,13 @@ class Match < ActiveRecord::Base
 	belongs_to :tournament
 	WIN_TYPES = ["Decision", "Major", "Tech Fall", "Pin", "Forfeit", "Injury Default", "Default", "DQ"]
 
+
+	def w1_name
+		Wrestler.find(self.w1).name
+	end
+
+	def w2_name
+		Wrestler.find(self.w2).name
+	end
+
 end

app/models/tournament.rb

@@ -9,12 +9,13 @@ class Tournament < ActiveRecord::Base
 
 	def upcomingMatches
 		# @matches = generateMatchups
-		if self.matchups_array
-			return matchupHashesToObjects(self.matchups_array)
+		if self.matches.nil?
+			return self.matches
 		else
 			@matches = generateMatchups
-		    saveMatchups(@matches)
-		    return @matches
+			puts @matches.inspect
+			saveMatchups(@matches)
+			return @matches
 		end
 	end
 
@@ -34,8 +35,18 @@ class Tournament < ActiveRecord::Base
 	end
 	
 	def saveMatchups(matches)
-		self.matchups_array = matchupObjectsToHash(matches)
-	    self.save	
+		matches.each do |m|
+			@match = Match.new
+			@match.w1 = m.w1
+			@match.w2 = m.w2
+			@match.round = m.round
+			@match.boutNumber = m.boutNumber
+			@match.bracket_position = m.bracket_position
+			@match.bracket_position_number = m.bracket_position_number
+			@match.tournament_id = self.id
+			puts @match.inspect
+	    @match.save
+		end
 	end