Merge pull request #21 from grayloon/remove-old-links

Remove Old Links; Cleanup

Author: ahinkle

src/Jobs/WaitForLinkedProductSku.php

@@ -8,6 +8,7 @@
 use Grayloon\MagentoStorage\Support\MagentoProducts;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -31,30 +32,22 @@ class WaitForLinkedProductSku implements ShouldQueue
     public $response = [];
 
     /**
-     * The current number of attempts we have tried to check if the product exists.
+     * The number of times the job may be attempted.
      *
      * @var int
      */
-    public $attempts = 1;
-
-    /**
-     * The maximum number of attempts to stop.
-     *
-     * @var int
-     */
-    protected $maxAttempts = 3;
+    public $tries = 3;
 
     /**
      * Create a new job instance.
      *
      * @param  \Grayloon\Magento\Models\MagentoProduct  $product
      * @return void
      */
-    public function __construct(MagentoProduct $product, $response, $attempts = 1)
+    public function __construct(MagentoProduct $product, $response)
     {
         $this->product = $product;
         $this->response = $response;
-        $this->attempts = $attempts;
     }
 
     /**
@@ -67,12 +60,7 @@ public function handle()
         $checkSku = MagentoProduct::where('sku', $this->response['linked_product_sku'])->first();
 
         if (! $checkSku) {
-            if ($this->attempts >= $this->maxAttempts) {
-                throw new Exception('Failed to find a product id with the Sku '.$this->response['linked_product_sku'].
-                    ' to link with product id '.$this->product->id.' after '.$this->attempts.' attempts.');
-            }
-
-            return $this->dispatch($this->product, $this->response, $this->attempts++);
+            throw new ModelNotFoundException("Failed to find a find product {$this->response['linked_product_sku']} to link with product {$this->product->sku}");
         }
 
         (new MagentoProducts())->updateProductLink($this->response, $this->product);

src/Support/HasProductLinks.php

@@ -17,6 +17,9 @@ trait HasProductLinks
      */
     protected function syncProductLinks($links, $product)
     {
+        MagentoProductLink::where('product_id', $product->id)
+            ->delete();
+
         foreach ($links as $link) {
             $this->updateProductLink($link, $product);
         }
@@ -39,13 +42,12 @@ public function updateProductLink($link, $product)
             return WaitForLinkedProductSku::dispatch($product, $link);
         }
 
-        MagentoProductLink::updateOrCreate([
+        MagentoProductLink::create([
             'product_id'         => $product->id,
             'related_product_id' => $productLink->id,
-        ], [
-            'link_type'   => $link['link_type'],
-            'position'    => $link['position'],
-            'synced_at'   => now(),
+            'link_type'          => $link['link_type'],
+            'position'           => $link['position'],
+            'synced_at'          => now(),
         ]);
     }
 }

tests/Support/HasProductLinkTest.php

@@ -91,6 +91,21 @@ public function test_can_process_empty_links_response()
 
         $this->assertEquals(0, MagentoProductLink::count());
     }
+
+    /** @test */
+    public function it_removes_old_product_links()
+    {
+        $product = MagentoProductFactory::new()->create([
+            'id' => 5,
+        ]);
+        $link = MagentoProductLinkFactory::new()->create([
+            'product_id' => $product->id,
+        ]);
+
+        (new FakeProductLinksSupportingTest)->exposedSyncProductLinks([], $product);
+
+        $this->assertEquals(0, MagentoProductLink::count());
+    }
 }
 
 class FakeProductLinksSupportingTest