BUG#AC-6920:Masked quote ID is not always generated

Author: rachana

app/code/Magento/QuoteGraphQl/Model/Resolver/MaskedCartId.php

@@ -7,14 +7,17 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
+use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
 
 /**
  * Get cart id from the cart
@@ -26,13 +29,27 @@ class MaskedCartId implements ResolverInterface
      */
     private $quoteIdToMaskedQuoteId;
 
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var QuoteIdMaskResourceModel
+     */
+    private $quoteIdMaskResourceModel;
+
     /**
      * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
      */
     public function __construct(
-        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
+         QuoteIdMaskFactory $quoteIdMaskFactory,
+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel
     ) {
         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
     }
 
     /**
@@ -60,10 +77,35 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     private function getQuoteMaskId(int $quoteId): string
     {
         try {
-            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+            $maskedId =$this->ensureQuoteMaskExist($quoteId);
+            //$maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
         } catch (NoSuchEntityException $exception) {
             throw new GraphQlNoSuchEntityException(__('Current user does not have an active cart.'));
         }
         return $maskedId;
     }
+    /**
+     * Create masked id for quote if it's not exists
+     *
+     * @param int $quoteId
+     * @return string
+     * @throws AlreadyExistsException
+     */
+    private function ensureQuoteMaskExist(int $quoteId): string
+    {
+        try {
+            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+        } catch (NoSuchEntityException $e) {
+            $maskedId = '';
+        }
+        if ($maskedId === '') {
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $quoteIdMask->setQuoteId($quoteId);
+
+            $this->quoteIdMaskResourceModel->save($quoteIdMask);
+            $maskedId = $this->quoteIdToMaskedQuoteId->execute($quoteId);
+        }
+        return $maskedId;
+    }
+
 }