Merge pull request #1414 from AlexDenisov/team_member_events

Team membership events

Merge pull request #1414 from AlexDenisov/team_member_events
Team membership events
Dmitriy Zaporozhets
2 parents a56cec11 1f240b09
Showing 11 changed files with 143 additions and 3 deletions Show diff stats
app/assets/stylesheets/common.scss
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_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
@@ -179,6 +179,14 @@ span.update-author {
   &.merged {
     background-color: #2A2;
   }
+
+  &.joined {
+    background-color: #1cb9ff;
+  }
+
+  &.left {
+    background-color: #ff5057;
+  }
 }
  
 form {
@@ -8,7 +8,9 @@ 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
-    else 
+    elsif self.membership_changed?
+      "#{self.author_name} #{self.action_name} #{self.project.name}"
+    else
       ""
     end
   end
@@ -10,6 +10,8 @@ class Event &lt; ActiveRecord::Base
   Pushed    = 5
   Commented = 6
   Merged    = 7
+  Joined    = 8 # User joined project
+  Left      = 9 # User left project
  
   belongs_to :project
   belongs_to :target, polymorphic: true
@@ -37,7 +39,7 @@ class Event &lt; ActiveRecord::Base
   #  - new issue
   #  - merge request
   def allowed?
-    push? || issue? || merge_request?
+    push? || issue? || merge_request? || membership_changed?
   end
  
   def push?
@@ -84,6 +86,18 @@ class Event &lt; ActiveRecord::Base
       [Closed, Reopened].include?(action)
   end
  
+  def joined?
+    action == Joined
+  end
+
+  def left?
+    action == Left
+  end
+
+  def membership_changed?
+    joined? || left?
+  end
+
   def issue 
     target if target_type == "Issue"
   end
@@ -101,6 +115,10 @@ class Event &lt; ActiveRecord::Base
       "closed"
     elsif merged?
       "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
 class UsersProjectObserver < ActiveRecord::Observer
   def after_create(users_project)
     Notify.project_access_granted_email(users_project.id).deliver
+
+    Event.create(
+      project_id: users_project.project.id,
+      action: Event::Joined,
+      author_id: users_project.user.id
+    )
   end
  
   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,3 +11,7 @@
     .event_feed
       = render "events/event_push", event: event
  
+  - elsif event.membership_changed?
+    .event_feed
+      = render "events/event_membership_changed", event: event
+
@@ -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,4 +15,14 @@ Feature: Dashboard
     And I click "Create Merge Request" link
     Then I see prefilled new Merge Request page
  
+  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 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
+  
@@ -109,3 +109,28 @@ Given /^I have authored merge requests$/ do
    :author => @user,
    :project => project2
 end
+
+Given /^user with name "(.*?)" joined project "(.*?)"$/ do |user_name, project_name|
+  user = Factory.create(:user, {name: user_name})
+  project = Project.find_by_name project_name
+  Event.create(
+    project: project,
+    author_id: user.id,
+    action: Event::Joined
+  )
+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
+
@@ -49,4 +49,26 @@ describe Event do
     it { @event.branch_name.should == "master" }
     it { @event.author.should == @user }
   end
+
+  describe "Joined project team" do
+    let(:project) {Factory.create :project}
+    let(:new_user) {Factory.create :user}
+    it "should create event" do
+      UsersProject.observers.enable :users_project_observer
+      expect{
+        UsersProject.bulk_import(project, [new_user.id], UsersProject::DEVELOPER)
+      }.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
@@ -23,6 +23,14 @@ describe UsersProjectObserver do
       Notify.should_receive(:project_access_granted_email).with(users_project.id).and_return(double(deliver: true))
       subject.after_create(users_project)
     end
+    it "should create new event" do
+      Event.should_receive(:create).with(
+        project_id: users_project.project.id, 
+        action: Event::Joined, 
+        author_id: users_project.user.id
+      )
+      subject.after_create(users_project)
+    end
   end
  
   describe "#after_update" do
@@ -37,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
...	...	@@ -179,6 +179,14 @@ span.update-author {
179	179	&.merged {
180	180	background-color: #2A2;
181	181	}
	182	+
	183	+ &.joined {
	184	+ background-color: #1cb9ff;
	185	+ }
	186	+
	187	+ &.left {
	188	+ background-color: #ff5057;
	189	+ }
182	190	}
183	191
184	192	form {
...	...
...	...	@@ -8,7 +8,9 @@ class EventDecorator < ApplicationDecorator
8	8	"#{self.author_name} #{self.action_name} MR ##{self.target_id}:" + self.merge_request_title
9	9	elsif self.push?
10	10	"#{self.author_name} #{self.push_action_name} #{self.ref_type} " + self.ref_name
11		- else
	11	+ elsif self.membership_changed?
	12	+ "#{self.author_name} #{self.action_name} #{self.project.name}"
	13	+ else
12	14	""
13	15	end
14	16	end
...	...
...	...	@@ -10,6 +10,8 @@ class Event < ActiveRecord::Base
10	10	Pushed = 5
11	11	Commented = 6
12	12	Merged = 7
	13	+ Joined = 8 # User joined project
	14	+ Left = 9 # User left project
13	15
14	16	belongs_to :project
15	17	belongs_to :target, polymorphic: true
...	...	@@ -37,7 +39,7 @@ class Event < ActiveRecord::Base
37	39	# - new issue
38	40	# - merge request
39	41	def allowed?
40		- push? \|\| issue? \|\| merge_request?
	42	+ push? \|\| issue? \|\| merge_request? \|\| membership_changed?
41	43	end
42	44
43	45	def push?
...	...	@@ -84,6 +86,18 @@ class Event < ActiveRecord::Base
84	86	[Closed, Reopened].include?(action)
85	87	end
86	88
	89	+ def joined?
	90	+ action == Joined
	91	+ end
	92	+
	93	+ def left?
	94	+ action == Left
	95	+ end
	96	+
	97	+ def membership_changed?
	98	+ joined? \|\| left?
	99	+ end
	100	+
87	101	def issue
88	102	target if target_type == "Issue"
89	103	end
...	...	@@ -101,6 +115,10 @@ class Event < ActiveRecord::Base
101	115	"closed"
102	116	elsif merged?
103	117	"merged"
	118	+ elsif joined?
	119	+ 'joined'
	120	+ elsif left?
	121	+ 'left'
104	122	else
105	123	"opened"
106	124	end
...	...
...	...	@@ -23,7 +23,7 @@ class UsersProject < ActiveRecord::Base
23	23	def self.bulk_delete(project, user_ids)
24	24	UsersProject.transaction do
25	25	UsersProject.where(:user_id => user_ids, :project_id => project.id).each do \|users_project\|
26		- users_project.delete
	26	+ users_project.destroy
27	27	end
28	28	end
29	29	end
...	...
1	1	class UsersProjectObserver < ActiveRecord::Observer
2	2	def after_create(users_project)
3	3	Notify.project_access_granted_email(users_project.id).deliver
	4	+
	5	+ Event.create(
	6	+ project_id: users_project.project.id,
	7	+ action: Event::Joined,
	8	+ author_id: users_project.user.id
	9	+ )
4	10	end
5	11
6	12	def after_update(users_project)
7	13	Notify.project_access_granted_email(users_project.id).deliver
8	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	+
9	24	end
...	...
...	...	@@ -11,3 +11,7 @@
11	11	.event_feed
12	12	= render "events/event_push", event: event
13	13
	14	+ - elsif event.membership_changed?
	15	+ .event_feed
	16	+ = render "events/event_membership_changed", event: event
	17	+
...	...
...	...	@@ -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	+
...	...
...	...	@@ -15,4 +15,14 @@ Feature: Dashboard
15	15	And I click "Create Merge Request" link
16	16	Then I see prefilled new Merge Request page
17	17
	18	+ Scenario: I should see User joined Project event
	19	+ Given user with name "John Doe" joined project "Shop"
	20	+ When I visit dashboard page
	21	+ Then I should see "John Doe joined project Shop" event
18	22
	23	+ Scenario: I should see User left Project event
	24	+ Given user with name "John Doe" joined project "Shop"
	25	+ And user with name "John Doe" left project "Shop"
	26	+ When I visit dashboard page
	27	+ Then I should see "John Doe left project Shop" event
	28	+
...	...
...	...	@@ -109,3 +109,28 @@ Given /^I have authored merge requests$/ do
109	109	:author => @user,
110	110	:project => project2
111	111	end
	112	+
	113	+Given /^user with name "(.?)" joined project "(.?)"$/ do \|user_name, project_name\|
	114	+ user = Factory.create(:user, {name: user_name})
	115	+ project = Project.find_by_name project_name
	116	+ Event.create(
	117	+ project: project,
	118	+ author_id: user.id,
	119	+ action: Event::Joined
	120	+ )
	121	+end
	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	+
	133	+Then /^I should see "(.*?)" event$/ do \|event_text\|
	134	+ page.should have_content(event_text)
	135	+end
	136	+
...	...
...	...	@@ -49,4 +49,26 @@ describe Event do
49	49	it { @event.branch_name.should == "master" }
50	50	it { @event.author.should == @user }
51	51	end
	52	+
	53	+ describe "Joined project team" do
	54	+ let(:project) {Factory.create :project}
	55	+ let(:new_user) {Factory.create :user}
	56	+ it "should create event" do
	57	+ UsersProject.observers.enable :users_project_observer
	58	+ expect{
	59	+ UsersProject.bulk_import(project, [new_user.id], UsersProject::DEVELOPER)
	60	+ }.to change{Event.count}.by(1)
	61	+ 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
52	74	end
...	...