organization: register and use members_count to fetch most_popular organizations

(ActionItem3039)

organization: register and use members_count to fetch most_popular organizations
(ActionItem3039)
Rodrigo Souto
1 parent 82dae706
Showing 7 changed files with 95 additions and 12 deletions Show diff stats
app/models/organization.rb
app/models/profile.rb
config/initializers/noosfero_extensions.rb
db/migrate/20140313213142_define_initial_value_for_profiles_members_count.rb
lib/noosfero/role_assignment_ext.rb
test/unit/organization_test.rb
test/unit/role_assignment_ext_test.rb
@@ -26,11 +26,7 @@ class Organization &lt; Profile
   has_many :mailings, :class_name => 'OrganizationMailing', :foreign_key => :source_id, :as => 'source'
-  named_scope :more_popular,
-    :select => "#{Profile.qualified_column_names}, count(resource_id) as total",
-    :group => Profile.qualified_column_names,
-    :joins => "LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id",
-    :order => "total DESC"
+  named_scope :more_popular, :order => 'members_count DESC'
   def validation_methodology
     self.validation_info ? self.validation_info.validation_methodology : nil
@@ -87,10 +87,6 @@ class Profile &lt; ActiveRecord::Base
     scopes.size == 1 ? scopes.first : Person.or_scope(scopes)
   end
-  def members_count
-    members.count
-  end
-
   class << self
     def count_with_distinct(*args)
       options = args.last || {}
