MC-31551: Category images are broken after migrating to 2.3.4

- refactor resolver

Author: cpartica

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -383,13 +384,21 @@ public function testMinimumMatchQueryLength()
     /**
      * Test category image full name is returned
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_long_image_name.php
      */
     public function testCategoryImageName()
     {
+        /** @var CategoryCollection $categoryCollection */
+        $categoryCollection = $this->objectManager->get(CategoryCollection::class);
+        $categoryModel = $categoryCollection
+            ->addAttributeToSelect('image')
+            ->addAttributeToFilter('name', ['eq' => 'Parent Image Category'])
+            ->getFirstItem();
+        $categoryId = $categoryModel->getId();
+
         $query = <<<QUERY
     {
-categoryList(filters: {ids: {in: ["333"]}}) {
+categoryList(filters: {ids: {in: ["$categoryId"]}}) {
   id
   name
   image
@@ -406,7 +415,7 @@ public function testCategoryImageName()
         $categoryList = $response['categoryList'];
         $this->assertArrayNotHasKey('errors', $response);
         $this->assertNotEmpty($response['categoryList']);
-        $this->assertEquals('Category 1', $categoryList[0]['name']);
+        $this->assertEquals('Parent Image Category', $categoryList[0]['name']);
         $this->assertEquals($expectedImageUrl, $categoryList[0]['image']);
     }
 

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_long_image_name.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require 'catalog_category_image.php';
+
+/** @var $category \Magento\Catalog\Model\Category */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$categoryParent = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryParent->setName('Parent Image Category')
+    ->setPath('1/2')
+    ->setLevel(2)
+    ->setImage($filePathLong)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->save();
+
+$categoryChild = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$categoryChild->setName('Child Image Category')
+    ->setPath($categoryParent->getPath())
+    ->setLevel(3)
+    ->setImage($fileNameLong)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(2)
+    ->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/catalog_category_with_long_image_name_rollback.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('name', ['in' => ['Parent Image Category', 'Child Image Category']])
+    ->load()
+    ->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);