Merge pull request #839 from magento-commerce/remove-dependency

Removed dependency on Meta_Catalog from Meta_Sales

Author: zlik

app/code/Meta/Conversion/composer.json

@@ -5,10 +5,13 @@
     "require": {
         "php": "~7.4||~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
+        "magento/module-bundle": "*",
         "magento/module-catalog": "*",
         "magento/module-configurable-product": "*",
         "magento/module-checkout": "*",
         "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-grouped-product": "*",
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-quote": "*",

app/code/Meta/Conversion/etc/module.xml

@@ -2,11 +2,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Meta_Conversion">
         <sequence>
+            <module name="Magento_Bundle"/>
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_Checkout"/>
             <module name="Magento_Customer"/>
             <module name="Magento_Directory"/>
+            <module name="Magento_GroupedProduct"/>
             <module name="Magento_Sales"/>
             <module name="Magento_Store"/>
             <module name="Magento_Quote"/>

app/code/Meta/Sales/Model/Mapper/OrderItemMapper.php

@@ -25,11 +25,11 @@
 use Magento\Catalog\Model\ProductRepository;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderItemInterfaceFactory;
 use Magento\Sales\Model\Order\Item as OrderItem;
 use Meta\BusinessExtension\Helper\GraphAPIAdapter;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
-use Meta\Catalog\Helper\Product\Identifier as ProductIdentifier;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -47,11 +47,6 @@ class OrderItemMapper
      */
     private GraphAPIAdapter $graphAPIAdapter;
 
-    /**
-     * @var ProductIdentifier
-     */
-    private ProductIdentifier $productIdentifier;
-
     /**
      * @var ProductRepository
      */
@@ -76,7 +71,6 @@ class OrderItemMapper
      * @param SystemConfig $systemConfig
      * @param GraphAPIAdapter $graphAPIAdapter
      * @param LoggerInterface $logger
-     * @param ProductIdentifier $productIdentifier
      * @param ProductRepository $productRepository
      * @param ConfigurableType $configurableType
      * @param OrderItemInterfaceFactory $orderItemFactory
@@ -85,20 +79,35 @@ public function __construct(
         SystemConfig              $systemConfig,
         GraphAPIAdapter           $graphAPIAdapter,
         LoggerInterface           $logger,
-        ProductIdentifier         $productIdentifier,
         ProductRepository         $productRepository,
         ConfigurableType          $configurableType,
         OrderItemInterfaceFactory $orderItemFactory
     ) {
         $this->systemConfig = $systemConfig;
         $this->graphAPIAdapter = $graphAPIAdapter;
         $this->logger = $logger;
-        $this->productIdentifier = $productIdentifier;
         $this->productRepository = $productRepository;
         $this->configurableType = $configurableType;
         $this->orderItemFactory = $orderItemFactory;
     }
 
+    /**
+     * Fetch product by retailer id and identifier attribute
+     *
+     * @param string|int $retailerId
+     * @return ProductInterface|bool
+     * @throws NoSuchEntityException
+     */
+    private function getProductByFacebookRetailerId($retailerId)
+    {
+        try {
+            return $this->productRepository->get($retailerId);
+        } catch (NoSuchEntityException $e) {
+            // Product not found
+            return $this->productRepository->getById($retailerId);
+        }
+    }
+
     /**
      * Map facebook order item data to magento order item
      *
@@ -109,7 +118,17 @@ public function __construct(
      */
     public function map(array $item, int $storeId): OrderItem
     {
-        $product = $this->productIdentifier->getProductByFacebookRetailerId($item['retailer_id']);
+        try {
+            $product = $this->getProductByFacebookRetailerId($item['retailer_id']);
+        } catch (NoSuchEntityException $e) {
+            throw new LocalizedException(
+                __(
+                    'Failed to map order item to Magento product: %1',
+                    $e->getMessage()
+                )
+            );
+        }
+
         $productInfo = $this->getProductInfo($item['product_id'], $storeId);
 
         $quantity = $item['quantity'];

app/code/Meta/Sales/composer.json

@@ -22,8 +22,7 @@
     "magento/module-shipping": "*",
     "magento/module-newsletter": "*",
     "magento/module-tax": "*",
-    "meta/module-business-extension": "*",
-    "meta/module-catalog": "*"
+    "meta/module-business-extension": "*"
   },
   "license": "Apache-2.0",
   "autoload": {

app/code/Meta/Sales/etc/module.xml

@@ -20,7 +20,6 @@
             <module name="Magento_Shipping"/>
             <module name="Magento_Webapi"/>
             <module name="Meta_BusinessExtension"/>
-            <module name="Meta_Catalog"/>
             <module name="Magento_OfflineShipping"/>
             <module name="Taxjar_SalesTax"/>
         </sequence>