Merge branch '8784-dir-listings'

[arvados.git] / services / api / app / models / job_task.rb

diff --git a/services/api/app/models/job_task.rb b/services/api/app/models/job_task.rb
index d7aa09157ca63cefaa235c7dfa42fe7d8f891556..a960186502c2b410fe7abbe6c477a35690150bae 100644 (file)
--- a/services/api/app/models/job_task.rb
+++ b/services/api/app/models/job_task.rb
@@ -1,14 +1,38 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class JobTask < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
+  serialize :parameters, Hash
+  before_create :set_default_qsequence
+  after_update :delete_created_job_tasks_if_failed
 
-  api_accessible :superuser, :extend => :common do |t|
+  api_accessible :user, extend: :common do |t|
     t.add :job_uuid
+    t.add :created_by_job_task_uuid
     t.add :sequence
+    t.add :qsequence
     t.add :parameters
     t.add :output
     t.add :progress
     t.add :success
+    t.add :started_at
+    t.add :finished_at
+  end
+
+  protected
+
+  def delete_created_job_tasks_if_failed
+    if self.success == false and self.success != self.success_was
+      JobTask.delete_all ['created_by_job_task_uuid = ?', self.uuid]
+    end
+  end
+
+  def set_default_qsequence
+    self.qsequence ||= self.class.connection.
+      select_value("SELECT nextval('job_tasks_qsequence_seq')")
   end
 end