MC-37665: Updating a category through the REST API will uncheck "Use Default Value" on a bunch of attributes

Author: Viktor Kopin

app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php

@@ -42,6 +42,11 @@ class PopulateWithValues
      */
     private $filterBuilder;
 
+    /**
+     * @var AttributeInterface[]
+     */
+    private $attributes;
+
     /**
      * @param ScopeOverriddenValue $scopeOverriddenValue
      * @param AttributeRepository $attributeRepository
@@ -120,8 +125,12 @@ function () {
      *
      * @return AttributeInterface[]
      */
-    private function getAttributes()
+    private function getAttributes(): array
     {
+        if ($this->attributes) {
+            return $this->attributes;
+        }
+
         $searchResult = $this->attributeRepository->getList(
             $this->searchCriteriaBuilder->addFilters(
                 [
@@ -133,11 +142,12 @@ private function getAttributes()
                 ]
             )->create()
         );
-        $result = [];
+
+        $this->attributes = [];
         foreach ($searchResult->getItems() as $attribute) {
-            $result[$attribute->getAttributeCode()] = $attribute;
+            $this->attributes[$attribute->getAttributeCode()] = $attribute;
         }
 
-        return $result;
+        return $this->attributes;
     }
 }