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

Refactor participants. Add scopes on User.

Browse Source
This commit is contained in:
taitus
2017-08-29 14:50:05 +02:00
parent 8f7356f7a4
commit 90518d4f99
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/community.rb
View File

@@ -4,11 +4,24 @@ class Community < ActiveRecord::Base
has_many :topics
def participants
User.community_participants(self)
users_participants = users_who_commented_by(self) + users_who_topics_author_by(self)
users_participants.uniq
end
def from_proposal?
self.proposal.present?
end
private
def users_who_commented_by(community)
topics_ids = community.topics.pluck(:id)
query = "comments.commentable_id IN (?)and comments.commentable_type = 'Topic'"
User.by_comments(query, topics_ids)
end
def users_who_topics_author_by(community)
author_ids = community.topics.pluck(:author_id)
User.by_authors(author_ids)
end
end

19
app/models/user.rb
View File

@@ -57,11 +57,13 @@ class User < ActiveRecord::Base
scope :officials, -> { where("official_level > 0") }
scope :newsletter, -> { where(newsletter: true) }
scope :for_render, -> { includes(:organization) }
scope :by_document, ->(document_type, document_number) { where(document_type: document_type, document_number: document_number) }
scope :by_document, -> (document_type, document_number) { where(document_type: document_type, document_number: document_number) }
scope :email_digest, -> { where(email_digest: true) }
scope :active, -> { where(erased_at: nil) }
scope :erased, -> { where.not(erased_at: nil) }
scope :public_for_api, -> { all }
scope :by_comments, -> (query, topics_ids) { joins(:comments).where(query, topics_ids).uniq }
scope :by_authors, -> (author_ids) { where("users.id IN (?)", author_ids) }
before_validation :clean_document_number
@@ -313,11 +315,6 @@ class User < ActiveRecord::Base
follows.map{|follow| follow.followable.tags.map(&:name)}.flatten.compact.uniq
end
def self.community_participants(community)
users_participants = users_who_commented_by(community) + users_who_topics_author_by(community)
users_participants.uniq
end
private
def clean_document_number
@@ -331,14 +328,4 @@ class User < ActiveRecord::Base
validator.validate(self)
end
def users_who_commented_by(community)
topics_ids = community.topics.pluck(:id)
query = "comments.commentable_id IN (?)and comments.commentable_type = 'Topic'"
User.joins(:comments).where(query, topics_ids).uniq
end
def users_who_topics_author_by(community)
author_ids = community.topics.pluck(:author_id)
User.where("users.id IN (?)", author_ids)
end
end