Created 'AddMemberJob' to enqueue added members action to execute in another mom…

…ent. Added functional test for this feature

Created 'AddMemberJob' to enqueue added members action to execute in another mom…
…ent. Added functional test for this feature
Michel Felipe
1 parent 7ba0db11
Showing 5 changed files with 86 additions and 38 deletions Show diff stats
app/controllers/public/invite_controller.rb
app/models/invitation.rb
app/models/profile.rb
lib/add_members_job.rb
test/functional/invite_controller_test.rb
@@ -65,33 +65,33 @@ class InviteController &lt; PublicController
   #Invite or add member without create a task
   #if logged user is admin of environment
   def invite_registered_friend
-    contacts_to_invite = params['q'].split(',')
-    if !contacts_to_invite.empty? && request.post?
-      if user.is_admin?
-        person = Person.find(user.id)
-        session[:invited_members] = []
+    if !params['q'].present? || !request.post?
-        Invitation.invite(person, contacts_to_invite, '', profile) do |added_member|
-          session[:invited_members] << added_member.id
-        end
+      redirect_to :action => 'invite_friends'
+      session[:notice] = _('Please enter a valid profile.')
-        session[:notice] = _('This friends was added!')
-      else
-        Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
-        session[:notice] = _('Your invitations are being sent.')
-      end
+      return
+    end
+    contacts_to_invite = params['q'].split(',')
-      if profile.person?
-        redirect_to :controller => 'profile', :action => 'friends'
-      else
-        redirect_to :controller => 'profile', :action => 'members'
-      end
+    if user.is_admin? && profile.community?
+
+      Delayed::Job.enqueue AddMembersJob.new contacts_to_invite, profile.id, locale
+
+      session[:notice] = _('This friends was added!')
     else
-      redirect_to :action => 'invite_friends'
-      session[:notice] = _('Please enter a valid profile.')
+      Delayed::Job.enqueue InvitationJob.new(user.id, contacts_to_invite, '', profile.id, nil, locale)
+      session[:notice] = _('Your invitations are being sent.')
     end
+
+    if profile.person?
+      redirect_to :controller => 'profile', :action => 'friends'
+    else
+      redirect_to :controller => 'profile', :action => 'members'
+    end
+
   end
   def search
@@ -47,7 +47,6 @@ class Invitation &lt; Task
   end
   def self.invite(person, contacts_to_invite, message, profile)
-
     contacts_to_invite.each do |contact_to_invite|
       next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
@@ -80,23 +79,7 @@ class Invitation &lt; Task
       if profile.person?
         InviteFriend.create(task_args) if user.nil? || !user.person.is_a_friend?(person)
       elsif profile.community?
-
-        if person.is_admin?
-          unless user.person.is_member_of?(profile)
-
-            profile.add_member(user.person)
-
-            #Call after add member callback
-            yield user
-
-          end
-        else
-
-          InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? || !user.person.is_member_of?(profile)
-
-          #Call after create invite member task callback
-          yield user,task_args
-        end
+        InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? || !user.person.is_member_of?(profile)
       else
         raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
       end
@@ -665,6 +665,32 @@ private :generate_url, :url_options
     end
   end
+  # Adds many people to profile by id's or email's
+  def add_members(people_ids)
+
+    unless people_ids.nil? && people_ids.empty?
+      people = []
+
+      if people_ids.first =~ /\@/
+        people = User.where(email: people_ids)
+      else
+        people = Person.where(id: people_ids)
+      end
+
+      people.each do |profile|
+        person = profile
+
+        if profile.is_a? User
+          person = profile.person
+        end
+
+        unless person.is_member_of?(self)
+          add_member person
+        end
+      end
+    end
+  end
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -0,0 +1,11 @@
+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
+
+  def perform
+    Noosfero.with_locale(locale) do
+
+      profile = Profile.find(profile_id)
+      profile.add_members people_ids
+
+    end
+  end
+end
@@ -284,6 +284,11 @@ class InviteControllerTest &lt; ActionController::TestCase
     assert_empty json_response
   end
+  #@todo Copy this test and create a another version
+  #of this, for test add members in a community
+  #logged as admin of environment!
+  # #issue227
+  #
   should 'invite registered users through profile id' do
     friend1 = create_user('testuser1').person
     friend2 = create_user('testuser2').person
@@ -297,6 +302,29 @@ class InviteControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'add registered users imediatly instead invite if logged user is a environment admin' do
+
+    #Add user like a environment admin
+    Environment.default.add_admin profile
+
+    friend1 = create_user('testuser1').person
+    friend2 = create_user('testuser2').person
+
+    assert_difference 'Delayed::Job.count', 1 do
+      assert_equal 0,community.members.count
+
+      post :invite_registered_friend, :profile => @community.identifier, :q => [friend1.id,friend2.id]
+
+      assert_response :redirect
+      assert_redirected_to :controller => 'profile', :action => 'members'
+    end
+
+    Delayed::Worker.new.run(Delayed::Job.last)
+
+    assert_equal 2,community.members.count
+
+  end
+
   private
   def json_response
	@@ -47,7 +47,6 @@ class Invitation < Task		@@ -47,7 +47,6 @@ class Invitation < Task
