Move MagentoDataHelper to the Conversion module (#155)

zlik · web-flow · commit 4cafe7f3f6a9 · 2023-02-21T08:45:46.000-08:00
* move MagentoDataHelper to the Conversion module

* update module dependencies

* fix tests

* fix tests
diff --git a/app/code/Meta/BusinessExtension/composer.json b/app/code/Meta/BusinessExtension/composer.json
@@ -9,15 +9,11 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
-        "magento/module-configurable-product": "*",
         "magento/module-config": "*",
         "magento/module-security": "*",
         "magento/module-store": "*",
         "magento/module-newsletter": "*",
-        "magento/module-customer": "*",
-        "magento/module-checkout": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
+        "meta/module-sales": "*",
         "facebook/php-business-sdk": "^15.0.0"
     },
     "autoload": {
diff --git a/app/code/Meta/BusinessExtension/etc/module.xml b/app/code/Meta/BusinessExtension/etc/module.xml
@@ -5,15 +5,11 @@
         <sequence>
             <module name="Magento_Backend"/>
             <module name="Magento_Catalog"/>
-            <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_Config"/>
             <module name="Magento_Security"/>
             <module name="Magento_Store"/>
             <module name="Magento_Newsletter"/>
-            <module name="Magento_Customer"/>
-            <module name="Magento_Checkout"/>
-            <module name="Magento_Directory"/>
-            <module name="Magento_Eav"/>
+            <module name="Meta_Sales"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterDeleteEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterDeleteEventObserverTest.php
@@ -18,15 +18,30 @@
 namespace Meta\Catalog\Test\Unit\Observer;
 
 use Magento\Framework\Event\Observer;
+use Meta\BusinessExtension\Helper\FBEHelper;
+use Meta\BusinessExtension\Model\System\Config;
 use Meta\Catalog\Model\Feed\CategoryCollection;
-use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
 use Magento\Catalog\Model\Category;
 use Magento\Framework\Event;
 use Meta\Catalog\Observer\ProcessCategoryAfterDeleteEventObserver;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
-class ProcessCategoryAfterDeleteEventObserverTest extends CommonTest
+class ProcessCategoryAfterDeleteEventObserverTest extends TestCase
 {
+    /**
+     * @var MockObject
+     */
+    private MockObject $fbeHelper;
+
+    /**
+     * @var MockObject
+     */
+    private MockObject $systemConfig;
+
+    /**
+     * @var ProcessCategoryAfterDeleteEventObserver
+     */
     private $processCategoryAfterDeleteEventObserver;
 
     /**
@@ -46,7 +61,8 @@ class ProcessCategoryAfterDeleteEventObserverTest extends CommonTest
      */
     public function setUp(): void
     {
-        parent::setUp();
+        $this->fbeHelper = $this->createMock(FBEHelper::class);
+        $this->systemConfig = $this->createMock(Config::class);
         $this->_category = $this->createMock(Category::class);
         $event = $this->getMockBuilder(Event::class)->addMethods(['getCategory'])->getMock();
         $event->expects($this->once())->method('getCategory')->will($this->returnValue($this->_category));
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterSaveEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterSaveEventObserverTest.php
@@ -18,13 +18,20 @@
 namespace Meta\Catalog\Test\Unit\Observer;
 
 use Magento\Framework\Event;
-use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
+use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\Catalog\Model\Feed\CategoryCollection;
 use Meta\Catalog\Observer\ProcessCategoryAfterSaveEventObserver;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
-class ProcessCategoryAfterSaveEventObserverTest extends CommonTest
+class ProcessCategoryAfterSaveEventObserverTest extends TestCase
 {
-    protected $processCategoryAfterSaveEventObserver;
+    /**
+     * @var MockObject
+     */
+    private MockObject $fbeHelper;
+
+    private $processCategoryAfterSaveEventObserver;
 
     /**
      * @var \PHPUnit\Framework\MockObject\MockObject
@@ -43,7 +50,7 @@ class ProcessCategoryAfterSaveEventObserverTest extends CommonTest
      */
     public function setUp(): void
     {
-        parent::setUp();
+        $this->fbeHelper = $this->createMock(FBEHelper::class);
         $this->_category = $this->createMock(\Magento\Catalog\Model\Category::class);
         $event = $this->getMockBuilder(Event::class)->addMethods(['getCategory'])->getMock();
         $event->expects($this->once())->method('getCategory')->will($this->returnValue($this->_category));
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
@@ -17,21 +17,33 @@
 
 namespace Meta\Catalog\Test\Unit\Observer;
 
+use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Helper\GraphAPIAdapter;
-use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
+use Meta\BusinessExtension\Model\System\Config;
 use Meta\Catalog\Helper\Product\Identifier;
 use Meta\Catalog\Observer\Product\DeleteAfter as ProcessProductAfterDeleteEventObserver;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Event;
 use Magento\Framework\Event\Observer;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
-class ProcessProductAfterDeleteEventObserverTest extends CommonTest
+class ProcessProductAfterDeleteEventObserverTest extends TestCase
 {
+    /**
+     * @var MockObject
+     */
+    private MockObject $fbeHelper;
+
+    /**
+     * @var MockObject
+     */
+    private MockObject $systemConfig;
+
     /**
      * @var ProcessProductAfterDeleteEventObserver
      */
-    protected $processProductAfterDeleteEventObserver;
+    private $processProductAfterDeleteEventObserver;
 
     /**
      * @var MockObject
@@ -60,7 +72,8 @@ class ProcessProductAfterDeleteEventObserverTest extends CommonTest
      */
     public function setUp(): void
     {
-        parent::setUp();
+        $this->fbeHelper = $this->createMock(FBEHelper::class);
+        $this->systemConfig = $this->createMock(Config::class);
         $this->_product = $this->createMock(Product::class);
         $this->_product->expects($this->atLeastOnce())->method('getId')->will($this->returnValue("1234"));
         $this->_product->expects($this->never())->method('getSku');
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php
@@ -17,22 +17,34 @@
 
 namespace Meta\Catalog\Test\Unit\Observer;
 
+use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Helper\GraphAPIAdapter;
-use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
+use Meta\BusinessExtension\Model\System\Config;
 use Meta\Catalog\Model\Product\Feed\Method\BatchApi;
 use Meta\Catalog\Observer\Product\SaveAfter as ProcessProductAfterSaveEventObserver;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Event;
 use Magento\Framework\Event\Observer;
 use Magento\Store\Api\Data\StoreInterface;
+use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
-class ProcessProductAfterSaveEventObserverTest extends CommonTest
+class ProcessProductAfterSaveEventObserverTest extends TestCase
 {
+    /**
+     * @var MockObject
+     */
+    private MockObject $fbeHelper;
+
+    /**
+     * @var MockObject
+     */
+    private MockObject $systemConfig;
+
     /**
      * @var ProcessProductAfterSaveEventObserver
      */
-    protected $processProductAfterSaveEventObserver;
+    private $processProductAfterSaveEventObserver;
 
     /**
      * @var MockObject
@@ -66,7 +78,8 @@ class ProcessProductAfterSaveEventObserverTest extends CommonTest
      */
     public function setUp(): void
     {
-        parent::setUp();
+        $this->fbeHelper = $this->createMock(FBEHelper::class);
+        $this->systemConfig = $this->createMock(Config::class);
         $this->store = $this->createMock(StoreInterface::class);
         $this->fbeHelper->expects($this->once())->method('getStore')->will($this->returnValue($this->store));
         $this->_product = $this->createMock(Product::class);
diff --git a/app/code/Meta/Catalog/composer.json b/app/code/Meta/Catalog/composer.json
@@ -11,8 +11,8 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-configurable-product": "*",
-        "magento/module-catalog-inventory": "*",
         "magento/module-config": "*",
+        "magento/module-customer": "*",
         "magento/module-eav": "*",
         "magento/module-store": "*",
         "meta/module-business-extension": "*"
diff --git a/app/code/Meta/Catalog/etc/module.xml b/app/code/Meta/Catalog/etc/module.xml
@@ -6,7 +6,7 @@
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
             <module name="Magento_Config"/>
-            <module name="Magento_CatalogInventory"/>
+            <module name="Magento_Customer"/>
             <module name="Magento_Inventory"/>
             <module name="Magento_InventoryApi"/>
             <module name="Magento_InventorySalesApi"/>
diff --git a/app/code/Meta/Conversion/Block/Pixel/Common.php b/app/code/Meta/Conversion/Block/Pixel/Common.php
@@ -18,7 +18,7 @@
 namespace Meta\Conversion\Block\Pixel;
 
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/app/code/Meta/Conversion/Block/Pixel/Head.php b/app/code/Meta/Conversion/Block/Pixel/Head.php
@@ -20,7 +20,7 @@
 use Magento\Framework\Escaper;
 use Meta\Conversion\Helper\AAMFieldsExtractorHelper;
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\Template\Context;
diff --git a/app/code/Meta/Conversion/Block/Pixel/InitiateCheckout.php b/app/code/Meta/Conversion/Block/Pixel/InitiateCheckout.php
@@ -21,7 +21,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\Template\Context;
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Magento\Framework\Pricing\Helper\Data as PricingHelper;
 
@@ -43,8 +43,8 @@ class InitiateCheckout extends Common
      * @param FBEHelper $fbeHelper
      * @param MagentoDataHelper $magentoDataHelper
      * @param SystemConfig $systemConfig
-     * @param PricingHelper $pricingHelper
      * @param Escaper $escaper
+     * @param PricingHelper $pricingHelper
      * @param array $data
      */
     public function __construct(
@@ -53,8 +53,8 @@ public function __construct(
         FBEHelper $fbeHelper,
         MagentoDataHelper $magentoDataHelper,
         SystemConfig $systemConfig,
-        PricingHelper $pricingHelper,
         Escaper $escaper,
+        PricingHelper $pricingHelper,
         array $data = []
     ) {
         parent::__construct($context, $objectManager, $fbeHelper, $magentoDataHelper, $systemConfig, $escaper, $data);
diff --git a/app/code/Meta/Conversion/Controller/Pixel/ProductInfoForAddToCart.php b/app/code/Meta/Conversion/Controller/Pixel/ProductInfoForAddToCart.php
@@ -19,14 +19,12 @@
 
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Pricing\Helper\Data;
 use Magento\Framework\View\Asset\File\NotFoundException;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\Conversion\Helper\EventIdGenerator;
 use Meta\BusinessExtension\Helper\FBEHelper;
 use Magento\Catalog\Model\Product;
diff --git a/app/code/Meta/Conversion/Helper/AAMFieldsExtractorHelper.php b/app/code/Meta/Conversion/Helper/AAMFieldsExtractorHelper.php
@@ -18,7 +18,6 @@
 namespace Meta\Conversion\Helper;
 
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
 use FacebookAds\Object\ServerSide\Normalizer;
 use FacebookAds\Object\ServerSide\Util;
 
diff --git a/app/code/Meta/Conversion/Helper/MagentoDataHelper.php b/app/code/Meta/Conversion/Helper/MagentoDataHelper.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-namespace Meta\BusinessExtension\Helper;
+namespace Meta\Conversion\Helper;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -30,7 +30,6 @@
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Meta\Conversion\Helper\AAMSettingsFields;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\Pricing\Helper\Data as PricingHelper;
diff --git a/app/code/Meta/Conversion/Helper/ServerEventFactory.php b/app/code/Meta/Conversion/Helper/ServerEventFactory.php
@@ -18,7 +18,6 @@
 namespace Meta\Conversion\Helper;
 
 use FacebookAds\Object\ServerSide\Event;
-use FacebookAds\Object\ServerSide\EventRequest;
 use FacebookAds\Object\ServerSide\UserData;
 use FacebookAds\Object\ServerSide\CustomData;
 use FacebookAds\Object\ServerSide\Content;
diff --git a/app/code/Meta/Conversion/Model/Tracker/ViewContent.php b/app/code/Meta/Conversion/Model/Tracker/ViewContent.php
@@ -4,7 +4,7 @@
 namespace Meta\Conversion\Model\Tracker;
 
 use Magento\Framework\Exception\NoSuchEntityException;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Meta\Conversion\Api\TrackerInterface;
 
diff --git a/app/code/Meta/Conversion/Observer/AddToCart.php b/app/code/Meta/Conversion/Observer/AddToCart.php
@@ -18,7 +18,7 @@
 namespace Meta\Conversion\Observer;
 
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\Conversion\Helper\ServerSideHelper;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Event\Observer;
diff --git a/app/code/Meta/Conversion/Observer/InitiateCheckout.php b/app/code/Meta/Conversion/Observer/InitiateCheckout.php
@@ -18,7 +18,7 @@
 namespace Meta\Conversion\Observer;
 
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\Conversion\Helper\ServerSideHelper;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
diff --git a/app/code/Meta/Conversion/Observer/Purchase.php b/app/code/Meta/Conversion/Observer/Purchase.php
@@ -18,7 +18,7 @@
 namespace Meta\Conversion\Observer;
 
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\Conversion\Helper\ServerSideHelper;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
diff --git a/app/code/Meta/Conversion/Test/Unit/Block/Pixel/HeadTest.php b/app/code/Meta/Conversion/Test/Unit/Block/Pixel/HeadTest.php
@@ -20,7 +20,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\Element\Template\Context;
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\BusinessExtension\Model\System\Config;
 use Meta\Conversion\Block\Pixel\Head;
 use Meta\Conversion\Helper\AAMFieldsExtractorHelper;
diff --git a/app/code/Meta/Conversion/Test/Unit/Helper/AAMFieldsExtractorHelperTest.php b/app/code/Meta/Conversion/Test/Unit/Helper/AAMFieldsExtractorHelperTest.php
@@ -20,7 +20,7 @@
 use Meta\Conversion\Helper\AAMFieldsExtractorHelper;
 use Meta\Conversion\Helper\AAMSettingsFields;
 use Meta\BusinessExtension\Helper\FBEHelper;
-use Meta\BusinessExtension\Helper\MagentoDataHelper;
+use Meta\Conversion\Helper\MagentoDataHelper;
 use Meta\Conversion\Helper\ServerEventFactory;
 
 use FacebookAds\Object\ServerSide\AdsPixelSettings;
diff --git a/app/code/Meta/Conversion/Test/Unit/Observer/AddToCartTest.php b/app/code/Meta/Conversion/Test/Unit/Observer/AddToCartTest.php
@@ -17,7 +17,6 @@
 
 namespace Meta\Conversion\Test\Unit\Observer;
 
-use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
 use Meta\Conversion\Helper\AAMFieldsExtractorHelper;
 use Meta\Conversion\Helper\ServerSideHelper;
 use Meta\Conversion\Observer\AddToCart;
diff --git a/app/code/Meta/Conversion/Test/Unit/Observer/CommonTest.php b/app/code/Meta/Conversion/Test/Unit/Observer/CommonTest.php
diff --git a/app/code/Meta/Conversion/Test/Unit/Observer/InitiateCheckoutTest.php b/app/code/Meta/Conversion/Test/Unit/Observer/InitiateCheckoutTest.php
diff --git a/app/code/Meta/Conversion/Test/Unit/Observer/PurchaseTest.php b/app/code/Meta/Conversion/Test/Unit/Observer/PurchaseTest.php
diff --git a/app/code/Meta/Conversion/composer.json b/app/code/Meta/Conversion/composer.json
diff --git a/app/code/Meta/Conversion/etc/module.xml b/app/code/Meta/Conversion/etc/module.xml
