persistence.rb in foreman-tasks-0.7.4

- old
+ new
@@ -11,24 +11,35 @@
       clear_connections = ActiveRecord::Base.connection.open_transactions == 0
       super.tap do
         begin
           on_execution_plan_save(execution_plan_id, value)
         rescue => e
-          Foreman::Logging.exception("Error on on_execution_plan_save event", e, :logger => Foreman::Logging.logger('foreman-tasks/dynflow'))
+          Foreman::Logging.exception("Error on on_execution_plan_save event", e, :logger => 'foreman-tasks/dynflow')
         end
       end
     ensure
       ::ActiveRecord::Base.clear_active_connections! if clear_connections
     end
 
     def on_execution_plan_save(execution_plan_id, data)
       # We can load the data unless the execution plan was properly planned and saved
       # including its steps
-      if data[:state] == :planning
-        task = ::ForemanTasks::Task::DynflowTask.new
+      case data[:state]
+      when :pending
+        ForemanTasks::Task::DynflowTask.new_for_execution_plan(execution_plan_id, data).save!
+      when :scheduled
+        delayed_plan = load_delayed_plan(execution_plan_id)
+        raise Foreman::Exception.new('Plan is delayed but the delay record is missing') if delayed_plan.nil?
+        # TODO: Rework this
+        delayed_plan = ::Dynflow::DelayedPlan.new_from_hash(ForemanTasks.dynflow.world, delayed_plan)
+        task = ::ForemanTasks::Task::DynflowTask.find_by_external_id(execution_plan_id)
+        task.update_from_dynflow(data.merge(:start_at => delayed_plan.start_at,
+                                            :start_before => delayed_plan.start_before))
+      when :planning
+        task = ::ForemanTasks::Task::DynflowTask.find_by_external_id(execution_plan_id)
         task.update_from_dynflow(data)
         Lock.owner!(::User.current, task.id) if ::User.current
-      elsif data[:state] != :pending
+      else
         if task = ::ForemanTasks::Task::DynflowTask.find_by_external_id(execution_plan_id)
           unless task.state.to_s == data[:state].to_s
             task.update_from_dynflow(data)
           end
         end