lib/foreman_tasks/dynflow/persistence.rb in foreman-tasks-0.7.17 vs lib/foreman_tasks/dynflow/persistence.rb in foreman-tasks-0.7.18

@@ -29,14 +29,12 @@
         task.start_at ||= Time.now
         task.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.where(:external_id => execution_plan_id).first
-        task.update_from_dynflow(data.merge(:start_at => delayed_plan.start_at,
-                                            :start_before => delayed_plan.start_before))
+        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.where(:external_id => execution_plan_id).first
         task.update_from_dynflow(data)
         Lock.owner!(::User.current, task.id) if ::User.current
       else