10671: Changed default assigments to be before validation. Also make sure started_at...

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index dada5d6836249955a9d4b7c1dbe5f987b890dcee..f84c4a310fd19904f4f5f85cdbea23a4c0b83770 100644 (file)
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -10,9 +10,9 @@ class PipelineInstance < ArvadosModel
   before_validation :bootstrap_components
   before_validation :update_state
   before_validation :verify_status
+  before_validation :update_timestamps_when_state_changes
   before_create :set_state_before_save
   before_save :set_state_before_save
-  before_save :update_timestamps_when_state_changes
 
   api_accessible :user, extend: :common do |t|
     t.add :pipeline_template_uuid
@@ -144,7 +144,9 @@ class PipelineInstance < ArvadosModel
     when RunningOnServer, RunningOnClient
       self.started_at ||= db_current_time
     when Failed, Complete
-      self.finished_at ||= db_current_time
+      current_time = db_current_time
+      self.started_at ||= current_time
+      self.finished_at ||= current_time
     end
   end