LYNX-693: Gift Options - Extend cart query

Author: deepak-soni1

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

@@ -10,8 +10,6 @@
 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\ItemRepositoryInterface;
@@ -35,36 +33,23 @@ public function __construct(
     }
 
     /**
-     * Return information about Gift message for item cart
-     *
-     * @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,
         $context,
         ResolveInfo $info,
         ?array $value = null,
         ?array $args = null
-    ) {
+    ): ?array {
         if (!isset($value['model'])) {
             throw new GraphQlInputException(__('"model" value must be specified'));
         }
 
         $quoteItem = $value['model'];
 
-        if (!$this->messagesConfig->isMessagesAllowed('items', $quoteItem)) {
-            return null;
-        }
-
-        if (!$this->messagesConfig->isMessagesAllowed('item', $quoteItem)) {
+        if (!$this->messagesConfig->isMessagesAllowed('items', $quoteItem)
+            || !$this->messagesConfig->isMessagesAllowed('item', $quoteItem)) {
             return null;
         }
 
@@ -74,14 +59,10 @@ public function resolve(
             throw new GraphQlInputException(__('Can\'t load cart item'));
         }
 
-        if (!$giftItemMessage) {
-            return null;
-        }
-
-        return [
+        return $giftItemMessage ? [
             'to' => $giftItemMessage->getRecipient() ?? '',
-            'from' =>  $giftItemMessage->getSender() ?? '',
-            'message'=>  $giftItemMessage->getMessage() ?? ''
-        ];
+            'from' => $giftItemMessage->getSender() ?? '',
+            'message' => $giftItemMessage->getMessage() ?? ''
+        ] : null;
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/GiftMessage/CartItemWithGiftMessageTest.php

@@ -13,7 +13,6 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GiftMessage\Test\Fixture\GiftMessage;
-use Magento\Indexer\Test\Fixture\Indexer;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Test\Fixture\AddProductToCart as AddProductToCartFixture;
 use Magento\Quote\Test\Fixture\GuestCart;
@@ -56,9 +55,8 @@ protected function setUp(): void
     }
 
     #[
-        DataFixture(ProductFixture::class, ['type_id' => 'virtual'], as: 'product'),
-        DataFixture(Indexer::class, as: 'indexer'),
         DataFixture(GiftMessage::class, as: 'message'),
+        DataFixture(ProductFixture::class, ['type_id' => 'virtual'], as: 'product'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -95,6 +93,7 @@ public function testCartQueryWithVirtualItem(): void
     }
 
     #[
+        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(DownloadableProductFixture::class, [
             'price' => 100,
             'type_id' => 'downloadable',
@@ -112,8 +111,6 @@ public function testCartQueryWithVirtualItem(): void
                 ]
             ]
         ], as: 'product'),
-        DataFixture(Indexer::class, as: 'indexer'),
-        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -150,13 +147,12 @@ public function testCartQueryWithDownloadableItem(): void
     }
 
     #[
+        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(
             ProductFixture::class,
             ['type_id' => 'simple', 'weight' => 10, 'gift_message_available' => 2],
             as: 'product'
         ),
-        DataFixture(Indexer::class, as: 'indexer'),
-        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -175,13 +171,12 @@ public function testCartQueryWithSimpleItemWhenStoreConfigEnabled(): void
     }
 
     #[
+        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(
             ProductFixture::class,
             ['type_id' => 'simple', 'weight' => 10, 'gift_message_available' => 2],
             as: 'product'
         ),
-        DataFixture(Indexer::class, as: 'indexer'),
-        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -200,13 +195,12 @@ public function testCartQueryWithSimpleItemWhenStoreConfigDisabled(): void
     }
 
     #[
+        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(
             ProductFixture::class,
             ['type_id' => 'simple', 'weight' => 10, 'gift_message_available' => 0],
             as: 'product'
         ),
-        DataFixture(Indexer::class, as: 'indexer'),
-        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -225,13 +219,12 @@ public function testCartQueryWithSimpleItemWhenAllConfigDisabled(): void
     }
 
     #[
+        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(
             ProductFixture::class,
             ['type_id' => 'simple', 'weight' => 10, 'gift_message_available' => 1],
             as: 'product'
         ),
-        DataFixture(Indexer::class, as: 'indexer'),
-        DataFixture(GiftMessage::class, as: 'message'),
         DataFixture(GuestCart::class, ['message_id' => '$message.id$'], as: 'quote'),
         DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$quote.id$']),
         DataFixture(
@@ -349,9 +342,9 @@ private function updateGiftMessageForCartItems(string $maskedQuoteId): void
      *
      * @param int $cartId
      * @param int $productId
-     * @return int|null
+     * @return int
      */
-    private function getItemId(int $cartId, int $productId): ?int
+    private function getItemId(int $cartId, int $productId): int
     {
         $connection = $this->resourceConnection->getConnection();
         return (int)$connection->fetchOne(