@@ -0,0 +1 @@
+require 'noosfero/role_assignment_ext'
@@ -0,0 +1,12 @@
+class DefineInitialValueForProfilesMembersCount < ActiveRecord::Migration
+   def self.up
+    members_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id WHERE (profiles.type = 'Organization' OR profiles.type = 'Community' OR profiles.type = 'Enterprise') GROUP BY profiles.id;")
+    members_counts.each do |count|
+      execute("UPDATE profiles SET members_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
+    end
+  end
+
+  def self.down
+      execute("UPDATE profiles SET members_count=0;")
+  end
+end
@@ -0,0 +1,29 @@
+Rails.configuration.to_prepare do
+  RoleAssignment.module_eval do
+    extend CacheCounterHelper
+
+    after_create do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 1
+          update_cache_counter(:members_count, resource, 1)
+        end
+      end
+    end
+
+    after_destroy do |role_assignment|
+      accessor = role_assignment.accessor
+      resource = role_assignment.resource
+      if resource.kind_of?(Organization)
+        #FIXME This will only work as long as the role_assignment associations
+        #happen only between profiles, due to the polymorphic column type.
+        if resource.role_assignments.where(:accessor_id => accessor.id).count == 0
+          update_cache_counter(:members_count, resource, -1)
+        end
+      end
+    end
+  end
+end
@@ -302,18 +302,17 @@ class OrganizationTest &lt; ActiveSupport::TestCase
   end
   should 'find more popular organizations' do
-    Organization.delete_all
     o1 = fast_create(Organization)
     o2 = fast_create(Organization)
     p1 = fast_create(Person)
     p2 = fast_create(Person)
     o1.add_member(p1)
-    assert_equal [o1,o2] , Organization.more_popular
+    assert_order [o1,o2] , Organization.more_popular
     o2.add_member(p1)
     o2.add_member(p2)
-    assert_equal [o2,o1] , Organization.more_popular
+    assert_order [o2,o1] , Organization.more_popular
   end
   should 'list organizations that have no members in more popular list' do
@@ -331,6 +330,7 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     person = fast_create(Person)
     organization = fast_create(Organization)
     organization.add_member(person)
+    organization.reload
     assert_equal "one member", organization.more_popular_label
   end
@@ -342,10 +342,12 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     organization.add_member(person1)
     organization.add_member(person2)
+    organization.reload
     assert_equal "2 members", organization.more_popular_label
     person3 = fast_create(Person)
     organization.add_member(person3)
+    organization.reload
     assert_equal "3 members", organization.more_popular_label
   end
@@ -433,5 +435,24 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'increase members_count on new membership' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    assert_difference organization, :members_count, 1 do
+      organization.add_member(member)
+      organization.reload
+    end
+  end
+
+  should 'decrease members_count on membership removal' do
+    member = fast_create(Person)
+    organization = fast_create(Organization)
+    organization.add_member(member)
+    organization.reload
+    assert_difference organization, :members_count, -1 do
+      organization.remove_member(member)
+      organization.reload
+    end
+  end
 end
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RoleAssignmentExtTest < ActiveSupport::TestCase
+  should 'increase organization members_count only on the first role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    assert_difference organization, :members_count, 1 do
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+      RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+      organization.reload
+    end
+  end
+
+  should 'decrease organization members_count only on the last role_assignment' do
+    role1 = Role.create!(:name => 'role1')
+    role2 = Role.create!(:name => 'role2')
+    member = create_user('person').person
+    organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
+    RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
+    assert_difference organization, :members_count, -1 do
+      organization.role_assignments.destroy_all
+      organization.reload
+    end
+  end
+end
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+require 'noosfero/role_assignment_ext'
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class DefineInitialValueForProfilesMembersCount < ActiveRecord::Migration
	2	+ def self.up
	3	+ members_counts = execute("SELECT profiles.id, count(profiles.id) FROM profiles LEFT OUTER JOIN role_assignments ON profiles.id = role_assignments.resource_id WHERE (profiles.type = 'Organization' OR profiles.type = 'Community' OR profiles.type = 'Enterprise') GROUP BY profiles.id;")
	4	+ members_counts.each do \|count\|
	5	+ execute("UPDATE profiles SET members_count=#{count['count'].to_i} WHERE profiles.id=#{count['id']};")
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ execute("UPDATE profiles SET members_count=0;")
	11	+ end
	12	+end
@@ -0,0 +1,29 @@		@@ -0,0 +1,29 @@
	1	+Rails.configuration.to_prepare do
	2	+ RoleAssignment.module_eval do
	3	+ extend CacheCounterHelper
	4	+
	5	+ after_create do \|role_assignment\|
	6	+ accessor = role_assignment.accessor
	7	+ resource = role_assignment.resource
	8	+ if resource.kind_of?(Organization)
	9	+ #FIXME This will only work as long as the role_assignment associations
	10	+ #happen only between profiles, due to the polymorphic column type.
	11	+ if resource.role_assignments.where(:accessor_id => accessor.id).count == 1
	12	+ update_cache_counter(:members_count, resource, 1)
	13	+ end
	14	+ end
	15	+ end
	16	+
	17	+ after_destroy do \|role_assignment\|
	18	+ accessor = role_assignment.accessor
	19	+ resource = role_assignment.resource
	20	+ if resource.kind_of?(Organization)
	21	+ #FIXME This will only work as long as the role_assignment associations
	22	+ #happen only between profiles, due to the polymorphic column type.
	23	+ if resource.role_assignments.where(:accessor_id => accessor.id).count == 0
	24	+ update_cache_counter(:members_count, resource, -1)
	25	+ end
	26	+ end
	27	+ end
	28	+ end
	29	+end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class RoleAssignmentExtTest < ActiveSupport::TestCase
	4	+ should 'increase organization members_count only on the first role_assignment' do
	5	+ role1 = Role.create!(:name => 'role1')
	6	+ role2 = Role.create!(:name => 'role2')
	7	+ member = create_user('person').person
	8	+ organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
	9	+ assert_difference organization, :members_count, 1 do
	10	+ RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
	11	+ RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
	12	+ organization.reload
	13	+ end
	14	+ end
	15	+
	16	+ should 'decrease organization members_count only on the last role_assignment' do
	17	+ role1 = Role.create!(:name => 'role1')
	18	+ role2 = Role.create!(:name => 'role2')
	19	+ member = create_user('person').person
	20	+ organization = Organization.create!(:name => 'Organization', :identifier => 'organization')
	21	+ RoleAssignment.create!(:accessor => member, :resource => organization, :role => role1)
	22	+ RoleAssignment.create!(:accessor => member, :resource => organization, :role => role2)
	23	+ assert_difference organization, :members_count, -1 do
	24	+ organization.role_assignments.destroy_all
	25	+ organization.reload
	26	+ end
	27	+ end
	28	+end