FFWEB-3032: Support MSI - checking all inventory sources for export

Support MSI - checking all inventory sources during export feed
FACT-Finder-Web-Components · Apr 17, 2024 · d8bc14d · d8bc14d
1 parent de9fc6c
commit d8bc14d
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
+## Unreleased
+### Fix
+- Support MSI - checking all inventory sources during export feed
+- Fix feed path for UI export type
+
 ## [v4.3.2] - 2024.04.12
 ### Fix
 - Handle export problem for Multi Source Inventory module

diff --git a/composer.json b/composer.json
@@ -17,6 +17,7 @@
     "magento/module-configurable-product": "~100.4.4",
     "magento/module-directory": "~100.4.4",
     "magento/module-store": "~101.1.4",
+    "magento/module-inventory": "1.2.*",
     "mustache/mustache": "^2.13",
     "ext-json": "*"
   },

diff --git a/src/Controller/Adminhtml/Export/Feed.php b/src/Controller/Adminhtml/Export/Feed.php
@@ -90,7 +90,7 @@ public function execute()
                 $path     = $this->feedFileService->getExportPath($filename);
 
                 $this->feedGeneratorFactory->create($this->feedType)->generate($stream);
-                $messages[] = __('<li>Feed file for channel %1 has been generated under %2</li>', $channel, "$path/$filename");
+                $messages[] = __('<li>Feed file for channel %1 has been generated under %2</li>', $channel, $path);
 
                 try {
                     $this->ftpUploader->upload($filename, $stream);

diff --git a/src/Model/Export/Catalog/Entity/ProductVariation.php b/src/Model/Export/Catalog/Entity/ProductVariation.php
@@ -5,7 +5,7 @@
 namespace Omikron\Factfinder\Model\Export\Catalog\Entity;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository as StockItem;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Api\Export\ExportEntityInterface;
 use Omikron\Factfinder\Api\Export\FieldInterface;
 use Omikron\Factfinder\Model\Export\Catalog\FieldProvider;
@@ -20,22 +20,22 @@ class ProductVariation implements ExportEntityInterface
 
     /** @var string[] */
     private array $configurableData;
-    private StockItem $stockItem;
+    private GetSourceItemsBySku $getSourceItemsBySku;
 
     public function __construct(
         Product $product,
         Product $configurable,
         NumberFormatter $numberFormatter,
         FieldProvider $variantFieldProvider,
-        StockItem $stockItem,
+        GetSourceItemsBySku $getSourceItemsBySku,
         array $data = []
     ) {
         $this->product          = $product;
         $this->configurable     = $configurable;
         $this->numberFormatter  = $numberFormatter;
         $this->configurableData = $data;
         $this->fieldprovider    = $variantFieldProvider;
-        $this->stockItem = $stockItem;
+        $this->getSourceItemsBySku = $getSourceItemsBySku;
     }
 
     public function getId(): int
@@ -91,12 +91,14 @@ private function getAvailability(): bool
             return $this->product->isAvailable();
         }
 
-        try {
-            $quantity = $this->stockItem->get($this->product->getId());
+        $sourceItems = $this->getSourceItemsBySku->execute($this->product->getSku());
 
-            return (bool) $quantity->getIsInStock();
-        } catch (\Exception $e) {
-            return $this->product->isAvailable();
+        foreach ($sourceItems as $sourceItem) {
+            if ($sourceItem->getStatus()) {
+                return true;
+            }
         }
+
+        return false;
     }
 }
diff --git a/src/Model/Export/Catalog/ProductType/BundleDataProvider.php b/src/Model/Export/Catalog/ProductType/BundleDataProvider.php
@@ -6,8 +6,8 @@
 
 use Magento\Bundle\Model\Product\CatalogPrice;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository as StockItem;
 use Magento\Directory\Model\PriceCurrency;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Model\Formatter\NumberFormatter;
 
 class BundleDataProvider extends SimpleDataProvider
@@ -17,10 +17,10 @@ public function __construct(
         protected NumberFormatter $numberFormatter,
         private readonly PriceCurrency     $priceCurrency,
         private readonly CatalogPrice      $priceModel,
-        StockItem $stockItem,
+        protected GetSourceItemsBySku $getSourceItemsBySku,
         protected array             $productFields = []
     ) {
-        parent::__construct($product, $numberFormatter, $stockItem, $productFields);
+        parent::__construct($product, $numberFormatter, $getSourceItemsBySku, $productFields);
     }
 
     public function toArray(): array

diff --git a/src/Model/Export/Catalog/ProductType/ConfigurableDataProvider.php b/src/Model/Export/Catalog/ProductType/ConfigurableDataProvider.php
@@ -7,9 +7,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository as StockItem;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Api\Export\ExportEntityInterface;
 use Omikron\Factfinder\Api\Filter\FilterInterface;
 use Omikron\Factfinder\Model\Export\Catalog\Entity\ProductVariationFactory;
