ActionItem5: functionality of affiliaton replaced by roles assignments

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@495 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem5: functionality of affiliaton replaced by roles assignments
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@495 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent 44acf4c2
Showing 11 changed files with 72 additions and 74 deletions Show diff stats
app/controllers/profile_admin/enterprise_controller.rb
app/models/affiliation.rb
app/models/person.rb
app/models/profile.rb
db/migrate/007_create_affiliations.rb
test/fixtures/affiliations.yml
test/fixtures/role_assignments.yml
test/fixtures/roles.yml
test/unit/affiliation_test.rb
test/unit/person_test.rb
test/unit/profile_test.rb
@@ -5,8 +5,8 @@ class EnterpriseController &lt; ProfileAdminController
   # Redirects to show if there is only one action and to list otherwise
   def index
-    if @my_enterprises.size == 1
-      redirect_to :action => 'show', :id => @my_enterprises[0]
+    if @person.enterprises.size == 1
+      redirect_to :action => 'show', :id => @person.enterprises[0]
     else
       redirect_to :action => 'list'
     end
@@ -14,12 +14,12 @@ class EnterpriseController &lt; ProfileAdminController
   # Lists all enterprises
   def list
-    @enterprises = Enterprise.find(:all) - @my_enterprises
+    @enterprises = Enterprise.find(:all) - @person.enterprises
   end
   # Show details about an enterprise
   def show
-    @enterprise = @my_enterprises.find(params[:id])
+    @enterprise = Enterprise.find(params[:id])
   end
   # Make a form to the creation of an eterprise
@@ -47,13 +47,13 @@ class EnterpriseController &lt; ProfileAdminController
   # Provides an interface to editing the enterprise details
   def edit
-    @enterprise = @my_enterprises.find(params[:id])
+    @enterprise = @person.enterprises(:id => params[:id])[0]
     @validation_entities = Organization.find(:all) - [@enterprise]
   end
   # Saves the changes made in an enterprise
   def update
-    @enterprise = @my_enterprises.find(params[:id])
+    @enterprise = @person.enterprises(:id => params[:id])[0]
     if @enterprise.update_attributes(params[:enterprise]) && @enterprise.organization_info.update_attributes(params[:organization_info])
       redirect_to :action => 'index'
     else
@@ -66,13 +66,14 @@ class EnterpriseController &lt; ProfileAdminController
   # Make the current user a new member of the enterprise
   def affiliate
     @enterprise = Enterprise.find(params[:id])
-    @enterprise.people << @person
+    member_role = Role.find_by_name('member') || Role.create(:name => 'member')
+    @enterprise.affiliate(@person,member_role)
     redirect_to :action => 'index'
   end
   # Elimitates the enterprise of the system
   def destroy 
-    @enterprise = @my_enterprises.find(params[:id])
+    @enterprise = @person.enterprises(:id => params[:id])[0]
     if @enterprise
       @enterprise.destroy
     else
@@ -1,5 +0,0 @@
-# Affiliation it is a join model to hold affiliations of people to others profiles
-class Affiliation < ActiveRecord::Base
-  belongs_to :person
-  belongs_to :profile
-end
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
-  ENTERPRISE = {:class_name => 'Enterprise', :through => :affiliations, :foreign_key => 'person_id', :source => 'profile'}
-
   belongs_to :user
-  has_many :affiliations, :dependent => :destroy
-  has_many :profiles, :through => :affiliations
-  has_many :enterprises,  ENTERPRISE
-  has_many :pending_enterprises, ENTERPRISE.merge(:conditions => ['active = ?', false])
-  has_many :active_enterprises, ENTERPRISE.merge(:conditions => ['active = ?', true])
-  has_many :friendships
-  has_many :friends, :class_name => 'Person', :through => :friendships
-  has_many :person_friendships
-  has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'
+
+#  has_many :friendships
+#  has_many :friends, :class_name => 'Person', :through => :friendships
+#  has_many :person_friendships
+#  has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'
+  
   has_one :person_info
   has_many :role_assignments
+  has_many :memberships, :through => :role_assignments, :source => 'resource', :class_name => 'Enterprise'
   def has_permission?(perm, res=nil)
     role_assignments.any? {|ra| ra.has_permission?(perm, res)}
   end
