LYNX-692: Gift Options - Fixed issue with customer.orders query

Author: deepak-soni1

app/code/Magento/GiftMessageGraphQl/Model/Config/Messages.php

@@ -7,10 +7,11 @@
 
 namespace Magento\GiftMessageGraphQl\Model\Config;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
-use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
@@ -50,8 +51,8 @@ public function isMessagesAllowed(
         }
 
         return $this->isGiftMessageAllowedForProduct(
-            ($type === 'item' || $entity instanceof Item) ?
-                $entity->getProduct()->getGiftMessageAvailable() : null,
+            $entity instanceof QuoteItem ? $entity->getProduct()->getGiftMessageAvailable()
+                : ($entity instanceof OrderItem ? $entity->getGiftMessageAvailable() : null),
             $store
         );
     }

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

@@ -10,13 +10,11 @@
 use Magento\Framework\Exception\LocalizedException;
 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\OrderItemRepositoryInterface;
-use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
 use Magento\GiftMessageGraphQl\Model\Config\Messages;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class provides ability to get GiftMessage for order item
@@ -28,25 +26,17 @@ class GiftMessage implements ResolverInterface
      *
      * @param OrderItemRepositoryInterface $orderItemRepository
      * @param Messages $messagesConfig
+     * @param LoggerInterface $logger
      */
     public function __construct(
         private readonly OrderItemRepositoryInterface $orderItemRepository,
-        private readonly Messages $messagesConfig
+        private readonly Messages $messagesConfig,
+        private readonly LoggerInterface $logger
     ) {
     }
 
     /**
-     * Return information about Gift message for order item
-     *
-     * @param Field $field
-     * @param ContextInterface $context
-     * @param ResolveInfo $info
-     * @param array|null $value
-     * @param array|null $args
-     *
-     * @return array|Value|mixed
-     * @throws GraphQlInputException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
@@ -61,28 +51,27 @@ public function resolve(
 
         $orderItem = $value['model'];
 
-        if (!$this->messagesConfig->isMessagesAllowed('items', $orderItem)) {
-            return null;
-        }
-
-        if (!$this->messagesConfig->isMessagesAllowed('item', $orderItem)) {
+        if (!$this->messagesConfig->isMessagesAllowed('items', $orderItem) ||
+            !$this->messagesConfig->isMessagesAllowed('item', $orderItem)) {
             return null;
         }
 
         try {
             $giftItemMessage = $this->orderItemRepository->get($orderItem->getOrderId(), $orderItem->getItemId());
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__('Can\'t load message for order item'));
-        }
+            $this->logger->error('Can\'t load message for order item', [
+                'order_id' => $orderItem->getOrderId(),
+                'item_id' => $orderItem->getItemId(),
+                'message' => $e->getMessage(),
+            ]);
 
-        if ($giftItemMessage === null) {
             return null;
         }
 
-        return [
+        return $giftItemMessage ? [
             'to' => $giftItemMessage->getRecipient() ?? '',
-            'from' =>  $giftItemMessage->getSender() ?? '',
-            'message'=>  $giftItemMessage->getMessage() ?? ''
-        ];
+            'from' => $giftItemMessage->getSender() ?? '',
+            'message' => $giftItemMessage->getMessage() ?? '',
+        ] : null;
     }
 }

app/code/Magento/GiftMessageGraphQl/composer.json

@@ -9,8 +9,8 @@
         "magento/module-catalog": "*",
         "magento/module-quote": "*",
         "magento/module-store": "*",
-        "magento/module-downloadable": "*"
-
+        "magento/module-downloadable": "*",
+        "magento/module-sales": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"