Improve after code review

1 files changed, 5 insertions, 4 deletions

diff --git a/app/models/environment.rb b/app/models/environment.rb
index 93e7dedd6f8..20da71ccb3f 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -19,10 +19,7 @@ class Environment < ActiveRecord::Base
             allow_nil: true,
             addressable_url: true
 
-  delegate :stoppable?, :stop_action, to: :last_deployment, allow_nil: true
-
-  scope :available, -> { where(state: [:available]) }
-  scope :stopped, -> { where(state: [:stopped]) }
+  delegate :stop_action, to: :last_deployment, allow_nil: true
 
   state_machine :state, initial: :available do
     event :start do
@@ -84,4 +81,8 @@ class Environment < ActiveRecord::Base
 
     external_url.gsub(/\A.*?:\/\//, '')
   end
+
+  def stoppable?
+    available? && stop_action.present?
+  end
 end