Merge pull request #4636 from magento-honey-badgers/hb-combined-pr

[honey] MC-19115: Admin Analytics tracking should be enabled by default

Author: danielrenaud

app/code/Magento/AdminAnalytics/etc/config.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <admin>
+            <usage>
+                <enabled>
+                    1
+                </enabled>
+            </usage>
+        </admin>
+    </default>
+</config>

app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php

@@ -93,8 +93,6 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
                 )
             );
         }
-
-        $this->quoteRepository->save($cart);
     }
 
     /**
@@ -105,7 +103,7 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
      * @param float $quantity
      * @throws GraphQlNoSuchEntityException
      * @throws NoSuchEntityException
-     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
      */
     private function updateItemQuantity(int $itemId, Quote $cart, float $quantity)
     {

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

@@ -15,6 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\CartItemRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 use Magento\QuoteGraphQl\Model\Cart\UpdateCartItem;
@@ -39,19 +40,27 @@ class UpdateCartItems implements ResolverInterface
      */
     private $cartItemRepository;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartItemRepositoryInterface $cartItemRepository
      * @param UpdateCartItem $updateCartItem
+     * @param CartRepositoryInterface $cartRepository
      */
     public function __construct(
         GetCartForUser $getCartForUser,
         CartItemRepositoryInterface $cartItemRepository,
-        UpdateCartItem $updateCartItem
+        UpdateCartItem $updateCartItem,
+        CartRepositoryInterface $cartRepository
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartItemRepository = $cartItemRepository;
         $this->updateCartItem = $updateCartItem;
+        $this->cartRepository = $cartRepository;
     }
 
     /**
@@ -76,6 +85,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         try {
             $this->processCartItems($cart, $cartItems);
+            $this->cartRepository->save($cart);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
         } catch (LocalizedException $e) {

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php

@@ -70,6 +70,17 @@ public function testUpdateCartItemQuantity()
 
         $this->assertEquals($itemId, $item['id']);
         $this->assertEquals($quantity, $item['quantity']);
+
+        //Check that update is correctly reflected in cart
+        $cartQuery = $this->getCartQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($cartQuery);
+
+        $this->assertArrayHasKey('cart', $response);
+
+        $responseCart = $response['cart'];
+        $item = current($responseCart['items']);
+
+        $this->assertEquals($quantity, $item['quantity']);
     }
 
     /**
@@ -91,6 +102,15 @@ public function testRemoveCartItemIfQuantityIsZero()
 
         $responseCart = $response['updateCartItems']['cart'];
         $this->assertCount(0, $responseCart['items']);
+
+        //Check that update is correctly reflected in cart
+        $cartQuery = $this->getCartQuery($maskedQuoteId);
+        $response = $this->graphQlQuery($cartQuery);
+
+        $this->assertArrayHasKey('cart', $response);
+
+        $responseCart = $response['cart'];
+        $this->assertCount(0, $responseCart['items']);
     }
 
     /**
@@ -268,6 +288,26 @@ private function getQuery(string $maskedQuoteId, int $itemId, float $quantity):
     }
   }
 }
+QUERY;
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function getCartQuery(string $maskedQuoteId)
+    {
+        return <<<QUERY
+query {
+  cart(cart_id: "{$maskedQuoteId}"){
+    items{
+      product{
+        name
+      }
+      quantity
+    }
+  }
+}
 QUERY;
     }
 }

lib/internal/Magento/Framework/App/ProductMetadata.php

@@ -14,6 +14,7 @@
 
 /**
  * Class ProductMetadata
+ *
  * @package Magento\Framework\App
  */
 class ProductMetadata implements ProductMetadataInterface
@@ -28,6 +29,11 @@ class ProductMetadata implements ProductMetadataInterface
      */
     const PRODUCT_NAME  = 'Magento';
 
+    /**
+     * Magento version cache key
+     */
+    const VERSION_CACHE_KEY = 'mage-version';
+
     /**
      * Product version
      *
@@ -47,11 +53,21 @@ class ProductMetadata implements ProductMetadataInterface
     private $composerInformation;
 
     /**
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * ProductMetadata constructor.
      * @param ComposerJsonFinder $composerJsonFinder
+     * @param \Magento\Framework\App\CacheInterface $cache
      */
-    public function __construct(ComposerJsonFinder $composerJsonFinder)
-    {
+    public function __construct(
+        ComposerJsonFinder $composerJsonFinder,
+        CacheInterface $cache = null
+    ) {
         $this->composerJsonFinder = $composerJsonFinder;
+        $this->cache = $cache ?? ObjectManager::getInstance()->get(CacheInterface::class);
     }
 
     /**
@@ -61,13 +77,16 @@ public function __construct(ComposerJsonFinder $composerJsonFinder)
      */
     public function getVersion()
     {
+        $versionFromCache = $this->cache->load(self::VERSION_CACHE_KEY);
+        $this->version = $this->version ?: $versionFromCache;
         if (!$this->version) {
             if (!($this->version = $this->getSystemPackageVersion())) {
                 if ($this->getComposerInformation()->isMagentoRoot()) {
                     $this->version = $this->getComposerInformation()->getRootPackage()->getPrettyVersion();
                 } else {
                     $this->version = 'UNKNOWN';
                 }
+                $this->cache->save($this->version, self::VERSION_CACHE_KEY, [Config::CACHE_TAG]);
             }
         }
         return $this->version;