+  def self.conditions_for_profiles(conditions, person)
+    new_conditions = sanitize_sql(['role_assignments.person_id = ?', person])
+    new_conditions << ' AND ' +  sanitize_sql(conditions) unless conditions.blank?
+    new_conditions
+  end
+
+  def profiles(conditions = {})
+    Profile.find(
+      :all, 
+      :conditions => self.class.conditions_for_profiles(conditions, self), 
+      :joins => "LEFT JOIN role_assignments ON profiles.id = role_assignments.resource_id AND role_assignments.resource_type = \"#{Profile.base_class.name}\"",
+      :select => 'profiles.*')
+  end
+
+  
+  def enterprises(conditions = {})
+    profiles( ({:type => 'Enterprise'}).merge(conditions))
+  end
+
+  def pending_enterprises
+    enterprises :active => false
+  end
+
+  def active_enterprises
+    enterprises :active => true
+  end
+
   def info
     person_info
   end
@@ -33,10 +33,9 @@ class Profile &lt; ActiveRecord::Base
   has_many :domains, :as => :owner
   belongs_to :virtual_community
-  has_many :affiliations, :dependent => :destroy
-  has_many :people, :through => :affiliations
-  has_many :role_assignment, :as => :resource
+  has_many :role_assignments, :as => :resource
+  has_many :people, :through => :role_assignments
   # Sets the identifier for this profile. Raises an exception when called on a
@@ -103,4 +102,7 @@ class Profile &lt; ActiveRecord::Base
     homepage.children.find(:all, :limit => limit, :order => 'created_on desc')
   end
+  def affiliate(person, role)
+    RoleAssignment.new(:person => person, :role => role, :resource => self).save
+  end
 end
@@ -1,12 +0,0 @@
-class CreateAffiliations < ActiveRecord::Migration
-  def self.up
-    create_table :affiliations do |t|
-      t.column :person_id,            :integer
-      t.column :profile_id,      :integer
-    end
-  end
-
-  def self.down
-    drop_table :affiliations
-  end
-end
@@ -1,13 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-one:
-  id: 1
-  person_id: 4
-  profile_id: 5
-two:
-  id: 2
-  person_id: 1
-  profile_id: 5
-three:
-  id: 3
-  person_id: 1
-  profile_id: 6
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
+  person_id: 4
+  role_id: 1
+  resource_id: 5
+  resource_type: 'Profile'
 two:
   id: 2
+  person_id: 1
+  role_id: 1
+  resource_id: 5
+  resource_type: 'Profile'
+three:
+  id: 3
+  person_id: 1
+  role_id: 1
+  resource_id: 6
+  resource_type: 'Profile'
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
   id: 1
+  name: 'member'
 two:
   id: 2
+  name: 'owner'
@@ -1,10 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class AffiliationTest < Test::Unit::TestCase
-  fixtures :affiliations
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
@@ -17,7 +17,8 @@ class PersonTest &lt; Test::Unit::TestCase
     assert pr.save
     pe = User.create(:login => 'person', :email => 'person@test.net', :password => 'dhoe', :password_confirmation => 'dhoe').person
     assert pe.save
-    pe.profiles << pr
+    member_role = Role.create(:name => 'member')
+    pr.affiliate(pe, member_role) 
     assert pe.profiles.include?(pr)
   end
@@ -26,16 +27,8 @@ class PersonTest &lt; Test::Unit::TestCase
     assert e.save
     p = User.create(:login => 'person', :email => 'person@test.net', :password => 'dhoe', :password_confirmation => 'dhoe').person
     assert p.save
-    p.profiles << e
-    assert p.enterprises.include?(e)
-  end
-
-  def test_can_belongs_to_an_enterprise
-    e = Enterprise.new(:identifier => 'enterprise', :name => 'enterprise')
-    assert e.save
-    p = User.create(:login => 'person', :email => 'person@test.net', :password => 'dhoe', :password_confirmation => 'dhoe').person
-    assert p.save
-    p.profiles << e
+    member_role = Role.create(:name => 'member')
+    e.affiliate(p, member_role)
     assert p.enterprises.include?(e)
   end
@@ -79,7 +79,10 @@ class ProfileTest &lt; Test::Unit::TestCase
   def test_can_have_affiliated_people
     pr = Profile.create(:name => 'composite_profile', :identifier => 'composite')
     pe = User.create(:login => 'aff', :email => 'aff@pr.coop', :password => 'blih', :password_confirmation => 'blih').person
