From 67d57cb02a5ef482e638bbfc0782d337f3882929 Mon Sep 17 00:00:00 2001
From: Jorge Manrubia <jorge@hey.com>
Date: Fri, 26 Sep 2025 11:33:47 +0200
Subject: [PATCH] Make sure column-related methods keep things consistent

---
 app/models/card/postponable.rb       |  6 ------
 app/models/card/triageable.rb        | 13 +++++++++++--
 test/models/card/postponable_test.rb |  4 ----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/models/card/postponable.rb b/app/models/card/postponable.rb
index a22dc3704..7646ee03e 100644
--- a/app/models/card/postponable.rb
+++ b/app/models/card/postponable.rb
@@ -26,10 +26,4 @@ module Card::Postponable
       end
     end
   end
-
-  def resume
-    if postponed?
-      not_now.destroy
-    end
-  end
 end
diff --git a/app/models/card/triageable.rb b/app/models/card/triageable.rb
index 8506ecd1b..a0bae3b0e 100644
--- a/app/models/card/triageable.rb
+++ b/app/models/card/triageable.rb
@@ -18,10 +18,19 @@ module Card::Triageable
 
   def triage_into(column)
     raise "The column must belong to the card collection" unless collection == column.collection
-    update! column: column
+
+    transaction do
+      reopen
+      activity_spike&.destroy
+      update! column: column
+    end
   end
 
   def send_back_to_triage
-    update!(column: nil)
+    transaction do
+      reopen
+      activity_spike&.destroy
+      update!(column: nil)
+    end
   end
 end
diff --git a/test/models/card/postponable_test.rb b/test/models/card/postponable_test.rb
index 0a1d261f2..734eab90d 100644
--- a/test/models/card/postponable_test.rb
+++ b/test/models/card/postponable_test.rb
@@ -22,10 +22,6 @@ class Card::PostponableTest < ActiveSupport::TestCase
     assert_changes -> { card.reload.postponed? }, to: true do
       card.postpone
     end
-
-    assert_changes -> { card.reload.postponed? }, to: false do
-      card.resume
-    end
   end
 
   test "scopes" do