47	end	47	end
48		48
49	def self.invite(person, contacts_to_invite, message, profile)	49	def self.invite(person, contacts_to_invite, message, profile)
50	-
51	contacts_to_invite.each do \|contact_to_invite\|	50	contacts_to_invite.each do \|contact_to_invite\|
52	next if contact_to_invite == _("Firstname Lastname <friend@email.com>")	51	next if contact_to_invite == _("Firstname Lastname <friend@email.com>")
53		52
	@@ -80,23 +79,7 @@ class Invitation < Task		@@ -80,23 +79,7 @@ class Invitation < Task
80	if profile.person?	79	if profile.person?
81	InviteFriend.create(task_args) if user.nil? \|\| !user.person.is_a_friend?(person)	80	InviteFriend.create(task_args) if user.nil? \|\| !user.person.is_a_friend?(person)
82	elsif profile.community?	81	elsif profile.community?
83	-
84	- if person.is_admin?
85	- unless user.person.is_member_of?(profile)
86	-
87	- profile.add_member(user.person)
88	-
89	- #Call after add member callback
90	- yield user
91	-
92	- end
93	- else
94	-
95	- InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? \|\| !user.person.is_member_of?(profile)
96	-
97	- #Call after create invite member task callback
98	- yield user,task_args
99	- end	82	+ InviteMember.create(task_args.merge(:community_id => profile.id)) if user.nil? \|\| !user.person.is_member_of?(profile)
100	else	83	else
101	raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s	84	raise NotImplementedError, 'Don\'t know how to invite people to a %s' % profile.class.to_s
102	end	85	end
	@@ -665,6 +665,32 @@ private :generate_url, :url_options		@@ -665,6 +665,32 @@ private :generate_url, :url_options
665	end	665	end
666	end	666	end
667		667
		668	+ # Adds many people to profile by id's or email's
		669	+ def add_members(people_ids)
		670	+
		671	+ unless people_ids.nil? && people_ids.empty?
		672	+ people = []
		673	+
		674	+ if people_ids.first =~ /\@/
		675	+ people = User.where(email: people_ids)
		676	+ else
		677	+ people = Person.where(id: people_ids)
		678	+ end
		679	+
		680	+ people.each do \|profile\|
		681	+ person = profile
		682	+
		683	+ if profile.is_a? User
		684	+ person = profile.person
		685	+ end
		686	+
		687	+ unless person.is_member_of?(self)
		688	+ add_member person
		689	+ end
		690	+ end
		691	+ end
		692	+ end
		693	+
668	def remove_member(person)	694	def remove_member(person)
669	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))	695	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
670	end	696	end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class AddMembersJob < Struct.new(:people_ids, :profile_id, :locale)
	2	+
	3	+ def perform
	4	+ Noosfero.with_locale(locale) do
	5	+
	6	+ profile = Profile.find(profile_id)
	7	+ profile.add_members people_ids
	8	+
	9	+ end
	10	+ end
	11	+end
	@@ -284,6 +284,11 @@ class InviteControllerTest < ActionController::TestCase		@@ -284,6 +284,11 @@ class InviteControllerTest < ActionController::TestCase
284	assert_empty json_response	284	assert_empty json_response
285	end	285	end
286		286
		287	+ #@todo Copy this test and create a another version
		288	+ #of this, for test add members in a community
		289	+ #logged as admin of environment!
		290	+ # #issue227
		291	+ #
287	should 'invite registered users through profile id' do	292	should 'invite registered users through profile id' do
288	friend1 = create_user('testuser1').person	293	friend1 = create_user('testuser1').person
289	friend2 = create_user('testuser2').person	294	friend2 = create_user('testuser2').person
	@@ -297,6 +302,29 @@ class InviteControllerTest < ActionController::TestCase		@@ -297,6 +302,29 @@ class InviteControllerTest < ActionController::TestCase
297	end	302	end
298	end	303	end
299		304
		305	+ should 'add registered users imediatly instead invite if logged user is a environment admin' do
		306	+
		307	+ #Add user like a environment admin
		308	+ Environment.default.add_admin profile
		309	+
		310	+ friend1 = create_user('testuser1').person
		311	+ friend2 = create_user('testuser2').person
		312	+
		313	+ assert_difference 'Delayed::Job.count', 1 do
		314	+ assert_equal 0,community.members.count
		315	+
		316	+ post :invite_registered_friend, :profile => @community.identifier, :q => [friend1.id,friend2.id]
		317	+
		318	+ assert_response :redirect
		319	+ assert_redirected_to :controller => 'profile', :action => 'members'
		320	+ end
		321	+
		322	+ Delayed::Worker.new.run(Delayed::Job.last)
		323	+
		324	+ assert_equal 2,community.members.count
		325	+
		326	+ end
		327	+
300	private	328	private
301		329
302	def json_response	330	def json_response