making changes for Upload category image with same image name issue #17661

Author: aman3103

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -167,10 +167,13 @@ private function fileResidesOutsideCategoryDir($value)
     public function afterSave($object)
     {
         $value = $object->getData($this->additionalData . $this->getAttribute()->getName());
-
+               
         if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
             try {
-                $this->getImageUploader()->moveFileFromTmp($imageName);
+                $imageName = $this->getImageUploader()->moveFileFromTmp($imageName);                
+                $attributeName = $this->getAttribute()->getName();                                              
+                $object->setData($attributeName, $imageName);                                
+                $this->getAttribute()->getEntity()->saveAttribute($object, $attributeName);                                
             } catch (\Exception $e) {
                 $this->_logger->critical($e);
             }

app/code/Magento/Catalog/Model/ImageUploader.php

@@ -200,10 +200,21 @@ public function moveFileFromTmp($imageName)
     {
         $baseTmpPath = $this->getBaseTmpPath();
         $basePath = $this->getBasePath();
-
+        
         $baseImagePath = $this->getFilePath($basePath, $imageName);
         $baseTmpImagePath = $this->getFilePath($baseTmpPath, $imageName);
-
+        
+        $destinationFileAbsolutePath = $this->mediaDirectory->getAbsolutePath($baseImagePath);
+        $fileInfo = pathinfo($destinationFileAbsolutePath);
+        if (file_exists($destinationFileAbsolutePath)) {
+            $index = 1;
+            $imageName = $fileInfo['filename'] . '.' . $fileInfo['extension'];
+            while (file_exists($fileInfo['dirname'] . '/' . $imageName)) {
+                $imageName = $fileInfo['filename'] . '_' . $index . '.' . $fileInfo['extension'];
+                $index++;
+            }            
+            $baseImagePath = $this->getFilePath($basePath, $imageName);
+        }           
         try {
             $this->coreFileStorageDatabase->copyFile(
                 $baseTmpImagePath,
@@ -222,7 +233,7 @@ public function moveFileFromTmp($imageName)
         return $imageName;
     }
 
-    /**
+        /**
      * Checking file for save and save it to tmp dir
      *
      * @param string $fileId
@@ -233,16 +244,16 @@ public function moveFileFromTmp($imageName)
      */
     public function saveFileToTmpDir($fileId)
     {
-        $baseTmpPath = $this->getBaseTmpPath();
+        $baseTmpPath = $this->getBaseTmpPath();        
 
         /** @var \Magento\MediaStorage\Model\File\Uploader $uploader */
         $uploader = $this->uploaderFactory->create(['fileId' => $fileId]);
         $uploader->setAllowedExtensions($this->getAllowedExtensions());
         $uploader->setAllowRenameFiles(true);
         if (!$uploader->checkMimeType($this->allowedMimeTypes)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('File validation failed.'));
-        }
-        $result = $uploader->save($this->mediaDirectory->getAbsolutePath($baseTmpPath));
+        }                         
+        $result = $uploader->save($this->mediaDirectory->getAbsolutePath($baseTmpPath));              
         unset($result['path']);
 
         if (!$result) {