From 6d5d60c0df938098068a0976e189aac18e4748e4 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Mon, 28 Sep 2015 13:38:48 +0200
Subject: [PATCH] refactors conflictable behaviour

---
 app/models/concerns/conflictable.rb | 9 +++++++++
 app/models/debate.rb                | 6 +-----
 app/models/proposal.rb              | 7 +------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 app/models/concerns/conflictable.rb

diff --git a/app/models/concerns/conflictable.rb b/app/models/concerns/conflictable.rb
new file mode 100644
index 000000000..a1926aa36
--- /dev/null
+++ b/app/models/concerns/conflictable.rb
@@ -0,0 +1,9 @@
+module Conflictable
+  extend ActiveSupport::Concern
+
+  def conflictive?
+    return false unless flags_count > 0 && cached_votes_up > 0
+    cached_votes_up/flags_count.to_f < 5
+  end
+
+end
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 4e495281f..c29b54ae8 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -2,6 +2,7 @@ require 'numeric'
 class Debate < ActiveRecord::Base
   include Flaggable
   include Taggable
+  include Conflictable
 
   apply_simple_captcha
 
@@ -110,11 +111,6 @@ class Debate < ActiveRecord::Base
     where(id: [debate_ids, tag_ids].flatten.compact)
   end
 
-  def conflictive?
-    return false unless flags_count > 0 && cached_votes_up > 0
-    cached_votes_up/flags_count.to_f < 5
-  end
-
   def after_hide
     self.tags.each{ |t| t.decrement_custom_counter_for('Debate') }
   end
diff --git a/app/models/proposal.rb b/app/models/proposal.rb
index f2693d8ad..48e149821 100644
--- a/app/models/proposal.rb
+++ b/app/models/proposal.rb
@@ -1,7 +1,7 @@
 class Proposal < ActiveRecord::Base
   include Flaggable
   include Taggable
-
+  include Conflictable
 
   apply_simple_captcha
   acts_as_votable
@@ -42,11 +42,6 @@ class Proposal < ActiveRecord::Base
     cached_votes_up
   end
 
-  def conflictive?
-    return false unless flags_count > 0 && cached_votes_up > 0
-    cached_votes_up/flags_count.to_f < 5
-  end
-
   def description
     super.try :html_safe
   end