Merge pull request #2212 from bakaphp/disable-workflow-import

[Fix] Workflow Trigger Fix
bakaphp · Oct 18, 2024 · bcbe1cf · bcbe1cf
2 parents 44faac4 + 05985c5
commit bcbe1cf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/Domains/Connectors/Shopify/Jobs/ProcessShopifyProductWebhookJob.php b/src/Domains/Connectors/Shopify/Jobs/ProcessShopifyProductWebhookJob.php
@@ -38,12 +38,13 @@ public function execute(): array
         $jobUuid = Str::uuid()->toString();
 
         ProductImporterJob::dispatch(
-            $jobUuid,
-            [$mappedProduct],
-            $integrationCompany->company->branch,
-            $this->receiver->user,
-            $integrationCompany->region,
-            $this->receiver->app
+            jobUuid: $jobUuid,
+            importer: [$mappedProduct],
+            branch: $integrationCompany->company->branch,
+            user: $this->receiver->user,
+            region: $integrationCompany->region,
+            app: $this->receiver->app,
+            runWorkflow: false
         );
 
         return [

diff --git a/src/Domains/Inventory/Importer/Actions/ProductImporterAction.php b/src/Domains/Inventory/Importer/Actions/ProductImporterAction.php
@@ -52,7 +52,8 @@ public function __construct(
         public Companies $company,
         public UserInterface $user,
         public Regions $region,
-        public ?AppInterface $app = null
+        public ?AppInterface $app = null,
+        public bool $runWorkflow = true
     ) {
         $this->app = $this->app ?? app(Apps::class);
     }
@@ -81,7 +82,9 @@ public function execute(): ProductsModel
                 'is_published' => $this->importedProduct->isPublished,
                 'attributes' => $this->importedProduct->attributes,
             ]);
-            $this->product = (new CreateProductAction($productDto, $this->user))->execute();
+            $createAction = new CreateProductAction($productDto, $this->user);
+            $createAction->setRunWorkflow($this->runWorkflow);
+            $this->product = $createAction->execute();
 
             if (isset($this->importedProduct->customFields) && ! empty($this->importedProduct->customFields)) {
                 $this->product->setAllCustomFields($this->importedProduct->customFields);

diff --git a/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php b/src/Domains/Inventory/Importer/Jobs/ProductImporterJob.php
@@ -52,7 +52,8 @@ public function __construct(
         public UserInterface $user,
         public Regions $region,
         public AppInterface $app,
-        public ?FilesystemImports $filesystemImport = null
+        public ?FilesystemImports $filesystemImport = null,
+        public bool $runWorkflow = true
     ) {
         $minuteDelay = (int)($app->get('delay_minute_job') ?? 0);
         $queue = $this->onQueue('imports');
@@ -129,7 +130,8 @@ public function handle()
                     $company,
                     $this->user,
                     $this->region,
-                    $this->app
+                    $this->app,
+                    $this->runWorkflow
                 ))->execute();
                 if ($product->wasRecentlyCreated) {
                     $created++;

diff --git a/src/Domains/Inventory/Products/Actions/CreateProductAction.php b/src/Domains/Inventory/Products/Actions/CreateProductAction.php
@@ -133,4 +133,10 @@ public function execute(): Products
 
         return $products;
     }
+
+    public function setRunWorkflow(bool $runWorkflow): self
+    {
+        $this->runWorkflow = $runWorkflow;
+        return $this;
+    }
 }