Refactor ClustersFinder

1 files changed, 20 insertions, 10 deletions

diff --git a/app/finders/clusters_finder.rb b/app/finders/clusters_finder.rb
index 2b29c7bdf12..26bae3193da 100644
--- a/app/finders/clusters_finder.rb
+++ b/app/finders/clusters_finder.rb
@@ -1,19 +1,29 @@
 class ClustersFinder
+  attr_reader :project, :user, :scope
+
   def initialize(project, user, scope)
     @project = project
     @user = user
-    @scope = scope
+    @scope = scope || :active
   end
 
   def execute
-    clusters = case @scope
-               when :all
-                 @project.clusters
-               when :enabled
-                 @project.clusters.enabled
-               when :disabled
-                 @project.clusters.disabled
-               end
-    clusters.map { |cluster| cluster.present(current_user: @user) }
+    clusters = project.clusters
+    filter_by_scope(clusters)
+  end
+
+  private
+
+  def filter_by_scope(clusters)
+    case @scope.to_sym
+    when :all
+      clusters
+    when :inactive
+      clusters.disabled
+    when :active
+      clusters.enabled
+    else
+      raise "Invalid scope #{@scope}"
+    end
   end
 end