added an 'Unmerge' bulk action

Bob Lail
1 parent 8e57c587
Showing 7 changed files with 65 additions and 8 deletions Show diff stats
app/controllers/errs_controller.rb
app/models/err.rb
app/models/problem.rb
app/views/errs/_table.html.haml
config/routes.rb
spec/controllers/errs_controller_spec.rb
spec/models/problem_spec.rb
 class ErrsController < ApplicationController
   include ActionView::Helpers::TextHelper
-  before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several]
-  before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several]
-  before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several]
+  before_filter :find_app, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
+  before_filter :find_problem, :except => [:index, :all, :destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
+  before_filter :find_selected_problems, :only => [:destroy_several, :resolve_several, :unresolve_several, :merge_several, :unmerge_several]
@@ -119,6 +119,13 @@ class ErrsController &lt; ApplicationController
   end
+  def unmerge_several
+    all = @selected_problems.map(&:unmerge!).flatten
+    flash[:success] = "#{pluralize(all.length, 'err has', 'errs have')} been unmerged."
+    redirect_to :back
+  end
+  
+  
   def destroy_several
     @selected_problems.each(&:destroy)
     flash[:notice] = "#{pluralize(@selected_problems.count, 'err has', 'errs have')} been deleted."
@@ -13,9 +13,11 @@ class Err
   field :fingerprint
   belongs_to :problem
+  index :problem_id
+  
   has_many :notices, :inverse_of => :err, :dependent => :destroy
-  validates_presence_of :klass, :environment, :problem
+  validates_presence_of :klass, :environment
   delegate :app,
            :resolved?,
@@ -39,21 +39,21 @@ class Problem
   end
+  
   def resolve!
     self.update_attributes!(:resolved => true)
   end
-  
   def unresolve!
     self.update_attributes!(:resolved => false)
   end
-  
   def unresolved?
     !resolved?
   end
+  
   def self.merge!(*problems)
     problems = problems.flatten.uniq
     merged_problem = problems.shift
@@ -62,11 +62,30 @@ class Problem
       problem.errs(true) # reload problem.errs (should be empty) before problem.destroy
       problem.destroy
     end
-    merged_problem.cache_notice_attributes
+    merged_problem.reset_cached_attributes
     merged_problem
   end
+  def merged?
+    errs.length > 1
+  end
+  def unmerge!
+    [self] + errs[1..-1].map(&:id).map do |err_id|
+      err = Err.find(err_id)
+      app.problems.create.tap do |new_problem|
+        err.update_attribute(:problem_id, new_problem.id)
+        new_problem.reset_cached_attributes
+      end
+    end
+  end
+  
+  
+  
+  def reset_cached_attributes
+    update_attribute(:notices_count, notices.count)
+    cache_notice_attributes
+  end
   def cache_notice_attributes(notice=nil)
     notice ||= notices.first
@@ -35,6 +35,7 @@
   .tab-bar
     %ul
       %li= submit_tag 'Merge', :id => 'merge_errs', :class => 'button', 'data-action' => merge_several_errs_path
+      %li= submit_tag 'Unmerge', :id => 'unmerge_errs', :class => 'button', 'data-action' => unmerge_several_errs_path
       %li= submit_tag 'Resolve', :id => 'resolve_errs', :class => 'button', 'data-action' => resolve_several_errs_path
       %li= submit_tag 'Unresolve', :id => 'unresolve_errs', :class => 'button', 'data-action' => unresolve_several_errs_path
       %li= submit_tag 'Delete', :id => 'delete_errs', :class => 'button', 'data-action' => destroy_several_errs_path
@@ -15,6 +15,7 @@ Errbit::Application.routes.draw do
       post :resolve_several
       post :unresolve_several
       post :merge_several
+      post :unmerge_several
       get :all
     end
   end
@@ -441,6 +441,17 @@ describe ErrsController do
       end
     end
+    context "POST /errs/unmerge_several" do
+      it "should unmerge a merged problem" do
+        merged_problem = Problem.merge!(@problem1, @problem2)
+        merged_problem.errs.length.should == 2
+        lambda {
+          post :unmerge_several, :problems => [merged_problem.id.to_s]
+          merged_problem.reload.errs.length.should == 1
+        }.should change(Problem, :count).by(1)
+      end
+    end
+    
     context "POST /errs/resolve_several" do
       it "should resolve the issue" do
         post :resolve_several, :problems => [@problem2.id.to_s]
@@ -78,7 +78,7 @@ describe Problem do
   end
-  context "#merge!" do
+  context ".merge!" do
     it "collects the Errs from several problems into one and deletes the other problems" do
       problem1 = Factory(:err).problem
       problem2 = Factory(:err).problem
@@ -93,6 +93,22 @@ describe Problem do
   end
+  context "#unmerge!" do
+    it "creates a separate problem for each err" do
+      problem1 = Factory(:notice).problem
+      problem2 = Factory(:notice).problem
+      merged_problem = Problem.merge!(problem1, problem2)
+      merged_problem.errs.length.should == 2
+      
+      lambda {
+        problems = merged_problem.unmerge!
+        problems.length.should == 2
+        merged_problem.errs(true).length.should == 1
+      }.should change(Problem, :count).by(1)
+    end
+  end
+  
+  
   context "Scopes" do
     context "resolved" do
       it 'only finds resolved Problems' do
	@@ -441,6 +441,17 @@ describe ErrsController do		@@ -441,6 +441,17 @@ describe ErrsController do
441	end	441	end
442	end	442	end
443		443
		444	+ context "POST /errs/unmerge_several" do
		445	+ it "should unmerge a merged problem" do
		446	+ merged_problem = Problem.merge!(@problem1, @problem2)
		447	+ merged_problem.errs.length.should == 2
		448	+ lambda {
		449	+ post :unmerge_several, :problems => [merged_problem.id.to_s]
		450	+ merged_problem.reload.errs.length.should == 1
		451	+ }.should change(Problem, :count).by(1)
		452	+ end
		453	+ end
		454	+
444	context "POST /errs/resolve_several" do	455	context "POST /errs/resolve_several" do
445	it "should resolve the issue" do	456	it "should resolve the issue" do
446	post :resolve_several, :problems => [@problem2.id.to_s]	457	post :resolve_several, :problems => [@problem2.id.to_s]
	@@ -78,7 +78,7 @@ describe Problem do		@@ -78,7 +78,7 @@ describe Problem do
78	end	78	end
79		79
80		80
81	- context "#merge!" do	81	+ context ".merge!" do
82	it "collects the Errs from several problems into one and deletes the other problems" do	82	it "collects the Errs from several problems into one and deletes the other problems" do
83	problem1 = Factory(:err).problem	83	problem1 = Factory(:err).problem
84	problem2 = Factory(:err).problem	84	problem2 = Factory(:err).problem
	@@ -93,6 +93,22 @@ describe Problem do		@@ -93,6 +93,22 @@ describe Problem do
93	end	93	end
94		94
95		95
		96	+ context "#unmerge!" do
		97	+ it "creates a separate problem for each err" do
		98	+ problem1 = Factory(:notice).problem
		99	+ problem2 = Factory(:notice).problem
		100	+ merged_problem = Problem.merge!(problem1, problem2)
		101	+ merged_problem.errs.length.should == 2
		102	+
		103	+ lambda {
		104	+ problems = merged_problem.unmerge!
		105	+ problems.length.should == 2
		106	+ merged_problem.errs(true).length.should == 1
		107	+ }.should change(Problem, :count).by(1)
		108	+ end
		109	+ end
		110	+
		111	+
96	context "Scopes" do	112	context "Scopes" do
97	context "resolved" do	113	context "resolved" do
98	it 'only finds resolved Problems' do	114	it 'only finds resolved Problems' do