User left project event added

Alex Denisov
1 parent a86bd87a
Showing 11 changed files with 83 additions and 18 deletions Show diff stats
app/decorators/event_decorator.rb
app/models/event.rb
app/models/users_project.rb
app/observers/users_project_observer.rb
app/views/events/_event.html.haml
app/views/events/_event_joined.html.haml
app/views/events/_event_membership_changed.html.haml
features/dashboard/dashboard.feature
features/step_definitions/dashboard_steps.rb
spec/models/event_spec.rb
spec/observers/users_project_observer_spec.rb
@@ -8,9 +8,8 @@ class EventDecorator &lt; ApplicationDecorator
       "#{self.author_name} #{self.action_name} MR ##{self.target_id}:" + self.merge_request_title
     elsif self.push?
       "#{self.author_name} #{self.push_action_name} #{self.ref_type} " + self.ref_name
-    elsif self.joined?
+    elsif self.membership_changed?
       "#{self.author_name} #{self.action_name} #{self.project.name}"
-
     else
       ""
     end
@@ -11,6 +11,7 @@ class Event &lt; ActiveRecord::Base
   Commented = 6
   Merged    = 7
   Joined    = 8 # User joined project
+  Left      = 9 # User left project
   belongs_to :project
   belongs_to :target, polymorphic: true
@@ -38,7 +39,7 @@ class Event &lt; ActiveRecord::Base
   #  - new issue
   #  - merge request
   def allowed?
-    push? || issue? || merge_request? || joined?
+    push? || issue? || merge_request? || membership_changed?
   end
   def push?
@@ -86,7 +87,15 @@ class Event &lt; ActiveRecord::Base
   end
   def joined?
-    action == self.class::Joined
+    action == Joined
+  end
+
+  def left?
+    action == Left
+  end
+
+  def membership_changed?
+    joined? || left?
   end
   def issue 
@@ -108,6 +117,8 @@ class Event &lt; ActiveRecord::Base
       "merged"
     elsif joined?
       'joined'
+    elsif left?
+      'left'
     else 
       "opened"
     end
@@ -23,7 +23,7 @@ class UsersProject &lt; ActiveRecord::Base
   def self.bulk_delete(project, user_ids)
     UsersProject.transaction do
       UsersProject.where(:user_id => user_ids, :project_id => project.id).each do |users_project|
-        users_project.delete
+        users_project.destroy
       end
     end
   end
@@ -12,4 +12,13 @@ class UsersProjectObserver &lt; ActiveRecord::Observer
   def after_update(users_project)
     Notify.project_access_granted_email(users_project.id).deliver
   end
+
+  def after_destroy(users_project)
+    Event.create(
+      project_id: users_project.project.id, 
+      action: Event::Left, 
+      author_id: users_project.user.id
+    )
+  end
+
 end
@@ -11,7 +11,7 @@
     .event_feed
       = render "events/event_push", event: event
-  - elsif event.joined?
+  - elsif event.membership_changed?
     .event_feed
-      = render "events/event_joined", event: event
+      = render "events/event_membership_changed", event: event
@@ -1,8 +0,0 @@
-= image_tag gravatar_icon(event.author_email), class: "avatar"
-%strong #{event.author_name}
-%span.event_label{class: event.action_name}= event.action_name
-%strong= link_to event.project.name, event.project
-%span.cgray
-  = time_ago_in_words(event.created_at)
-  ago.
-
@@ -0,0 +1,9 @@
+= image_tag gravatar_icon(event.author_email), class: "avatar"
+%strong #{event.author_name}
+%span.event_label{class: event.action_name}= event.action_name
+project
+%strong= link_to event.project.name, event.project
+%span.cgray
+  = time_ago_in_words(event.created_at)
+  ago.
+
@@ -15,9 +15,14 @@ Feature: Dashboard
     And I click "Create Merge Request" link
     Then I see prefilled new Merge Request page
-  @current
   Scenario: I should see User joined Project event
     Given user with name "John Doe" joined project "Shop"
     When I visit dashboard page
