Refactor finders. Prevent circular dependency error

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-09-02 15:28:27 +03:00
parent 9ccef9a7b3
commit 20c2e90222
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
4 changed files with 9 additions and 7 deletions

View File

@ -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)

View File

@ -15,7 +15,7 @@
# label_name: string
# sort: string
#
class IssuesFinder < BaseFinder
class IssuesFinder < IssuableFinder
def klass
Issue
end

View File

@ -15,7 +15,7 @@
# label_name: string
# sort: string
#
class MergeRequestsFinder < BaseFinder
class MergeRequestsFinder < IssuableFinder
def klass
MergeRequest
end

View File

@ -6,9 +6,9 @@ module 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