-    pr.people << pe
+    
+    member_role = Role.new(:name => 'member')
+    assert member_role.save
+    assert pr.affiliate(pe, member_role)
     assert pe.profiles.include?(pr)
   end
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-# Affiliation it is a join model to hold affiliations of people to others profiles
2	-class Affiliation < ActiveRecord::Base
3	- belongs_to :person
4	- belongs_to :profile
5	-end
1	# A person is the profile of an user holding all relationships with the rest of the system	1	# A person is the profile of an user holding all relationships with the rest of the system
2	class Person < Profile	2	class Person < Profile
3	- ENTERPRISE = {:class_name => 'Enterprise', :through => :affiliations, :foreign_key => 'person_id', :source => 'profile'}
4	-
5	belongs_to :user	3	belongs_to :user
6	- has_many :affiliations, :dependent => :destroy
7	- has_many :profiles, :through => :affiliations
8	- has_many :enterprises, ENTERPRISE
9	- has_many :pending_enterprises, ENTERPRISE.merge(:conditions => ['active = ?', false])
10	- has_many :active_enterprises, ENTERPRISE.merge(:conditions => ['active = ?', true])
11	- has_many :friendships
12	- has_many :friends, :class_name => 'Person', :through => :friendships
13	- has_many :person_friendships
14	- has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'	4	+
		5	+# has_many :friendships
		6	+# has_many :friends, :class_name => 'Person', :through => :friendships
		7	+# has_many :person_friendships
		8	+# has_many :people, :through => :person_friendships, :foreign_key => 'friend_id'
		9	+
15	has_one :person_info	10	has_one :person_info
16		11
17	has_many :role_assignments	12	has_many :role_assignments
		13	+ has_many :memberships, :through => :role_assignments, :source => 'resource', :class_name => 'Enterprise'
18		14
19	def has_permission?(perm, res=nil)	15	def has_permission?(perm, res=nil)
20	role_assignments.any? {\|ra\| ra.has_permission?(perm, res)}	16	role_assignments.any? {\|ra\| ra.has_permission?(perm, res)}
21	end	17	end
22		18
		19	+ def self.conditions_for_profiles(conditions, person)
		20	+ new_conditions = sanitize_sql(['role_assignments.person_id = ?', person])
		21	+ new_conditions << ' AND ' + sanitize_sql(conditions) unless conditions.blank?
		22	+ new_conditions
		23	+ end
		24	+
		25	+ def profiles(conditions = {})
		26	+ Profile.find(
		27	+ :all,
		28	+ :conditions => self.class.conditions_for_profiles(conditions, self),
		29	+ :joins => "LEFT JOIN role_assignments ON profiles.id = role_assignments.resource_id AND role_assignments.resource_type = \"#{Profile.base_class.name}\"",
		30	+ :select => 'profiles.*')
		31	+ end
		32	+
		33	+
		34	+ def enterprises(conditions = {})
		35	+ profiles( ({:type => 'Enterprise'}).merge(conditions))
		36	+ end
		37	+
		38	+ def pending_enterprises
		39	+ enterprises :active => false
		40	+ end
		41	+
		42	+ def active_enterprises
		43	+ enterprises :active => true
		44	+ end
		45	+
23	def info	46	def info
24	person_info	47	person_info
25	end	48	end
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-class CreateAffiliations < ActiveRecord::Migration
2	- def self.up
3	- create_table :affiliations do \|t\|
4	- t.column :person_id, :integer
5	- t.column :profile_id, :integer
6	- end
7	- end
8	-
9	- def self.down
10	- drop_table :affiliations
11	- end
12	-end
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	-one:
3	- id: 1
4	- person_id: 4
5	- profile_id: 5
6	-two:
7	- id: 2
8	- person_id: 1
9	- profile_id: 5
10	-three:
11	- id: 3
12	- person_id: 1
13	- profile_id: 6
1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	one:	2	one:
3	id: 1	3	id: 1
		4	+ person_id: 4
		5	+ role_id: 1
		6	+ resource_id: 5
		7	+ resource_type: 'Profile'
4	two:	8	two:
5	id: 2	9	id: 2
		10	+ person_id: 1
		11	+ role_id: 1
		12	+ resource_id: 5
		13	+ resource_type: 'Profile'
		14	+three:
		15	+ id: 3
		16	+ person_id: 1
		17	+ role_id: 1
		18	+ resource_id: 6
		19	+ resource_type: 'Profile'
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-require File.dirname(__FILE__) + '/../test_helper'
2	-
3	-class AffiliationTest < Test::Unit::TestCase
4	- fixtures :affiliations
5	-
6	- # Replace this with your real tests.
7	- def test_truth
8	- assert true
9	- end
10	-end