Added additional checks and test cases

Author: Usik2203

app/code/Magento/GiftMessageGraphQl/Model/Resolver/Cart/Item/GiftMessage.php

@@ -8,14 +8,14 @@
 namespace Magento\GiftMessageGraphQl\Model\Resolver\Cart\Item;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GiftMessage\Api\ItemRepositoryInterface;
+use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
 
 /**
  * Class provides ability to get GiftMessage for cart item
@@ -28,14 +28,20 @@ class GiftMessage implements ResolverInterface
     private $itemRepository;
 
     /**
-     * GiftMessageItem constructor.
-     *
+     * @var GiftMessageHelper
+     */
+    private $giftMessageHelper;
+
+    /**
      * @param ItemRepositoryInterface $itemRepository
+     * @param GiftMessageHelper       $giftMessageHelper
      */
     public function __construct(
-        ItemRepositoryInterface $itemRepository
+        ItemRepositoryInterface $itemRepository,
+        GiftMessageHelper $giftMessageHelper
     ) {
         $this->itemRepository = $itemRepository;
+        $this->giftMessageHelper = $giftMessageHelper;
     }
 
     /**
@@ -64,16 +70,28 @@ public function resolve(
 
         $quoteItem = $value['model'];
 
+        if (!$this->giftMessageHelper->isMessagesAllowed('items', $quoteItem)) {
+            return null;
+        }
+
+        if (!$this->giftMessageHelper->isMessagesAllowed('item', $quoteItem)) {
+            return null;
+        }
+
         try {
             $giftItemMessage = $this->itemRepository->get($quoteItem->getQuoteId(), $quoteItem->getItemId());
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__('Can\'t load cart item'));
         }
 
+        if (!isset($giftItemMessage)) {
+            return null;
+        }
+
         return [
-            'to' => isset($giftItemMessage) ? $giftItemMessage->getRecipient() : '',
-            'from' => isset($giftItemMessage) ? $giftItemMessage->getSender() : '',
-            'message'=> isset($giftItemMessage) ? $giftItemMessage->getMessage() : ''
+            'to' => $giftItemMessage->getRecipient() ?? '',
+            'from' =>  $giftItemMessage->getSender() ?? '',
+            'message'=>  $giftItemMessage->getMessage() ?? ''
         ];
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/GiftMessage/Cart/Item/GiftMessageTest.php

@@ -20,23 +20,55 @@ class GiftMessageTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
     }
 
     /**
+     * @magentoConfigFixture default_store sales/gift_options/allow_items 1
      * @magentoApiDataFixture Magento/GiftMessage/_files/guest/quote_with_item_message.php
      * @throws NoSuchEntityException
      * @throws Exception
      */
     public function testGiftMessageCartForItem()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_guest_order_with_gift_message');
+        foreach ($this->requestCartResult($maskedQuoteId)['cart']['items'] as $item) {
+            self::assertArrayHasKey('gift_message', $item);
+            self::assertArrayHasKey('to', $item['gift_message']);
+            self::assertArrayHasKey('from', $item['gift_message']);
+            self::assertArrayHasKey('message', $item['gift_message']);
+        }
+    }
+
+    /**
+     * @magentoConfigFixture default_store sales/gift_options/allow_items 0
+     * @magentoApiDataFixture Magento/GiftMessage/_files/guest/quote_with_item_message.php
+     * @throws NoSuchEntityException
+     * @throws Exception
+     */
+    public function testGiftMessageCartForItemNotAllow()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_guest_order_with_gift_message');
+        foreach ($this->requestCartResult($maskedQuoteId)['cart']['items'] as $item) {
+            self::assertArrayHasKey('gift_message', $item);
+            self::assertNull($item['gift_message']);
+        }
+    }
+
+    /**
+     * @param string $quoteId
+     *
+     * @return array|bool|float|int|string
+     * @throws Exception
+     */
+    private function requestCartResult(string $quoteId)
+    {
         $query = <<<QUERY
 {
-    cart(cart_id: "$maskedQuoteId") {
+    cart(cart_id: "$quoteId") {
         items {
             product {
                 name
@@ -52,12 +84,6 @@ public function testGiftMessageCartForItem()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
-        foreach ($response['cart']['items'] as $item) {
-            self::assertArrayHasKey('gift_message', $item);
-            self::assertArrayHasKey('to', $item['gift_message']);
-            self::assertArrayHasKey('from', $item['gift_message']);
-            self::assertArrayHasKey('message', $item['gift_message']);
-        }
+        return $this->graphQlQuery($query);
     }
 }