Dont update counts when hard-destroying discarded records.

nisanthchunduru · Nov 6, 2018 · 55717cc · 55717cc
1 parent 6c62075
commit 55717cc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/lib/counter_culture/extensions.rb b/lib/counter_culture/extensions.rb
@@ -23,6 +23,8 @@ def counter_culture(relation, options = {})
           before_destroy :_update_counts_after_destroy, if: -> (model) do
             if model.respond_to?(:paranoia_destroyed?)
               !model.paranoia_destroyed?
+            elsif defined?(Discard::Model) && model.class.include?(Discard::Model)
+              !model.discarded?
             else
               true
             end

diff --git a/spec/counter_culture_spec.rb b/spec/counter_culture_spec.rb
@@ -1784,6 +1784,35 @@
       sd.undiscard
       expect(company.reload.soft_delete_discards_count).to eq(1)
     end
+
+    describe "when calling hard-destroy" do
+      it "does not run destroy callback for discarded records" do
+        skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+        company = Company.create!
+        sd = SoftDeleteDiscard.create!(company_id: company.id)
+
+        expect(company.reload.soft_delete_discards_count).to eq(1)
+
+        sd.discard
+        expect(company.reload.soft_delete_discards_count).to eq(0)
+
+        sd.destroy
+        expect(company.reload.soft_delete_discards_count).to eq(0)
+      end
+
+      it "runs destroy callback for undiscarded records" do
+        skip("Unsupported in this version of Rails") if Rails.version < "4.2.0"
+
+        company = Company.create!
+        sd = SoftDeleteDiscard.create!(company_id: company.id)
+
+        expect(company.reload.soft_delete_discards_count).to eq(1)
+
+        sd.destroy
+        expect(company.reload.soft_delete_discards_count).to eq(0)
+      end
+    end
   end
 
   describe "when using paranoia for soft deletes" do