Merge remote-tracking branch '36590/fix-for-issue-36431' into comm_voted_v3

Author: engcom-Charlie

app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php

@@ -476,10 +476,19 @@ private function retrieveGroupValue(string $code)
             $item = array_shift($items);
 
             if (!$item) {
+                $this->customerGroupsByCode[$code] = false;
                 return false;
             }
 
-            $this->customerGroupsByCode[strtolower($item->getCode())] = $item->getId();
+            $itemCode = $item->getCode();
+            $itemId = $item->getId();
+
+            if (strtolower($itemCode) !== $code) {
+                $this->customerGroupsByCode[$code] = false;
+                return false;
+            }
+
+            $this->customerGroupsByCode[strtolower($itemCode)] = $itemId;
         }
 
         return $this->customerGroupsByCode[$code];

app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php

@@ -91,8 +91,7 @@ public function execute()
                 ? [] : $this->getRequest()->getParam('customer_group_excluded_websites');
             $resultRedirect = $this->resultRedirectFactory->create();
             try {
-                $customerGroupCode = (string)$this->getRequest()->getParam('code');
-
+                $customerGroupCode = trim((string)$this->getRequest()->getParam('code'));
                 if ($id !== null) {
                     $customerGroup = $this->groupRepository->getById((int)$id);
                     $customerGroupCode = $customerGroupCode ?: $customerGroup->getCode();

dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php

@@ -18,6 +18,10 @@ class TierPriceStorageTest extends WebapiAbstract
     private const SERVICE_NAME = 'catalogTierPriceStorageV1';
     private const SERVICE_VERSION = 'V1';
     private const SIMPLE_PRODUCT_SKU = 'simple';
+    private const CUSTOMER_ALL_GROUPS_NAME ='ALL GROUPS';
+    private const CUSTOMER_GENERAL_GROUP_NAME ='General';
+    private const CUSTOMER_NOT_LOGGED_IN_GROUP_NAME ='NOT LOGGED IN';
+    private const WRONG_CUSTOMER_GROUP_NAME ='general';
 
     /**
      * @var \Magento\TestFramework\ObjectManager
@@ -89,15 +93,15 @@ public function testUpdate()
             'price_type' => TierPriceInterface::PRICE_TYPE_DISCOUNT,
             'website_id' => 0,
             'sku' => self::SIMPLE_PRODUCT_SKU,
-            'customer_group' => 'ALL GROUPS',
+            'customer_group' => self::CUSTOMER_ALL_GROUPS_NAME,
             'quantity' => 7778
         ];
         $updatedPrice = [
             'price' => 778,
             'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
             'website_id' => 0,
             'sku' => self::SIMPLE_PRODUCT_SKU,
-            'customer_group' => 'not logged in',
+            'customer_group' => self::CUSTOMER_NOT_LOGGED_IN_GROUP_NAME,
             'quantity' => $tierPrice->getQty()
         ];
         $response = $this->_webApiCall($serviceInfo, ['prices' => [$updatedPrice, $newPrice]]);
@@ -178,15 +182,15 @@ public function testReplaceWithoutErrorMessage()
                 'price_type' => TierPriceInterface::PRICE_TYPE_DISCOUNT,
                 'website_id' => 0,
                 'sku' => self::SIMPLE_PRODUCT_SKU,
-                'customer_group' => 'general',
+                'customer_group' => self::CUSTOMER_GENERAL_GROUP_NAME,
                 'quantity' => 7778
             ],
             [
                 'price' => 70,
                 'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
                 'website_id' => 0,
                 'sku' => self::SIMPLE_PRODUCT_SKU,
-                'customer_group' => 'not logged in',
+                'customer_group' => self::CUSTOMER_NOT_LOGGED_IN_GROUP_NAME,
                 'quantity' => 33
             ]
         ];
@@ -222,15 +226,15 @@ public function testReplaceWithErrorMessage()
                 'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
                 'website_id' => 0,
                 'sku' => self::SIMPLE_PRODUCT_SKU,
-                'customer_group' => 'general',
+                'customer_group' => self::WRONG_CUSTOMER_GROUP_NAME,
                 'quantity' => 2
             ],
             [
                 'price' => 20.62,
                 'price_type' => TierPriceInterface::PRICE_TYPE_FIXED,
                 'website_id' => 0,
                 'sku' => self::SIMPLE_PRODUCT_SKU,
-                'customer_group' => 'general',
+                'customer_group' => self::WRONG_CUSTOMER_GROUP_NAME,
                 'quantity' => 2
             ]
         ];
@@ -264,8 +268,8 @@ public function testDelete()
                 ? TierPriceInterface::PRICE_TYPE_DISCOUNT
                 : TierPriceInterface::PRICE_TYPE_FIXED;
             $customerGroup = $tierPrice->getCustomerGroupId() == \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID
-                ? 'NOT LOGGED IN'
-                : 'ALL GROUPS';
+                ? self::CUSTOMER_NOT_LOGGED_IN_GROUP_NAME
+                : self::CUSTOMER_ALL_GROUPS_NAME;
             $pricesToDelete[] = [
                 'price' => $tierPriceValue,
                 'price_type' => $priceType,