Merge branch '1.0.1-rc' of github.com:magento-commerce/facebook-for-magento2 into 1.0.1-merge

omiroshnichenko · omiroshnichenko · commit 794eb30fb899 · 2023-06-27T16:55:16.000-05:00
Conflicts:
	app/code/Meta/Catalog/composer.json
	app/code/Meta/Conversion/composer.json
	app/code/Meta/Promotions/composer.json
	app/code/Meta/Sales/composer.json
diff --git a/app/code/Meta/BusinessExtension/composer.json b/app/code/Meta/BusinessExtension/composer.json
@@ -4,7 +4,7 @@
     "type": "magento2-module",
     "license": "Apache-2.0",
     "require": {
-        "php": "~8.1.0||~8.2.0",
+        "php": "~8.1.0",
         "ext-json": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",
diff --git a/app/code/Meta/Catalog/Block/Adminhtml/Product/Form/Diagnostics.php b/app/code/Meta/Catalog/Block/Adminhtml/Product/Form/Diagnostics.php
@@ -114,11 +114,16 @@ public function setProduct(ProductInterface $product)
      * @return array
      * @throws GuzzleException
      */
-    private function getFacebookProductDiagnostics()
+    private function getFacebookProductDiagnostics(): array
     {
+        // @todo #269 Missing catalog ID for product diagnostics
+        $catalogId = $this->systemConfig->getCatalogId($this->storeId);
+        if (!$catalogId) {
+            return [];
+        }
+
         try {
             $retailerId = $this->productIdentifier->getMagentoProductRetailerId($this->product);
-            $catalogId = $this->systemConfig->getCatalogId($this->storeId);
             $product = $this->graphApiAdapter->getProductByRetailerId($catalogId, $retailerId);
             $fbProductId = $product['data'][0]['id'] ?? false;
             if ($fbProductId) {
diff --git a/app/code/Meta/Catalog/Observer/Product/DeleteAfter.php b/app/code/Meta/Catalog/Observer/Product/DeleteAfter.php
@@ -113,8 +113,9 @@ private function deleteProduct($storeId, $product): void
     {
         $isActive = $this->systemConfig->isActiveExtension($storeId);
         $shouldIncrement = $this->systemConfig->isActiveIncrementalProductUpdates($storeId);
+        $catalogId = $this->systemConfig->getCatalogId($storeId);
 
-        if (!($isActive && $shouldIncrement)) {
+        if (!($isActive && $shouldIncrement && $catalogId)) {
             return;
         }
 
@@ -126,7 +127,6 @@ private function deleteProduct($storeId, $product): void
             ];
             $this->graphApiAdapter->setDebugMode($this->systemConfig->isDebugMode($storeId))
                 ->setAccessToken($this->systemConfig->getAccessToken($storeId));
-            $catalogId = $this->systemConfig->getCatalogId($storeId);
             $this->graphApiAdapter->catalogBatchRequest($catalogId, [$requestData]);
         } catch (GuzzleException $e) {
             $this->messageManager->addErrorMessage(
diff --git a/app/code/Meta/Catalog/Observer/Product/SaveAfter.php b/app/code/Meta/Catalog/Observer/Product/SaveAfter.php
@@ -124,8 +124,9 @@ private function updateProduct($storeId, $productId): void
     {
         $isActive = $this->systemConfig->isActiveExtension($storeId);
         $shouldIncrement = $this->systemConfig->isActiveIncrementalProductUpdates($storeId);
+        $catalogId = $this->systemConfig->getCatalogId($storeId);
 
-        if (!($isActive && $shouldIncrement)) {
+        if (!($isActive && $shouldIncrement && $catalogId)) {
             return;
         }
 
@@ -140,7 +141,6 @@ private function updateProduct($storeId, $productId): void
             // @todo implement async call
             $this->graphApiAdapter->setDebugMode($this->systemConfig->isDebugMode($storeId))
                 ->setAccessToken($this->systemConfig->getAccessToken($storeId));
-            $catalogId = $this->systemConfig->getCatalogId($storeId);
             $requestData = $this->batchApi->buildRequestForIndividualProduct($product);
             $this->graphApiAdapter->catalogBatchRequest($catalogId, [$requestData]);
         } catch (NoSuchEntityException $e) {
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php
@@ -116,6 +116,8 @@ public function testExecution()
     {
         $this->systemConfig->method('isActiveExtension')->willReturn(true);
         $this->systemConfig->method('isActiveIncrementalProductUpdates')->willReturn(true);
+        $this->systemConfig->method('getCatalogId')->willReturn("12345");
+        $this->_graphApi->method('setDebugMode')->willReturn($this->_graphApi);
         $this->_graphApi->expects($this->atLeastOnce())->method('catalogBatchRequest');
         $this->systemConfig->method('isActiveExtension')->willReturn(true);
         $this->processProductAfterDeleteEventObserver->execute($this->_eventObserverMock);
diff --git a/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php b/app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php
@@ -124,6 +124,8 @@ public function testExecute(): void
 
         $productMock->method('getSendToFacebook')->willReturn(1);
 
+        $this->graphApiAdapterMock->method('setDebugMode')->willReturn($this->graphApiAdapterMock);
+
         $this->systemConfigMock->method('getCatalogId')->willReturn("12345");
 
         $this->batchApiMock->expects($this->once())
diff --git a/app/code/Meta/Sales/Observer/Order/Cancel.php b/app/code/Meta/Sales/Observer/Order/Cancel.php
@@ -102,10 +102,11 @@ private function cancelOrder(int $storeId, string $fbOrderId)
         } catch (GuzzleException $e) {
             $response = $e->getResponse();
             $body = json_decode($response->getBody());
-            throw new Exception('Error Code: '
-                .(string) $body->error->code
-                .'; '
-                . (string) $body->error->error_user_msg);
+            throw new Exception(__(
+                'Error code: "%1"; Error message: "%2"',
+                (string)$body->error->code,
+                (string)($body->error->message ?? $body->error->error_user_msg)
+            ));
         }
     }
 }
diff --git a/app/code/Meta/Sales/Observer/Order/MarkAsShipped.php b/app/code/Meta/Sales/Observer/Order/MarkAsShipped.php
@@ -98,10 +98,11 @@ public function execute(Observer $observer)
         } catch (GuzzleException $e) {
             $response = $e->getResponse();
             $body = json_decode($response->getBody());
-            throw new Exception('Error Code: '
-                .(string) $body->error->code
-                .'; '
-                . (string) $body->error->error_user_msg);
+            throw new Exception(__(
+                'Error code: "%1"; Error message: "%2"',
+                (string)$body->error->code,
+                (string)($body->error->message ?? $body->error->error_user_msg)
+            ));
         }
     }
 }
diff --git a/app/code/Meta/Sales/Observer/Order/Refund.php b/app/code/Meta/Sales/Observer/Order/Refund.php
@@ -174,10 +174,11 @@ private function refundOrder(
         } catch (GuzzleException $e) {
             $response = $e->getResponse();
             $body = json_decode($response->getBody());
-            throw new Exception('Error Code: '
-                .(string) $body->error->code
-                .'; '
-                . (string) $body->error->error_user_msg);
+            throw new Exception(__(
+                'Error code: "%1"; Error message: "%2"',
+                (string)$body->error->code,
+                (string)($body->error->message ?? $body->error->error_user_msg)
+            ));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ public function testExecution()`
`116`	`116`	`{`
`117`	`117`	`$this->systemConfig->method('isActiveExtension')->willReturn(true);`
`118`	`118`	`$this->systemConfig->method('isActiveIncrementalProductUpdates')->willReturn(true);`
	`119`	`+ $this->systemConfig->method('getCatalogId')->willReturn("12345");`
	`120`	`+ $this->_graphApi->method('setDebugMode')->willReturn($this->_graphApi);`
`119`	`121`	`$this->_graphApi->expects($this->atLeastOnce())->method('catalogBatchRequest');`
`120`	`122`	`$this->systemConfig->method('isActiveExtension')->willReturn(true);`
`121`	`123`	`$this->processProductAfterDeleteEventObserver->execute($this->_eventObserverMock);`
Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,11 @@ private function cancelOrder(int $storeId, string $fbOrderId)`
`102`	`102`	`} catch (GuzzleException $e) {`
`103`	`103`	`$response = $e->getResponse();`
`104`	`104`	`$body = json_decode($response->getBody());`
`105`		`- throw new Exception('Error Code: '`
`106`		`- .(string) $body->error->code`
`107`		`- .'; '`
`108`		`- . (string) $body->error->error_user_msg);`
	`105`	`+ throw new Exception(__(`
	`106`	`+ 'Error code: "%1"; Error message: "%2"',`
	`107`	`+ (string)$body->error->code,`
	`108`	`+ (string)($body->error->message ?? $body->error->error_user_msg)`
	`109`	`+ ));`
`109`	`110`	`}`
`110`	`111`	`}`
`111`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,11 @@ public function execute(Observer $observer)`
`98`	`98`	`} catch (GuzzleException $e) {`
`99`	`99`	`$response = $e->getResponse();`
`100`	`100`	`$body = json_decode($response->getBody());`
`101`		`- throw new Exception('Error Code: '`
`102`		`- .(string) $body->error->code`
`103`		`- .'; '`
`104`		`- . (string) $body->error->error_user_msg);`
	`101`	`+ throw new Exception(__(`
	`102`	`+ 'Error code: "%1"; Error message: "%2"',`
	`103`	`+ (string)$body->error->code,`
	`104`	`+ (string)($body->error->message ?? $body->error->error_user_msg)`
	`105`	`+ ));`
`105`	`106`	`}`
`106`	`107`	`}`
`107`	`108`	`}`