1 files changed, 17 insertions, 2 deletions
diff --git a/app/models/container_repository.rb b/app/models/container_repository.rb
index 7da4e31b472..db0fcd915b3 100644
--- a/app/models/container_repository.rb
+++ b/app/models/container_repository.rb
@@ -98,6 +98,8 @@ class ContainerRepository < ApplicationRecord
     )
   end
 
+  before_update :set_status_updated_at_to_now, if: :status_changed?
+
   state_machine :migration_state, initial: :default, use_transactions: false do
     state :pre_importing do
       validates :migration_pre_import_started_at, presence: true
@@ -521,11 +523,20 @@ class ContainerRepository < ApplicationRecord
   end
 
   def set_delete_ongoing_status
-    update_columns(status: :delete_ongoing, delete_started_at: Time.zone.now)
+    now = Time.zone.now
+    update_columns(
+      status: :delete_ongoing,
+      delete_started_at: now,
+      status_updated_at: now
+    )
   end
 
   def set_delete_scheduled_status
-    update_columns(status: :delete_scheduled, delete_started_at: nil)
+    update_columns(
+      status: :delete_scheduled,
+      delete_started_at: nil,
+      status_updated_at: Time.zone.now
+    )
   end
 
   def migration_in_active_state?
@@ -623,6 +634,10 @@ class ContainerRepository < ApplicationRecord
       tag
     end
   end
+
+  def set_status_updated_at_to_now
+    self.status_updated_at = Time.zone.now
+  end
 end
 
 ContainerRepository.prepend_mod_with('ContainerRepository')