AC-5979: Rest API products-render-info return wrong final price for logged in customer

Author: wip44850

app/code/Magento/Catalog/Plugin/Model/ProductRenderListPlugin.php

@@ -49,6 +49,11 @@ class ProductRenderListPlugin
      */
     private $logger;
 
+    /**
+     * @var array Cache for customer group IDs
+     */
+    private $customerGroupCache = [];
+
     /**
      * @param UserContextInterface $userContext
      * @param CustomerRepositoryInterface $customerRepository
@@ -125,8 +130,11 @@ private function getCustomerGroupId(): ?int
             if ($userType === UserContextInterface::USER_TYPE_CUSTOMER) {
                 $customerId = $this->userContext->getUserId();
                 if ($customerId) {
-                    $customer = $this->customerRepository->getById($customerId);
-                    return (int)$customer->getGroupId();
+                    if (!isset($this->customerGroupCache[$customerId])) {
+                        $customer = $this->customerRepository->getById($customerId);
+                        $this->customerGroupCache[$customerId] = (int)$customer->getGroupId();
+                    }
+                    return $this->customerGroupCache[$customerId];
                 }
             }
             // For guest users, return the not logged in group ID

app/code/Magento/Customer/Plugin/Model/Group/RetrieverPlugin.php

@@ -35,6 +35,11 @@ class RetrieverPlugin
      */
     private $appState;
 
+    /**
+     * @var array Cache for customer group IDs
+     */
+    private $customerGroupCache = [];
+
     /**
      * @param UserContextInterface $userContext
      * @param CustomerRepositoryInterface $customerRepository
@@ -72,9 +77,11 @@ public function aroundGetCustomerGroupId(
             if ($userType === UserContextInterface::USER_TYPE_CUSTOMER) {
                 $customerId = $this->userContext->getUserId();
                 if ($customerId) {
-                    $customer = $this->customerRepository->getById($customerId);
-                    $customerGroupId = (int)$customer->getGroupId();
-                    return $customerGroupId;
+                    if (!isset($this->customerGroupCache[$customerId])) {
+                        $customer = $this->customerRepository->getById($customerId);
+                        $this->customerGroupCache[$customerId] = (int)$customer->getGroupId();
+                    }
+                    return $this->customerGroupCache[$customerId];
                 }
             }
             return Group::NOT_LOGGED_IN_ID;

app/code/Magento/Customer/Plugin/Model/SessionPlugin.php

@@ -35,6 +35,11 @@ class SessionPlugin
      */
     private $appState;
 
+    /**
+     * @var array Cache for customer group IDs
+     */
+    private $customerGroupCache = [];
+
     /**
      * @param UserContextInterface $userContext
      * @param CustomerRepositoryInterface $customerRepository
@@ -71,9 +76,11 @@ public function aroundGetCustomerGroupId(
             if ($userType === UserContextInterface::USER_TYPE_CUSTOMER) {
                 $customerId = $this->userContext->getUserId();
                 if ($customerId) {
-                    $customer = $this->customerRepository->getById($customerId);
-                    $customerGroupId = (int)$customer->getGroupId();
-                    return $customerGroupId;
+                    if (!isset($this->customerGroupCache[$customerId])) {
+                        $customer = $this->customerRepository->getById($customerId);
+                        $this->customerGroupCache[$customerId] = (int)$customer->getGroupId();
+                    }
+                    return $this->customerGroupCache[$customerId];
                 }
             }
             return Group::NOT_LOGGED_IN_ID;