@@ -25,10 +25,10 @@ public function __construct(
         private readonly ProductVariationFactory    $variationFactory,
         private readonly ProductRepositoryInterface $productRepository,
         private readonly SearchCriteriaBuilder      $builder,
-        StockItem $stockItem,
+        protected GetSourceItemsBySku $getSourceItemsBySku,
         protected array                    $productFields = []
     ) {
-        parent::__construct($product, $numberFormatter, $stockItem, $productFields);
+        parent::__construct($product, $numberFormatter, $getSourceItemsBySku, $productFields);
     }
 
     public function getEntities(): iterable

diff --git a/src/Model/Export/Catalog/ProductType/SimpleDataProvider.php b/src/Model/Export/Catalog/ProductType/SimpleDataProvider.php
@@ -5,7 +5,7 @@
 namespace Omikron\Factfinder\Model\Export\Catalog\ProductType;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository as StockItem;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Api\Export\FieldInterface;
 use Omikron\Factfinder\Api\Export\DataProviderInterface;
 use Omikron\Factfinder\Api\Export\ExportEntityInterface;
@@ -16,7 +16,7 @@ class SimpleDataProvider implements DataProviderInterface, ExportEntityInterface
     public function __construct(
         protected Product $product,
         protected NumberFormatter $numberFormatter,
-        protected StockItem $stockItem,
+        protected GetSourceItemsBySku $getSourceItemsBySku,
         protected array $productFields = [],
     ) {
     }
@@ -70,12 +70,14 @@ private function getAvailability(): bool
             return $this->product->isAvailable();
         }
 
-        try {
-            $quantity = $this->stockItem->get($this->product->getId());
+        $sourceItems = $this->getSourceItemsBySku->execute($this->product->getSku());
 
-            return (bool) $quantity->getIsInStock();
-        } catch (\Exception $e) {
-            return $this->product->isAvailable();
+        foreach ($sourceItems as $sourceItem) {
+            if ($sourceItem->getStatus()) {
+                return true;
+            }
         }
+
+        return false;
     }
 }
diff --git a/src/Test/Unit/Model/Export/Catalog/Entity/ProductVariationTest.php b/src/Test/Unit/Model/Export/Catalog/Entity/ProductVariationTest.php
@@ -5,9 +5,9 @@
 namespace Omikron\Factfinder\Model\Export\Catalog\Entity;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Inventory\Model\SourceItem;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Model\Export\Catalog\FieldProvider;
 use Omikron\Factfinder\Model\Export\Catalog\ProductField\FilterAttributes;
 use Omikron\Factfinder\Model\Export\Catalog\ProductField\ProductImage;
@@ -53,11 +53,8 @@ public function test_variant_data_will_override_the_parent()
             $this->createMock(Product::class),
             new NumberFormatter(),
             $fieldProviderMock,
-            $this->createConfiguredMock(StockItemRepository::class, [
-                'get' => $this->createConfiguredMock(
-                    StockItemInterface::class, [
-                        'getIsInStock' => true
-                ])
+            $this->createConfiguredMock(GetSourceItemsBySku::class, [
+                'execute' => [$this->createConfiguredMock(SourceItem::class, ['getStatus' => 1])]
             ]),
             $this->configurableProductData
         );
@@ -97,11 +94,8 @@ public function test_configurable_attributes_should_be_merged_with_filter_attrib
             $this->createMock(Product::class),
             new NumberFormatter(),
             $fieldProviderMock,
-            $this->createConfiguredMock(StockItemRepository::class, [
-                'get' => $this->createConfiguredMock(
-                    StockItemInterface::class, [
-                    'getIsInStock' => true
-                ])
+            $this->createConfiguredMock(GetSourceItemsBySku::class, [
+                'execute' => [$this->createConfiguredMock(SourceItem::class, ['getStatus' => 1])]
             ]),
             ['FilterAttributes' => '|Color=Red|Size=XS|'] + $this->configurableProductData
         );

diff --git a/src/Test/Unit/Model/Export/Catalog/ProductType/ConfigurableDataProviderTest.php b/src/Test/Unit/Model/Export/Catalog/ProductType/ConfigurableDataProviderTest.php
@@ -6,10 +6,10 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
-use Magento\CatalogInventory\Model\Stock\StockItemRepository;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Inventory\Model\SourceItem;
+use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySku;
 use Omikron\Factfinder\Api\Filter\FilterInterface;
 use Omikron\Factfinder\Model\Export\Catalog\Entity\ProductVariationFactory;
 use Omikron\Factfinder\Model\Formatter\NumberFormatter;
@@ -114,11 +114,8 @@ protected function setUp(): void
             $this->variantFactoryMock,
             $this->repositoryMock,
             $this->builderMock,
-            $this->createConfiguredMock(StockItemRepository::class, [
-                'get' => $this->createConfiguredMock(
-                    StockItemInterface::class, [
-                    'getIsInStock' => true
-                ])
+            $this->createConfiguredMock(GetSourceItemsBySku::class, [
+                'execute' => [$this->createConfiguredMock(SourceItem::class, ['getStatus' => 1])]
             ]),
         );
     }