Tidy up code a bit

app/models/card/engageable.rb

@@ -41,23 +41,13 @@ module Card::Engageable
 
   def engage
     unless doing?
-      transaction do
-        reopen
-        create_engagement!(status: "doing")
-      end
+      reengage(status: "doing")
     end
   end
 
   def move_to_on_deck
     unless on_deck?
-      transaction do
-        reopen
-        if engagement.present?
-          engagement.update!(status: "on_deck")
-        else
-          create_engagement!(status: "on_deck")
-        end
-      end
+      reengage(status: "on_deck")
     end
   end
 
@@ -69,4 +59,13 @@ module Card::Engageable
       touch_last_active_at
     end
   end
+
+  private
+    def reengage(status:)
+      transaction do
+        reopen
+        engagement&.destroy
+        create_engagement!(status:)
+      end
+    end
 end

test/models/card/entropic_test.rb

@@ -98,7 +98,7 @@ class Card::EntropicTest < ActiveSupport::TestCase
     assert_equal Time.current, cards(:logo).last_active_at
   end
 
-  test "auto_reconsider_all_stagnated" do
+  test "auto_reconsider_all_stagnated includes cards in doing and on_deck" do
     travel_to Time.current
 
     cards(:logo, :shipping).each(&:engage)