Commit 1eb72a71 authored by blackst0ne's avatar blackst0ne

Refactored count_for_collection() for using pluck instead of select

parent 9a9a368f
...@@ -28,13 +28,13 @@ module IssuableCollections ...@@ -28,13 +28,13 @@ module IssuableCollections
downvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.downvote? } downvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.downvote? }
upvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.upvote? } upvotes = issuable_votes_count.find { |votes| votes.awardable_id == id && votes.upvote? }
notes = issuable_note_count.find { |notes| notes.noteable_id == id } notes = issuable_note_count.find { |notes| notes.noteable_id == id }
merge_requests = issuable_merge_requests_count.find { |mr| mr.issue_id == id } merge_requests = issuable_merge_requests_count.find { |mr| mr.first == id }
issuable_meta[id] = Issuable::IssuableMeta.new( issuable_meta[id] = Issuable::IssuableMeta.new(
upvotes.try(:count).to_i, upvotes.try(:count).to_i,
downvotes.try(:count).to_i, downvotes.try(:count).to_i,
notes.try(:count).to_i, notes.try(:count).to_i,
merge_requests.try(:count).to_i merge_requests.try(:last).to_i
) )
end end
end end
......
...@@ -7,9 +7,9 @@ class MergeRequestsClosingIssues < ActiveRecord::Base ...@@ -7,9 +7,9 @@ class MergeRequestsClosingIssues < ActiveRecord::Base
class << self class << self
def count_for_collection(ids) def count_for_collection(ids)
select('issue_id', 'COUNT(*) as count').
group(:issue_id). group(:issue_id).
where(issue_id: ids) where(issue_id: ids).
pluck('issue_id', 'COUNT(*) as count')
end end
end end
end end
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