-    Then I should see "John Doe joined Shop" event
+    Then I should see "John Doe joined project Shop" event
+
+  Scenario: I should see User left Project event
+    Given user with name "John Doe" joined project "Shop"
+    And user with name "John Doe" left project "Shop"
+    When I visit dashboard page
+    Then I should see "John Doe left project Shop" event
@@ -120,6 +120,16 @@ Given /^user with name &quot;(.*?)&quot; joined project &quot;(.*?)&quot;$/ do |user_name, project_n
   )
 end
+Given /^user with name "(.*?)" left project "(.*?)"$/ do |user_name, project_name|
+  user = User.find_by_name user_name
+  project = Project.find_by_name project_name
+  Event.create(
+    project: project,
+    author_id: user.id,
+    action: Event::Left
+  )
+end
+
 Then /^I should see "(.*?)" event$/ do |event_text|
   page.should have_content(event_text)
 end
@@ -50,7 +50,7 @@ describe Event do
     it { @event.author.should == @user }
   end
-  describe "New team mamber" do
+  describe "Joined project team" do
     let(:project) {Factory.create :project}
     let(:new_user) {Factory.create :user}
     it "should create event" do
@@ -60,4 +60,15 @@ describe Event do
       }.to change{Event.count}.by(1)
     end
   end
+  describe "Left project team" do
+    let(:project) {Factory.create :project}
+    let(:new_user) {Factory.create :user}
+    it "should create event" do
+      UsersProject.bulk_import(project, [new_user.id], UsersProject::DEVELOPER)
+      UsersProject.observers.enable :users_project_observer
+      expect{
+        UsersProject.bulk_delete(project, [new_user.id])
+      }.to change{Event.count}.by(1)
+    end
+  end
 end
@@ -45,4 +45,23 @@ describe UsersProjectObserver do
       subject.after_update(users_project)
     end
   end
+  describe "#after_destroy" do
+    it "should called when UsersProject destroyed" do
+      subject.should_receive(:after_destroy)
+      UsersProject.observers.enable :users_project_observer do
+        UsersProject.bulk_delete(
+          users_project.project,
+          [users_project.user.id]
+        )
+      end
+    end
+    it "should create new event" do
+      Event.should_receive(:create).with(
+        project_id: users_project.project.id, 
+        action: Event::Left, 
+        author_id: users_project.user.id
+      )
+      subject.after_destroy(users_project)
+    end
+  end
 end
	@@ -23,7 +23,7 @@ class UsersProject < ActiveRecord::Base		@@ -23,7 +23,7 @@ class UsersProject < ActiveRecord::Base
23	def self.bulk_delete(project, user_ids)	23	def self.bulk_delete(project, user_ids)
24	UsersProject.transaction do	24	UsersProject.transaction do
25	UsersProject.where(:user_id => user_ids, :project_id => project.id).each do \|users_project\|	25	UsersProject.where(:user_id => user_ids, :project_id => project.id).each do \|users_project\|
26	- users_project.delete	26	+ users_project.destroy
27	end	27	end
28	end	28	end
29	end	29	end
	@@ -12,4 +12,13 @@ class UsersProjectObserver < ActiveRecord::Observer		@@ -12,4 +12,13 @@ class UsersProjectObserver < ActiveRecord::Observer
12	def after_update(users_project)	12	def after_update(users_project)
13	Notify.project_access_granted_email(users_project.id).deliver	13	Notify.project_access_granted_email(users_project.id).deliver
14	end	14	end
		15	+
		16	+ def after_destroy(users_project)
		17	+ Event.create(
		18	+ project_id: users_project.project.id,
		19	+ action: Event::Left,
		20	+ author_id: users_project.user.id
		21	+ )
		22	+ end
		23	+
15	end	24	end
	@@ -11,7 +11,7 @@		@@ -11,7 +11,7 @@
11	.event_feed	11	.event_feed
12	= render "events/event_push", event: event	12	= render "events/event_push", event: event
13		13
14	- - elsif event.joined?	14	+ - elsif event.membership_changed?
15	.event_feed	15	.event_feed
16	- = render "events/event_joined", event: event	16	+ = render "events/event_membership_changed", event: event
17		17
	@@ -1,8 +0,0 @@	@@ -1,8 +0,0 @@
