Merge pull request #10 from Strategery-Inc/v/stockbase-item-check-imp…

…rovements Stockbase product check fool-proof and small refactorings
Stockbase-Connect · Nov 26, 2018 · 9a4ef29 · 9a4ef29
2 parents f8a83a6 + 07188f7
commit 9a4ef29
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 33 deletions.
diff --git a/Helper/Images.php b/Helper/Images.php
@@ -80,8 +80,7 @@ public function __construct(
     /**
      * Saves images array from stockbase for given $ean
      *
-     * @param array $images
-     *
+     * @param array           $images
      * @param StockbaseClient $client
      * @return bool
      */

diff --git a/Model/Inventory/StockbaseStockManagement.php b/Model/Inventory/StockbaseStockManagement.php
@@ -3,8 +3,10 @@
 
 namespace Stockbase\Integration\Model\Inventory;
 
-use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Stockbase\Integration\Model\Config\StockbaseConfiguration;
@@ -26,9 +28,9 @@ class StockbaseStockManagement
      */
     private $config;
     /**
-     * @var ProductFactory
+     * @var ProductRepositoryInterface
      */
-    private $productFactory;
+    private $productRepository;
     /**
      * @var StockItemResource
      */
@@ -40,23 +42,23 @@ class StockbaseStockManagement
 
     /**
      * StockbaseStockManagement constructor.
-     * @param StockRegistryInterface $stockRegistry
-     * @param StockbaseConfiguration $config
-     * @param ProductFactory         $productFactory
-     * @param StockItemResource      $stockItemResource
-     * @param ObjectManagerInterface $objectManager
+     * @param StockRegistryInterface     $stockRegistry
+     * @param StockbaseConfiguration     $config
+     * @param ProductRepositoryInterface $productRepository
+     * @param StockItemResource          $stockItemResource
+     * @param ObjectManagerInterface     $objectManager
      */
     public function __construct(
         StockRegistryInterface $stockRegistry,
         StockbaseConfiguration $config,
-        ProductFactory $productFactory,
+        ProductRepositoryInterface $productRepository,
         StockItemResource $stockItemResource,
         ObjectManagerInterface $objectManager
     ) {
 
         $this->stockRegistry = $stockRegistry;
         $this->config = $config;
-        $this->productFactory = $productFactory;
+        $this->productRepository = $productRepository;
         $this->stockItemResource = $stockItemResource;
         $this->objectManager = $objectManager;
     }
@@ -87,17 +89,24 @@ public function getStockbaseStockAmount($productId)
      */
     public function getStockbaseEan($productId)
     {
-        $stockItem = $this->stockRegistry->getStockItem($productId);
-        if ($this->config->isModuleEnabled() &&
-            $stockItem->getManageStock() &&
-            $stockItem->getBackorders() == \Magento\CatalogInventory\Model\Stock::BACKORDERS_NO
-        ) {
-            $product = $this->productFactory->create();
-            $product->load($productId);
-            $ean = $product->getData($this->config->getEanFieldName());
-
-            if ($product->getData('stockbase_product') && !empty($ean)) {
-                return $ean;
+        if ($this->config->isModuleEnabled()) {
+            $stockItem = $this->stockRegistry->getStockItem($productId);
+            if ($stockItem->getManageStock() &&
+                $stockItem->getBackorders() == \Magento\CatalogInventory\Model\Stock::BACKORDERS_NO
+            ) {
+                try {
+                    /** @var Product $product */
+                    $product = $this->productRepository->getById($productId);
+
+                    if (!$product->isComposite() && !$product->isVirtual()) {
+                        $ean = $product->getData($this->config->getEanFieldName());
+                        if (!empty($ean) && $product->getData('stockbase_product')) {
+                            return $ean;
+                        }
+                    }
+                } catch (NoSuchEntityException $e) {
+                    return null;
+                }
             }
         }
 

diff --git a/StockbaseApi/Client/StockbaseClient.php b/StockbaseApi/Client/StockbaseClient.php
@@ -83,8 +83,9 @@ public function getImages(array $eans)
     /**
      * Downloads a file using current client configuration and saves it at the specified destination.
      *
-     * @param string|\GuzzleHttp\Url $uri File URI.
+     * @param string|\GuzzleHttp\Url                             $uri         File URI.
      * @param string|resource|\GuzzleHttp\Stream\StreamInterface $destination Destination where the file should be saved to.
+     * @return null
      */
     public function downloadImage($uri, $destination)
     {

diff --git a/Test/Unit/Model/Inventory/StockbaseStockManagementTest.php b/Test/Unit/Model/Inventory/StockbaseStockManagementTest.php
@@ -3,7 +3,7 @@
 
 namespace Stockbase\Integration\Test\Unit\Model\Inventory;
 
-use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
@@ -27,8 +27,8 @@ class StockbaseStockManagementTest extends TestCase
     /** @var StockbaseConfiguration|\PHPUnit_Framework_MockObject_MockObject */
     private $config;
 
-    /** @var ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
-    private $productFactory;
+    /** @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $productRepository;
 
     /** @var StockItemResource|\PHPUnit_Framework_MockObject_MockObject */
     private $stockItemResource;
@@ -55,10 +55,7 @@ public function setUp()
 
         $this->product = $this->createMock(\Magento\Catalog\Model\Product::class);
 
-        $this->productFactory = $this->getMockBuilder('\Magento\Catalog\Model\ProductFactory')
-            ->setMethods(['create'])
-            ->getMock();
-        $this->productFactory->method('create')->willReturn($this->product);
+        $this->productRepository = $this->createMock(ProductRepositoryInterface::class);
 
         $this->stockItemResource = $this->createMock(StockItemResource::class);
 
@@ -246,7 +243,7 @@ protected function createModel()
         return new StockbaseStockManagement(
             $this->stockRegistry,
             $this->config,
-            $this->productFactory,
+            $this->productRepository,
             $this->stockItemResource,
             $this->objectManager
         );
@@ -262,7 +259,9 @@ protected function configureStockbaseEan($productId, $ean)
         $this->stockItem->expects($this->once())->method('getBackorders')
             ->willReturn(\Magento\CatalogInventory\Model\Stock::BACKORDERS_NO);
 
-        $this->product->expects($this->once())->method('load')->with($productId);
+        $this->productRepository->expects($this->once())->method('getById')->with($productId)
+            ->willReturn($this->product);
+
         $this->product->expects(new MethodInvokedAtIndex(0))->method('getData')->with('ean')->willReturn($ean);
         $this->product->expects(new MethodInvokedAtIndex(1))->method('getData')->with('stockbase_product')
             ->willReturn(true);