Resolve type error and refector code (#278)

* refactor the code for getFeedId method

* Resolve TypeError for Push Products Button

* Address Static Test

---------

Co-authored-by: Sachin Kumar <[email protected]>
Co-authored-by: Ben Giamarino <[email protected]>

Author: 3 people

app/code/Meta/Catalog/Model/Product/Feed/Builder/MultiSourceInventory.php

@@ -127,9 +127,8 @@ private function getStockQty(Product $product, int $stockId)
      */
     public function initInventoryForProduct(Product $product): MultiSourceInventory
     {
-        $websiteId = $product->getStore()->getWebsiteId();
+        $websiteId = (int) $product->getStore()->getWebsiteId();
         $stockId = $this->stockByWebsiteIdResolver->execute($websiteId)->getStockId();
-
         $this->product = $product;
         $this->stockStatus = $this->isInStock($product, $stockId);
         $this->stockQty = $this->getStockQty($product, $stockId);
@@ -157,7 +156,7 @@ public function getInventory(): int
             return 0;
         }
         $outOfStockThreshold = $this->systemConfig->getOutOfStockThreshold($this->product->getStoreId());
-        $quantityAvailableForCatalog = $this->stockQty - $outOfStockThreshold;
+        $quantityAvailableForCatalog = (int) $this->stockQty - $outOfStockThreshold;
         return $quantityAvailableForCatalog > 0 ? $quantityAvailableForCatalog : 0;
     }
 }

app/code/Meta/Catalog/Model/Product/Feed/Method/FeedApi.php

@@ -105,38 +105,31 @@ public function __construct(
     }
 
     /**
-     * Get feed id
+     * Get FB Feed ID
      *
-     * @param int $feedId
-     * @param array $catalogFeeds
-     * @param string $feedName
-     * @param int $catalogId
-     * @return void
+     * @return mixed|null
      * @throws GuzzleException
      */
-
-    private function getFeedId($feedId, $catalogFeeds, $feedName, $catalogId)
+    private function getFbFeedId()
     {
+        $feedId = $this->systemConfig->getFeedId($this->storeId);
+        $feedName = self::FB_FEED_NAME;
+        $catalogId = $this->systemConfig->getCatalogId($this->storeId);
+        $catalogFeeds = $this->graphApiAdapter->getCatalogFeeds($catalogId);
+
+        // make sure feed exists on meta side, not deleted
         if ($feedId) {
-            $magentoFeeds = array_filter($catalogFeeds, function ($a) use ($feedId) {
-                return $a['id'] === $feedId;
-            });
+            $magentoFeeds = array_filter($catalogFeeds, fn($a) => $a['id'] === $feedId);
+            // in case feed id is not found in meta catalog, feed id on
+            // magento will be flushed and new feed will be created in Meta Catalog
             if (empty($magentoFeeds)) {
                 $feedId = null;
             }
         }
 
-        if (!$feedId) {
-            $magentoFeeds = array_filter($catalogFeeds, function ($a) use ($feedName) {
-                return $a['name'] === $feedName;
-            });
-            if (!empty($magentoFeeds)) {
-                $feedId = $magentoFeeds[array_key_first($magentoFeeds)]['id'];
-            }
-        }
-
         if (!$feedId) {
             $feedId = $this->graphApiAdapter->createEmptyFeed($catalogId, $feedName);
+
             $maxAttempts = 5;
             $attempts = 0;
             do {
@@ -147,26 +140,14 @@ private function getFeedId($feedId, $catalogFeeds, $feedName, $catalogId)
                 $attempts++;
                 usleep(2000000);
             } while ($attempts < $maxAttempts);
-        }
-    }
 
-    /**
-     * Get FB Feed Id
-     *
-     * @return mixed|null
-     * @throws GuzzleException
-     */
-    private function getFbFeedId()
-    {
-        $feedId = $this->systemConfig->getFeedId($this->storeId);
-        $feedName = self::FB_FEED_NAME;
-        $catalogId = $this->systemConfig->getCatalogId($this->storeId);
-        $catalogFeeds = $this->graphApiAdapter->getCatalogFeeds($catalogId);
-        $this->getFeedId($feedId, $catalogFeeds, $feedName, $catalogId);
-        if ($feedId && $this->systemConfig->getFeedId($this->storeId) != $feedId) {
-            $this->systemConfig
-                ->saveConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID, $feedId, $this->storeId)
-                ->cleanCache();
+            if ($feedId) {
+                $this->systemConfig->saveConfig(
+                    SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_FEED_ID,
+                    $feedId,
+                    $this->storeId
+                )->cleanCache();
+            }
         }
         return $feedId;
     }
@@ -256,7 +237,6 @@ public function execute($storeId = null)
         $this->builder->setStoreId($this->storeId);
         $this->graphApiAdapter->setDebugMode($this->systemConfig->isDebugMode($storeId))
             ->setAccessToken($this->systemConfig->getAccessToken($storeId));
-
         try {
             $feedId = $this->getFbFeedId();
             if (!$feedId) {