Refactor methods for environments in project model

3 files changed, 15 insertions, 7 deletions

diff --git a/app/models/environment.rb b/app/models/environment.rb
index fe3df473d73..8e4de640953 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -37,7 +37,7 @@ class Environment < ActiveRecord::Base
     state :stopped
   end
 
-  def recently_updated_on?(ref)
+  def recently_updated_on_branch?(ref)
     ref.to_s == last_deployment.ref
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index d885419e0a1..297d7721abe 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1296,12 +1296,19 @@ class Project < ActiveRecord::Base
       .group(:environment_id)
       .select(:environment_id)
 
-    envs = environments.available.where(id: environment_ids)
+    environments_found = environments.available
+      .where(id: environment_ids).to_a
 
-    if commit
-      envs.select { |environment| env.includes_commit?(commit) }
-    else
-      envs.select { |environment| env.recently_updated_on?(ref) }
+    return environments_found unless commit
+
+    environments_found.select do |environment|
+      environment.includes_commit?(commit)
+    end
+  end
+
+  def environments_recently_updated_on_branch(branch)
+    environments_for(branch).select do |environment|
+      environment.recently_updated_on_branch?(branch)
     end
   end
 
diff --git a/app/services/ci/stop_environments_service.rb b/app/services/ci/stop_environments_service.rb
index b7a49a424ce..0ffe73611c4 100644
--- a/app/services/ci/stop_environments_service.rb
+++ b/app/services/ci/stop_environments_service.rb
@@ -27,7 +27,8 @@ module Ci
     end
 
     def environments
-      @environments ||= project.environments_for(@ref)
+      @environments ||= project
+        .environments_recently_updated_on_branch(@ref)
     end
   end
 end