Gift message GraphQl module fix

Author: Usik2203

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

@@ -59,8 +59,10 @@ public function resolve(
             throw new GraphQlInputException(__('"id" value should be specified'));
         }
 
+        $orderId = (int)base64_decode($value['id']) ?: (int)$value['id'];
+
         try {
-            $orderGiftMessage = $this->orderRepository->get($value['id']);
+            $orderGiftMessage = $this->orderRepository->get($orderId);
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__('Can\'t load gift message for order'));
         }

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

@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GiftMessageGraphQl\Model\Resolver\Order\Item;
+
+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;
+
+/**
+ * Class provides ability to get GiftMessage for order item
+ */
+class GiftMessage implements ResolverInterface
+{
+    /**
+     * @var OrderItemRepositoryInterface
+     */
+    private $orderItemRepository;
+
+    /**
+     * @var GiftMessageHelper
+     */
+    private $giftMessageHelper;
+
+    /**
+     * @param OrderItemRepositoryInterface $itemRepository
+     * @param GiftMessageHelper       $giftMessageHelper
+     */
+    public function __construct(
+        OrderItemRepositoryInterface $itemRepository,
+        GiftMessageHelper $giftMessageHelper
+    ) {
+        $this->orderItemRepository = $itemRepository;
+        $this->giftMessageHelper = $giftMessageHelper;
+    }
+
+    /**
+     * 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)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('"model" value must be specified'));
+        }
+
+        $orderItem = $value['model'];
+
+        if (!$this->giftMessageHelper->isMessagesAllowed('items', $orderItem)) {
+            return null;
+        }
+
+        if (!$this->giftMessageHelper->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'));
+        }
+
+        if (!isset($giftItemMessage)) {
+            return null;
+        }
+
+        return [
+            'to' => $giftItemMessage->getRecipient() ?? '',
+            'from' =>  $giftItemMessage->getSender() ?? '',
+            'message'=>  $giftItemMessage->getMessage() ?? ''
+        ];
+    }
+}

app/code/Magento/GiftMessageGraphQl/etc/schema.graphqls

@@ -45,3 +45,7 @@ type SalesItemInterface {
 type CustomerOrder {
     gift_message: GiftMessage @resolver (class: "\\Magento\\GiftMessageGraphQl\\Model\\Resolver\\Order\\GiftMessage")  @doc(description: "The entered gift message for the order")
 }
+
+interface OrderItemInterface {
+    gift_message: GiftMessage @resolver(class: "\\Magento\\GiftMessageGraphQl\\Model\\Resolver\\Order\\Item\\GiftMessage") @doc(description: "The selected gift message for the order item")
+}