Merge pull request #26 from justbetter/feature/prevent-double-async-updates

Prevent async update if existing operation is not finished

Author: VincentBean

src/Actions/ProcessStocks.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Bus\PendingDispatch;
+use JustBetter\MagentoAsync\Enums\OperationStatus;
 use JustBetter\MagentoClient\Client\Magento;
 use JustBetter\MagentoStock\Contracts\ProcessesStocks;
 use JustBetter\MagentoStock\Jobs\Retrieval\RetrieveStockJob;
@@ -39,11 +40,16 @@ public function process(): void
                 ->whereHas('product', function (Builder $query): void {
                     $query->where('exists_in_magento', '=', true);
                 })
+                ->whereDoesntHave('bulkOperations', function (Builder $query): void {
+                    $query
+                        ->where('status', '=', OperationStatus::Open)
+                        ->orWhereNull('status');
+                })
                 ->select(['id', 'sku'])
                 ->take($repository->updateLimit())
                 ->get();
 
-            UpdateStockAsyncJob::dispatch($stocks);
+            UpdateStockAsyncJob::dispatchIf($stocks->isNotEmpty(), $stocks);
         } else {
             Stock::query()
                 ->where('sync', '=', true)

tests/Actions/ProcessStocksTest.php

@@ -3,7 +3,10 @@
 namespace JustBetter\MagentoStock\Tests\Actions;
 
 use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoAsync\Enums\OperationStatus;
+use JustBetter\MagentoAsync\Models\BulkRequest;
 use JustBetter\MagentoClient\Contracts\ChecksMagento;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
 use JustBetter\MagentoStock\Actions\ProcessStocks;
 use JustBetter\MagentoStock\Jobs\Retrieval\RetrieveStockJob;
 use JustBetter\MagentoStock\Jobs\Update\UpdateStockAsyncJob;
@@ -58,6 +61,11 @@ public function it_dispatches_async_update_job(): void
         Bus::fake();
         config()->set('magento-stock.async', true);
 
+        MagentoProduct::query()->create([
+            'sku' => '::sku::',
+            'exists_in_magento' => true,
+        ]);
+
         Stock::query()->create([
             'sku' => '::sku::',
             'update' => true,
@@ -70,6 +78,65 @@ public function it_dispatches_async_update_job(): void
         Bus::assertDispatched(UpdateStockAsyncJob::class);
     }
 
+    #[Test]
+    public function it_does_not_dispatch_stocks_with_open_async_operations(): void
+    {
+        Bus::fake();
+        config()->set('magento-stock.async', true);
+
+        MagentoProduct::query()->create([
+            'sku' => '::sku_1::',
+            'exists_in_magento' => true,
+        ]);
+
+        MagentoProduct::query()->create([
+            'sku' => '::sku_2::',
+            'exists_in_magento' => true,
+        ]);
+
+        /** @var Stock $stock */
+        $stock = Stock::query()->create([
+            'sku' => '::sku_1::',
+            'update' => true,
+        ]);
+
+        /** @var BulkRequest $request */
+        $request = BulkRequest::query()->create([
+            'magento_connection' => '::magento-connection::',
+            'store_code' => '::store-code::',
+            'method' => 'POST',
+            'path' => '::path::',
+            'bulk_uuid' => '::bulk-uuid-1::',
+            'request' => [
+                [
+                    'call-1',
+                ],
+            ],
+            'response' => [],
+            'created_at' => now(),
+        ]);
+
+        $request->operations()->create([
+            'operation_id' => 0,
+            'subject_type' => $stock->getMorphClass(),
+            'subject_id' => $stock->getKey(),
+            'status' => OperationStatus::Open,
+        ]);
+
+        Stock::query()->create([
+            'sku' => '::sku_2::',
+            'update' => true,
+        ]);
+
+        /** @var ProcessStocks $action */
+        $action = app(ProcessStocks::class);
+        $action->process();
+
+        Bus::assertDispatched(UpdateStockAsyncJob::class, function (UpdateStockAsyncJob $job): bool {
+            return $job->stocks->count() === 1 && $job->stocks->first()?->sku === '::sku_2::';
+        });
+    }
+
     #[Test]
     public function it_does_not_dispatch_update_jobs_if_magento_is_unavailable(): void
     {