1	-= image_tag gravatar_icon(event.author_email), class: "avatar"
2	-%strong #{event.author_name}
3	-%span.event_label{class: event.action_name}= event.action_name
4	-%strong= link_to event.project.name, event.project
5	-%span.cgray
6	- = time_ago_in_words(event.created_at)
7	- ago.
8	-
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+= image_tag gravatar_icon(event.author_email), class: "avatar"
	2	+%strong #{event.author_name}
	3	+%span.event_label{class: event.action_name}= event.action_name
	4	+project
	5	+%strong= link_to event.project.name, event.project
	6	+%span.cgray
	7	+ = time_ago_in_words(event.created_at)
	8	+ ago.
	9	+
	@@ -120,6 +120,16 @@ Given /^user with name "(.?)" joined project "(.?)"$/ do \|user_name, project_n		@@ -120,6 +120,16 @@ Given /^user with name "(.?)" joined project "(.?)"$/ do \|user_name, project_n
120	)	120	)
121	end	121	end
122		122
		123	+Given /^user with name "(.?)" left project "(.?)"$/ do \|user_name, project_name\|
		124	+ user = User.find_by_name user_name
		125	+ project = Project.find_by_name project_name
		126	+ Event.create(
		127	+ project: project,
		128	+ author_id: user.id,
		129	+ action: Event::Left
		130	+ )
		131	+end
		132	+
123	Then /^I should see "(.*?)" event$/ do \|event_text\|	133	Then /^I should see "(.*?)" event$/ do \|event_text\|
124	page.should have_content(event_text)	134	page.should have_content(event_text)
125	end	135	end
	@@ -50,7 +50,7 @@ describe Event do		@@ -50,7 +50,7 @@ describe Event do
50	it { @event.author.should == @user }	50	it { @event.author.should == @user }
51	end	51	end
52		52
53	- describe "New team mamber" do	53	+ describe "Joined project team" do
54	let(:project) {Factory.create :project}	54	let(:project) {Factory.create :project}
55	let(:new_user) {Factory.create :user}	55	let(:new_user) {Factory.create :user}
56	it "should create event" do	56	it "should create event" do
	@@ -60,4 +60,15 @@ describe Event do		@@ -60,4 +60,15 @@ describe Event do
60	}.to change{Event.count}.by(1)	60	}.to change{Event.count}.by(1)
61	end	61	end
62	end	62	end
		63	+ describe "Left project team" do
		64	+ let(:project) {Factory.create :project}
		65	+ let(:new_user) {Factory.create :user}
		66	+ it "should create event" do
		67	+ UsersProject.bulk_import(project, [new_user.id], UsersProject::DEVELOPER)
		68	+ UsersProject.observers.enable :users_project_observer
		69	+ expect{
		70	+ UsersProject.bulk_delete(project, [new_user.id])
		71	+ }.to change{Event.count}.by(1)
		72	+ end
		73	+ end
63	end	74	end
	@@ -45,4 +45,23 @@ describe UsersProjectObserver do		@@ -45,4 +45,23 @@ describe UsersProjectObserver do
45	subject.after_update(users_project)	45	subject.after_update(users_project)
46	end	46	end
47	end	47	end
		48	+ describe "#after_destroy" do
		49	+ it "should called when UsersProject destroyed" do
		50	+ subject.should_receive(:after_destroy)
		51	+ UsersProject.observers.enable :users_project_observer do
		52	+ UsersProject.bulk_delete(
		53	+ users_project.project,
		54	+ [users_project.user.id]
		55	+ )
		56	+ end
		57	+ end
		58	+ it "should create new event" do
		59	+ Event.should_receive(:create).with(
		60	+ project_id: users_project.project.id,
		61	+ action: Event::Left,
		62	+ author_id: users_project.user.id
		63	+ )
		64	+ subject.after_destroy(users_project)
		65	+ end
		66	+ end
48	end	67	end