Merge with task create performance improvements

Michel Felipe
2 parents 297806b5 3926c76a
Showing 3 changed files with 14 additions and 11 deletions Show diff stats
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
@@ -178,7 +178,8 @@ class Organization &lt; Profile
   end
   def notification_emails
-    emails = [contact_email].select(&:present?) + admins.map(&:email)
+    # TODO: Add performance improvement here!
+    emails = [contact_email].select(&:present?) + admins([:user]).pluck(:email)
     if emails.empty?
       emails << environment.contact_email
     end
@@ -19,12 +19,13 @@ class Person &lt; Profile
   acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
   acts_as_accessor
-  acts_as_tagger
-  scope :members_of, lambda { |resources|
+  scope :members_of, lambda { |resources, extra_joins = nil|
     resources = [resources] if !resources.kind_of?(Array)
     conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
-    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => [conditions] }
+    joins = [:role_assignments]
+    joins += extra_joins if extra_joins.is_a? Array
+    { :select => 'DISTINCT profiles.*', :joins => joins, :conditions => [conditions] }
   }
   scope :not_members_of, lambda { |resources|
@@ -33,10 +34,11 @@ class Person &lt; Profile
     { :select => 'DISTINCT profiles.*', :conditions => ['"profiles"."id" NOT IN (SELECT DISTINCT profiles.id FROM "profiles" INNER JOIN "role_assignments" ON "role_assignments"."accessor_id" = "profiles"."id" AND "role_assignments"."accessor_type" = (\'Profile\') WHERE "profiles"."type" IN (\'Person\') AND (%s))' % conditions] }
   }
-  scope :by_role, lambda { |roles|
+  scope :by_role, lambda { |roles, extra_joins = nil|
     roles = [roles] unless roles.kind_of?(Array)
-    { :select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)',
-roles] }
+    joins = [:role_assignments]
+    joins += extra_joins if extra_joins.is_a? Array
+    { :select => 'DISTINCT profiles.*', :joins => joins, :conditions => ['role_assignments.role_id IN (?)',roles] }
   }
   scope :not_friends_of, lambda { |resources|
@@ -192,8 +192,8 @@ class Profile &lt; ActiveRecord::Base
     alias_method_chain :count, :distinct
   end
-  def members_by_role(roles)
-    Person.members_of(self).by_role(roles)
+  def members_by_role(roles, with_entities = nil)
+    Person.members_of(self, with_entities).by_role(roles, with_entities)
   end
   acts_as_having_boxes
@@ -926,11 +926,11 @@ private :generate_url, :url_options
     self.forums.count.nonzero?
   end
-  def admins
+  def admins(with_entities = nil)
     return [] if environment.blank?
     admin_role = Profile::Roles.admin(environment.id)
     return [] if admin_role.blank?
-    self.members_by_role(admin_role)
+    self.members_by_role(admin_role, with_entities)
   end
   def enable_contact?