Store the person that closes a task

Victor Costa · Leandro Santos
1 parent 4de02a20
Showing 5 changed files with 40 additions and 9 deletions Show diff stats
app/controllers/my_profile/tasks_controller.rb
app/models/task.rb
db/migrate/20150602142030_add_closed_by_to_task.rb
test/functional/tasks_controller_test.rb
test/unit/task_test.rb
@@ -49,7 +49,7 @@ class TasksController &lt; MyProfileController
           task = profile.find_in_all_tasks(id)
           begin
             task.update_attributes(value[:task])
-            task.send(decision)
+            task.send(decision, current_person)
           rescue Exception => ex
             message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
             failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
@@ -34,6 +34,7 @@ class Task &lt; ActiveRecord::Base
   belongs_to :requestor, :class_name => 'Profile', :foreign_key => :requestor_id
   belongs_to :target, :foreign_key => :target_id, :polymorphic => true
   belongs_to :responsible, :class_name => 'Person', :foreign_key => :responsible_id
+  belongs_to :closed_by, :class_name => 'Person', :foreign_key => :closed_by_id
   validates_uniqueness_of :code, :on => :create
   validates_presence_of :code
@@ -77,11 +78,9 @@ class Task &lt; ActiveRecord::Base
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
-  def finish
+  def finish(closed_by=nil)
     transaction do
-      self.status = Task::Status::FINISHED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::FINISHED, closed_by)
       self.perform
       begin
         send_notification(:finished)
@@ -106,11 +105,9 @@ class Task &lt; ActiveRecord::Base
   # this method cancels the task. At the end a message (as returned by
   # #cancel_message) is sent to the requestor with #notify_requestor.
-  def cancel
+  def cancel(closed_by=nil)
     transaction do
-      self.status = Task::Status::CANCELLED
-      self.end_date = Time.now
-      self.save!
+      close(Task::Status::CANCELLED, closed_by)
       begin
         send_notification(:cancelled)
       rescue NotImplementedError => ex
@@ -119,6 +116,13 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  def close(status, closed_by)
+    self.status = status
+    self.end_date = Time.now
+    self.closed_by = closed_by
+    self.save!
+  end
+
   # Here are the tasks customizable options.
   def title
@@ -0,0 +1,7 @@
+class AddClosedByToTask < ActiveRecord::Migration
+
+  def change
+    add_column :tasks, :closed_by_id, :integer
+  end
+
+end
@@ -628,6 +628,12 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_select ".task_responsible select", 0
     assert_select ".task_responsible .value"
+  end 
+
+  should 'store the person who closes a task' do
+    t = profile.tasks.build; t.save!
+    post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
+    assert_equal profile, t.reload.closed_by
   end
 end
@@ -440,6 +440,20 @@ class TaskTest &lt; ActiveSupport::TestCase
     assert_equal person, task.responsible
   end
+  should 'store who finish the task' do
+    t = Task.create
+    person = fast_create(Person)
+    t.finish(person)
+    assert_equal person, t.reload.closed_by
+  end
+
+  should 'store who cancel the task' do
+    t = Task.create
+    person = fast_create(Person)
+    t.cancel(person)
+    assert_equal person, t.reload.closed_by
+  end
+
   protected
   def sample_user
	@@ -49,7 +49,7 @@ class TasksController < MyProfileController		@@ -49,7 +49,7 @@ class TasksController < MyProfileController
49	task = profile.find_in_all_tasks(id)	49	task = profile.find_in_all_tasks(id)
50	begin	50	begin
51	task.update_attributes(value[:task])	51	task.update_attributes(value[:task])
52	- task.send(decision)	52	+ task.send(decision, current_person)
53	rescue Exception => ex	53	rescue Exception => ex
54	message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"	54	message = "#{task.title} (#{task.requestor ? task.requestor.name : task.author_name})"
55	failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]	55	failed[ex.message] ? failed[ex.message] << message : failed[ex.message] = [message]
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class AddClosedByToTask < ActiveRecord::Migration
	2	+
	3	+ def change
	4	+ add_column :tasks, :closed_by_id, :integer
	5	+ end
	6	+
	7	+end
	@@ -628,6 +628,12 @@ class TasksControllerTest < ActionController::TestCase		@@ -628,6 +628,12 @@ class TasksControllerTest < ActionController::TestCase
628		628
629	assert_select ".task_responsible select", 0	629	assert_select ".task_responsible select", 0
630	assert_select ".task_responsible .value"	630	assert_select ".task_responsible .value"
		631	+ end
		632	+
		633	+ should 'store the person who closes a task' do
		634	+ t = profile.tasks.build; t.save!
		635	+ post :close, :tasks => {t.id => {:decision => 'finish', :task => {}}}
		636	+ assert_equal profile, t.reload.closed_by
631	end	637	end
632		638
633	end	639	end
	@@ -440,6 +440,20 @@ class TaskTest < ActiveSupport::TestCase		@@ -440,6 +440,20 @@ class TaskTest < ActiveSupport::TestCase
440	assert_equal person, task.responsible	440	assert_equal person, task.responsible
441	end	441	end
442		442
		443	+ should 'store who finish the task' do
		444	+ t = Task.create
		445	+ person = fast_create(Person)
		446	+ t.finish(person)
		447	+ assert_equal person, t.reload.closed_by
		448	+ end
		449	+
		450	+ should 'store who cancel the task' do
		451	+ t = Task.create
		452	+ person = fast_create(Person)
		453	+ t.cancel(person)
		454	+ assert_equal person, t.reload.closed_by
		455	+ end
		456	+
443	protected	457	protected
444		458
445	def sample_user	459	def sample_user