consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix proposal refactor.

Browse Source
This commit is contained in:
taitus
2017-08-02 12:32:42 +02:00
parent 52e3610876
commit 28aaa584e9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/proposal.rb
View File

@@ -59,21 +59,21 @@ class Proposal < ActiveRecord::Base
def self.recommendations(user)
proposals_list = where("author_id != ?", user.id)
proposals_list_with_tagged = proposals_with_tagged(user, proposals_list)
proposals_list_with_tagged = self.proposals_with_tagged(user, proposals_list)
if proposals_list_with_tagged.any?
proposals_list = proposals_not_followed_by_user(user, proposals_list_with_tagged)
proposals_list = self.proposals_not_followed_by_user(user, proposals_list_with_tagged)
end
proposals_list
end
def proposals_with_tagged(user, proposals_list)
def self.proposals_with_tagged(user, proposals_list)
proposals_list.joins(:tags).where('taggings.taggable_type = ?', self.name)
.where('tags.name IN (?)', user.interests)
end
def proposals_not_followed_by_user(user, proposals_list_with_tagged)
def self.proposals_not_followed_by_user(user, proposals_list_with_tagged)
followed_proposals_ids = Proposal.followed_by_user(user).pluck(:id)
proposals_list_with_tagged.where("proposals.id NOT IN (?)", followed_proposals_ids)
end