Address feedback

4 files changed, 9 insertions, 16 deletions

diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb
index e7d61510624..4c39fe98028 100644
--- a/app/controllers/projects/blob_controller.rb
+++ b/app/controllers/projects/blob_controller.rb
@@ -30,9 +30,8 @@ class Projects::BlobController < Projects::ApplicationController
   end
 
   def show
-    environment_args = @repository.branch_exists?(@ref) ? { ref: @ref } : { commit: @commit }
-    @environment = @project.environments_for(**environment_args).last
-    @environment = nil unless can?(current_user, :read_environment, @environment)
+    environment_params = @repository.branch_exists?(@ref) ? { ref: @ref } : { commit: @commit }
+    @environment = EnvironmentsFinder.new(@project, current_user, environment_params).execute.last
   end
 
   def edit
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 5bcc545462f..aade1b6c256 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -95,9 +95,8 @@ class Projects::CommitController < Projects::ApplicationController
 
     @diffs = commit.diffs(opts)
     @notes_count = commit.notes.count
-
-    @environment = @project.environments_for(commit: @commit).last
-    @environment = nil unless can?(current_user, :read_environment, @environment)
+    
+    @environment = EnvironmentsFinder.new(@project, current_user, commit: @commit).execute.last
   end
 
   def define_note_vars
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index d5cca827e9f..c6651254d70 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -57,9 +57,8 @@ class Projects::CompareController < Projects::ApplicationController
 
       @diffs = @compare.diffs(diff_options)
 
-      environment_args = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @commit }
-      @environment = @project.environments_for(**environment_args).last
-      @environment = nil unless can?(current_user, :read_environment, @environment)
+      environment_params = @repository.branch_exists?(@head_ref) ? { ref: @head_ref } : { commit: @commit }
+      @environment = EnvironmentsFinder.new(@project, current_user, environment_params).execute.last
 
       @diff_notes_disabled = true
       @grouped_diff_discussions = {}
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index a84e15de99a..4f12648e7b1 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -103,8 +103,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       end
     end
 
-    @environment = @merge_request.environments.last
-    @environment = nil unless can?(current_user, :read_environment, @environment)
+    @environment = @merge_request.environments_for(current_user).last
 
     respond_to do |format|
       format.html { define_discussion_vars }
@@ -248,8 +247,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
                  end
         @diff_notes_disabled = true
 
-        @environment = @merge_request.environments.last
-        @environment = nil unless can?(current_user, :read_environment, @environment)
+        @environment = @merge_request.environments_for(current_user).last
 
         render json: { html: view_to_html_string('projects/merge_requests/_new_diffs', diffs: @diffs, environment: @environment) }
       end
@@ -450,9 +448,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   def ci_environments_status
     environments =
       begin
-        @merge_request.environments.map do |environment|
-          next unless can?(current_user, :read_environment, environment)
-
+        @merge_request.environments_for(current_user).map do |environment|
           project = environment.project
           deployment = environment.first_deployment_for(@merge_request.diff_head_commit)