From 54ecbe94518989364eb057c42c873945947ca8c4 Mon Sep 17 00:00:00 2001
From: jcwimer <jacob.wimer@gmail.com>
Date: Thu, 17 Dec 2015 19:20:18 +0000
Subject: [PATCH] Revert "Added memcached and set up cached items for
 up_matches page"

This reverts commit 983cc9c667a4678ff25a9c0093fb2ec0850d5e06.
---
 Gemfile                                   |  1 -
 Gemfile.lock                              |  2 --
 app/controllers/tournaments_controller.rb |  6 +++---
 app/models/mat.rb                         | 11 +----------
 app/models/match.rb                       |  6 +++---
 app/models/tournament.rb                  |  7 -------
 config/environments/production.rb         |  8 --------
 7 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/Gemfile b/Gemfile
index 326f4e0..49f494c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,6 @@ gem 'spring', :group => :development
       	  	  gem 'passenger'
       	  	  gem 'therubyracer'
 	  	  gem 'newrelic_rpm'
-	  	  gem 'dalli'
 		end
 	#Other
 		gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index d17ca7a..1496c23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,7 +48,6 @@ GEM
       execjs
     coffee-script-source (1.9.1.1)
     concurrent-ruby (1.0.0)
-    dalli (2.7.5)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -161,7 +160,6 @@ PLATFORMS
 DEPENDENCIES
   cancancan
   coffee-rails (~> 4.0.0)
-  dalli
   devise
   jbuilder (~> 2.0)
   jquery-rails
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 4d5bb68..0e15f7f 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -66,8 +66,8 @@ class TournamentsController < ApplicationController
 
  
   def up_matches
-    @matches = @tournament.cached_matches.select{|m| m.mat_id == nil}.sort_by{|m| m.bout_number}
-    @mats = @tournament.mats
+    @matches = @tournament.matches.where(mat_id: nil).order('bout_number ASC').limit(10).includes(:wrestlers)
+    @mats = @tournament.mats.includes(:matches)
   end
 
   def index
@@ -144,7 +144,7 @@ class TournamentsController < ApplicationController
 
   def check_for_matches
     if @tournament
-    	if @tournament.cached_matches.empty?
+    	if @tournament.matches.empty?
     	  redirect_to "/tournaments/#{@tournament.id}/no_matches"
     	end
     end
diff --git a/app/models/mat.rb b/app/models/mat.rb
index e601d4c..4d36353 100644
--- a/app/models/mat.rb
+++ b/app/models/mat.rb
@@ -18,15 +18,6 @@ class Mat < ActiveRecord::Base
 		end
 	end
 	
-	def cached_matches
-		cache_timestamp = self.updated_at
-	    cache_key = "matMatches|#{id}|#{cache_timestamp}"
-	
-	    Rails.cache.fetch(cache_key, expires_in: 10.minutes) do
-	      self.matches.includes(:wrestlers)
-	    end
-	end
-	
 	def assignNextMatch
 		t_matches = tournament.matches.select{|m| m.mat_id == nil}
 		if t_matches.size > 0
@@ -37,7 +28,7 @@ class Mat < ActiveRecord::Base
 	end
 	
 	def unfinishedMatches
-		cached_matches.select{|m| m.finished == nil}.sort_by{|m| m.bout_number}
+		matches.select{|m| m.finished == nil}.sort_by{|m| m.bout_number}
 	end
 	
 end
diff --git a/app/models/match.rb b/app/models/match.rb
index 70ce5f8..64ce59b 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -1,7 +1,7 @@
 class Match < ActiveRecord::Base
-	belongs_to :tournament, touch: true
-	belongs_to :weight, touch: true
-	belongs_to :mat, touch: true
+	belongs_to :tournament
+	belongs_to :weight
+	belongs_to :mat
 	has_many :wrestlers, :through => :weight
 
 	after_save do 
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 63daa85..082c9f8 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -9,14 +9,7 @@ class Tournament < ActiveRecord::Base
 	has_many :wrestlers, through: :weights
 	has_many :matches, dependent: :destroy
 
-	def cached_matches
-		cache_timestamp = self.updated_at
-	    cache_key = "tournamentMatches|#{id}|#{cache_timestamp}"
 	
-	    Rails.cache.fetch(cache_key, expires_in: 10.minutes) do
-	      self.matches.includes(:wrestlers)
-	    end
-	end
 
 	def tournament_types
 		["Pool to bracket"]
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 196e5ec..543b8ff 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -54,14 +54,6 @@ Wrestling::Application.configure do
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
-  config.cache_store = :dalli_store,
-                    (ENV["MEMCACHIER_SERVERS"] || "").split(","),
-                    {:username => ENV["MEMCACHIER_USERNAME"],
-                     :password => ENV["MEMCACHIER_PASSWORD"],
-                     :failover => true,
-                     :socket_timeout => 1.5,
-                     :socket_failure_delay => 0.2
-                    }
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"