Feature/fix magento health index meta catalog (#258)

pushpa-gupta-rp · bgiamarino · web-flow · commit 1e2c27d36d01 · 2023-06-23T08:49:25.000-05:00
* update modifier to public

* Add protected modifier

* resolve static test for Meta_Catalog module

* reverted applied public modifier

* Fix constructor argement for unit test

* fix unit test - call on null setAccessToken()

* reverted fix for setAccessToken and fix with correct variable

---------

Co-authored-by: Ben Giamarino &lt;bengiamarino@rightpoint.com&gt;
diff --git a/app/code/Meta/Catalog/Controller/Adminhtml/Diagnostic/Index.php b/app/code/Meta/Catalog/Controller/Adminhtml/Diagnostic/Index.php
@@ -27,7 +27,7 @@ class Index extends \Magento\Backend\App\Action implements HttpGetActionInterfac
   /**
    * @var PageFactory
    */
-    protected $resultPageFactory;
+    private $resultPageFactory;
 
   /**
    * Constructor
diff --git a/app/code/Meta/Catalog/Cron/CategorySyncCron.php b/app/code/Meta/Catalog/Cron/CategorySyncCron.php
@@ -17,40 +17,31 @@
 
 namespace Meta\Catalog\Cron;
 
-use Meta\BusinessExtension\Helper\FBEHelper;
 use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 use Meta\Catalog\Model\Feed\CategoryCollection;
 
 class CategorySyncCron
 {
-    /**
-     * @var FBEHelper
-     */
-    protected $fbeHelper;
-
     /**
      * @var CategoryCollection
      */
-    protected $categoryCollection;
+    private $categoryCollection;
 
     /**
      * @var SystemConfig
      */
-    protected $systemConfig;
+    private $systemConfig;
 
     /**
      * CategorySyncCron constructor
      *
-     * @param FBEHelper $fbeHelper
      * @param CategoryCollection $categoryCollection
      * @param SystemConfig $systemConfig
      */
     public function __construct(
-        FBEHelper $fbeHelper,
         CategoryCollection $categoryCollection,
         SystemConfig $systemConfig
     ) {
-        $this->fbeHelper = $fbeHelper;
         $this->categoryCollection = $categoryCollection;
         $this->systemConfig = $systemConfig;
     }
diff --git a/app/code/Meta/Catalog/Cron/UploadInventory.php b/app/code/Meta/Catalog/Cron/UploadInventory.php
@@ -59,7 +59,7 @@ public function __construct(SystemConfig $systemConfig, Uploader $uploader, Logg
      * @return $this
      * @throws LocalizedException
      */
-    protected function uploadForStore($storeId)
+    private function uploadForStore($storeId)
     {
         if ($this->isUploadEnabled($storeId)) {
             $this->uploader->uploadInventory($storeId);
diff --git a/app/code/Meta/Catalog/Cron/UploadProductFeed.php b/app/code/Meta/Catalog/Cron/UploadProductFeed.php
@@ -58,7 +58,7 @@ public function __construct(SystemConfig $systemConfig, Uploader $uploader, Logg
      * @return $this
      * @throws LocalizedException
      */
-    protected function uploadForStore($storeId)
+    private function uploadForStore($storeId)
     {
         if ($this->isFeedUploadEnabled($storeId)) {
             $this->uploader->uploadFullCatalog($storeId);
diff --git a/app/code/Meta/Catalog/Helper/Product/Identifier.php b/app/code/Meta/Catalog/Helper/Product/Identifier.php
@@ -52,7 +52,7 @@ public function __construct(SystemConfig $systemConfig, ProductRepository $produ
      * @param ProductInterface $product
      * @return bool|int|string
      */
-    protected function getProductIdentifier(ProductInterface $product)
+    private function getProductIdentifier(ProductInterface $product)
     {
         if ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_SKU) {
             return $product->getSku();
diff --git a/app/code/Meta/Catalog/Model/Product/Feed/Builder/MultiSourceInventory.php b/app/code/Meta/Catalog/Model/Product/Feed/Builder/MultiSourceInventory.php
@@ -43,7 +43,7 @@ class MultiSourceInventory implements InventoryInterface
     /**
      * @var SystemConfig
      */
-    protected $systemConfig;
+    private $systemConfig;
 
     /**
      * @var StockByWebsiteIdResolverInterface
diff --git a/app/code/Meta/Catalog/Model/Product/Feed/Builder/Tools.php b/app/code/Meta/Catalog/Model/Product/Feed/Builder/Tools.php
@@ -30,7 +30,7 @@ class Tools
     /**
      * @var PriceCurrencyInterface
      */
-    protected $priceCurrency;
+    private $priceCurrency;
 
     /**
      * @var Escaper
diff --git a/app/code/Meta/Catalog/Model/Product/Feed/ProductRetriever/Configurable.php b/app/code/Meta/Catalog/Model/Product/Feed/ProductRetriever/Configurable.php
@@ -32,7 +32,7 @@ class Configurable implements ProductRetrieverInterface
     /**
      * @var int
      */
-    protected $storeId;
+    private $storeId;
 
     /**
      * @var FBEHelper
diff --git a/app/code/Meta/Catalog/Model/Product/Feed/Uploader.php b/app/code/Meta/Catalog/Model/Product/Feed/Uploader.php
@@ -28,17 +28,17 @@ class Uploader
     /**
      * @var SystemConfig
      */
-    protected $systemConfig;
+    private $systemConfig;
 
     /**
      * @var MethodBatchApi
      */
-    protected $methodBatchApi;
+    private $methodBatchApi;
 
     /**
      * @var MethodFeedApi
      */
-    protected $methodFeedApi;
+    private $methodFeedApi;
 
     /**
      * @param SystemConfig $systemConfig
diff --git a/app/code/Meta/Catalog/Observer/ProcessCategoryAfterDeleteEventObserver.php b/app/code/Meta/Catalog/Observer/ProcessCategoryAfterDeleteEventObserver.php
@@ -28,11 +28,11 @@ class ProcessCategoryAfterDeleteEventObserver implements ObserverInterface
     /**
      * @var FBEHelper
      */
-    protected $fbeHelper;
+    private $fbeHelper;
     /**
      * @var SystemConfig
      */
-    protected $systemConfig;
+    private $systemConfig;
 
     /**
      * Constructor
diff --git a/app/code/Meta/Catalog/Observer/ProcessCategoryAfterSaveEventObserver.php b/app/code/Meta/Catalog/Observer/ProcessCategoryAfterSaveEventObserver.php
@@ -27,7 +27,7 @@ class ProcessCategoryAfterSaveEventObserver implements ObserverInterface
     /**
      * @var FBEHelper
      */
-    protected $_fbeHelper;
+    private $_fbeHelper;
 
     /**
      * Constructor
diff --git a/app/code/Meta/Catalog/Test/Unit/Cron/CategorySyncCronTest.php b/app/code/Meta/Catalog/Test/Unit/Cron/CategorySyncCronTest.php
@@ -66,7 +66,6 @@ public function setUp(): void
         $this->categoryCollection = $this->createMock(CategoryCollection::class);
         $this->systemConfig = $this->createMock(SystemConfig::class);
         $this->categorySyncCron = new CategorySyncCron(
-            $this->fbeHelper,
             $this->categoryCollection,
             $this->systemConfig
         );
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
@@ -97,6 +97,7 @@ public function setUp(): void
         $this->_eventObserverMock = $this->createMock(Observer::class);
         $this->_eventObserverMock->expects($this->once())->method('getEvent')->will($this->returnValue($event));
         $this->_graphApi = $this->createMock(GraphAPIAdapter::class);
+        $this->_graphApi->method('setDebugMode')->willReturn($this->_graphApi);
         $this->identifier = $this->createMock(Identifier::class);
         $this->messageManager = $this->createMock(ManagerInterface::class);
         $this->processProductAfterDeleteEventObserver = new ProcessProductAfterDeleteEventObserver(
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php
@@ -127,6 +127,7 @@ public function testExecute(): void
             ->method('buildRequestForIndividualProduct')
             ->with($productMock);
         $this->graphApiAdapterMock->expects($this->atLeastOnce())->method('catalogBatchRequest');
+        $this->graphApiAdapterMock->method('setDebugMode')->willReturn($this->graphApiAdapterMock);
         $this->processProductAfterSaveEventObserver->execute($observerMock);
     }
 }
diff --git a/app/code/Meta/Catalog/Ui/DataProvider/Product/Form/Modifier/SendToFacebook.php b/app/code/Meta/Catalog/Ui/DataProvider/Product/Form/Modifier/SendToFacebook.php
@@ -31,32 +31,32 @@ class SendToFacebook extends AbstractModifier
     /**
      * @var LocatorInterface
      */
-    protected $locator;
+    private $locator;
 
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
      * @var ArrayManager
      */
-    protected $arrayManager;
+    private $arrayManager;
 
     /**
      * @var BlockFactory
      */
-    protected $blockFactory;
+    private $blockFactory;
 
     /**
      * @var Request
      */
-    protected $request;
+    private $request;
 
     /**
      * @var SystemConfig
      */
-    protected $systemConfig;
+    private $systemConfig;
 
     /**
      * @param LocatorInterface $locator
@@ -108,7 +108,7 @@ private function isActive(): bool
      * @param array $meta
      * @return array
      */
-    protected function addFacebookProductDiagnostics(array $meta)
+    private function addFacebookProductDiagnostics(array $meta)
     {
         $path = $this->arrayManager->findPath('send_to_facebook', $meta);
         if ($path) {
diff --git a/app/code/Meta/Catalog/composer.json b/app/code/Meta/Catalog/composer.json
@@ -3,7 +3,7 @@
     "description": "Meta Business Extension Catalog module",
     "type": "magento2-module",
     "require": {
-        "php": "~7.4.0||~8.1.0",
+        "php": "~8.1.0||~8.2.0",
         "magento/framework": "*",
         "magento/module-inventory-sales-api": "*",
         "magento/module-backend": "*",

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(SystemConfig $systemConfig, Uploader $uploader, Logg`
`59`	`59`	`* @return $this`
`60`	`60`	`* @throws LocalizedException`
`61`	`61`	`*/`
`62`		`- protected function uploadForStore($storeId)`
	`62`	`+ private function uploadForStore($storeId)`
`63`	`63`	`{`
`64`	`64`	`if ($this->isUploadEnabled($storeId)) {`
`65`	`65`	`$this->uploader->uploadInventory($storeId);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function __construct(SystemConfig $systemConfig, Uploader $uploader, Logg`
`58`	`58`	`* @return $this`
`59`	`59`	`* @throws LocalizedException`
`60`	`60`	`*/`
`61`		`- protected function uploadForStore($storeId)`
	`61`	`+ private function uploadForStore($storeId)`
`62`	`62`	`{`
`63`	`63`	`if ($this->isFeedUploadEnabled($storeId)) {`
`64`	`64`	`$this->uploader->uploadFullCatalog($storeId);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function __construct(SystemConfig $systemConfig, ProductRepository $produ`
`52`	`52`	`* @param ProductInterface $product`
`53`	`53`	`* @return bool\|int\|string`
`54`	`54`	`*/`
`55`		`- protected function getProductIdentifier(ProductInterface $product)`
	`55`	`+ private function getProductIdentifier(ProductInterface $product)`
`56`	`56`	`{`
`57`	`57`	`if ($this->identifierAttr === IdentifierConfig::PRODUCT_IDENTIFIER_SKU) {`
`58`	`58`	`return $product->getSku();`