Commit 76db0dc1 authored by Ahmad Sherif's avatar Ahmad Sherif

Pass project IDs relation to ProjectsFinder instead of using a block

parent d13c36f7
class ProjectsFinder < UnionFinder class ProjectsFinder < UnionFinder
def execute(current_user = nil, options = {}, &block) def execute(current_user = nil, project_ids_relation = nil)
segments = all_projects(current_user) segments = all_projects(current_user)
segments.map!(&block) if block segments.map! { |s| s.where(id: project_ids_relation) } if project_ids_relation
find_union(segments, Project) find_union(segments, Project)
end end
......
...@@ -95,9 +95,7 @@ class TodosFinder ...@@ -95,9 +95,7 @@ class TodosFinder
def projects(items) def projects(items)
item_project_ids = items.reorder(nil).select(:project_id) item_project_ids = items.reorder(nil).select(:project_id)
ProjectsFinder.new.execute(current_user) do |relation| ProjectsFinder.new.execute(current_user, item_project_ids)
relation.where(id: item_project_ids)
end
end end
def type? def type?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment