Refactor finders. Prevent circular dependency error

Signed-off-by: Dmitriy Zaporozhets <[email protected]>
yeudit · Sep 2, 2014 · 20c2e90 · 20c2e90
1 parent 9ccef9a
commit 20c2e90
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/app/finders/base_finder.rb → app/finders/issuable_finder.rb b/app/finders/base_finder.rb → app/finders/issuable_finder.rb
@@ -1,4 +1,4 @@
-# BaseFinder
+# IssuableFinder
 #
 # Used to filter Issues and MergeRequests collections by set of params
 #
@@ -16,7 +16,9 @@
 #     label_name: string
 #     sort: string
 #
-class BaseFinder
+require_relative 'projects_finder'
+
+class IssuableFinder
   attr_accessor :current_user, :params
 
   def execute(current_user, params)

diff --git a/app/finders/issues_finder.rb b/app/finders/issues_finder.rb
@@ -15,7 +15,7 @@
 #     label_name: string
 #     sort: string
 #
-class IssuesFinder < BaseFinder
+class IssuesFinder < IssuableFinder
   def klass
     Issue
   end

diff --git a/app/finders/merge_requests_finder.rb b/app/finders/merge_requests_finder.rb
@@ -15,7 +15,7 @@
 #     label_name: string
 #     sort: string
 #
-class MergeRequestsFinder < BaseFinder
+class MergeRequestsFinder < IssuableFinder
   def klass
     MergeRequest
   end

diff --git a/lib/api/issues.rb b/lib/api/issues.rb
@@ -6,9 +6,9 @@ class Issues < Grape::API
     helpers do
       def filter_issues_state(issues, state = nil)
         case state
-          when 'opened' then issues.opened
-          when 'closed' then issues.closed
-          else issues
+        when 'opened' then issues.opened
+        when 'closed' then issues.closed
+        else issues
         end
       end
     end