From 270c9034c1b023817e59891960a1f0b4c381940e Mon Sep 17 00:00:00 2001
From: yurdm <yd@atrocore.com>
Date: Mon, 20 Jul 2026 18:21:13 +0300
Subject: [PATCH] Fix immediate run of HTTP import triggered via dynamic action

---
 app/Jobs/ImportTypeHttp.php           |  2 +-
 app/Jobs/ImportTypeHttpJobCreator.php | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ImportTypeHttp.php b/app/Jobs/ImportTypeHttp.php
index 9321110..3f45cec 100644
--- a/app/Jobs/ImportTypeHttp.php
+++ b/app/Jobs/ImportTypeHttp.php
@@ -45,7 +45,7 @@ public function runImport(ImportFeed $importFeed, string $attachmentId, \stdClas
         ];
 
         if (!empty($payload) && !empty($payload->executeNow)) {
-            $this->getImportTypeHttpJobCreator()->run($jobData);
+            $this->getImportTypeHttpJobCreator()->runNow($jobData);
         } else {
             $job = $this->getEntityManager()->getEntity('Job');
             $job->set([
diff --git a/app/Jobs/ImportTypeHttpJobCreator.php b/app/Jobs/ImportTypeHttpJobCreator.php
index 8432018..c62f519 100644
--- a/app/Jobs/ImportTypeHttpJobCreator.php
+++ b/app/Jobs/ImportTypeHttpJobCreator.php
@@ -34,13 +34,18 @@ class ImportTypeHttpJobCreator extends AbstractJob implements JobInterface
     protected ?string $importJobCreatorId = null;
 
     public function run(Job $job): void
+    {
+        $this->runNow($job->getPayload(), $job);
+    }
+
+    public function runNow(array $data, ?Job $job = null): void
     {
         $GLOBALS['skipAssignmentNotifications'] = true;
         $GLOBALS['skipHooks'] = true;
 
-        $this->importJobCreatorId = $job->get('id');
-
-        $data = $job->getPayload();
+        if (!empty($job)) {
+            $this->importJobCreatorId = $job->get('id');
+        }
 
         if (empty($data['importFeedId'])) {
             throw new BadRequest('ImportFeedId is required.');