Merge pull request #6212 from christianbeeznest/GH-4735-4

Documents: Fix file upload behavior - refs #4735

Author: christianbeeznest

src/CoreBundle/Controller/Api/BaseResourceFileAction.php

@@ -9,6 +9,7 @@
 use Chamilo\CoreBundle\Component\Utils\CreateUploadedFile;
 use Chamilo\CoreBundle\Entity\AbstractResource;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\ResourceFile;
 use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\ResourceRight;
@@ -27,6 +28,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use ZipArchive;
 
 class BaseResourceFileAction
@@ -189,7 +191,8 @@ public function handleCreateFileRequest(
         ResourceRepository $resourceRepository,
         Request $request,
         EntityManager $em,
-        string $fileExistsOption = ''
+        string $fileExistsOption = '',
+        TranslatorInterface $translator = null
     ): array {
         $contentData = $request->getContent();
 
@@ -253,11 +256,23 @@ public function handleCreateFileRequest(
                         // Check if a document with the same title and parent resource node already exists
                         $existingDocument = $resourceRepository->findByTitleAndParentResourceNode($title, $parentResourceNodeId);
                         if ($existingDocument) {
-                            if ('overwrite' == $fileExistsOption) {
-                                // Perform actions when file exists and 'overwrite' option is selected
-                                $resource->setResourceName($title);
+                            if ('overwrite' === $fileExistsOption) {
                                 $existingDocument->setTitle($title);
                                 $existingDocument->setComment($comment);
+
+                                $resourceNode = $existingDocument->getResourceNode();
+
+                                $resourceFile = $resourceNode->getFirstResourceFile();
+                                if ($resourceFile instanceof ResourceFile) {
+                                    $resourceFile->setFile($uploadedFile);
+                                    $em->persist($resourceFile);
+                                } else {
+                                    $existingDocument->setUploadFile($uploadedFile);
+                                }
+
+                                $resourceNode->setUpdatedAt(new \DateTime());
+                                $existingDocument->setResourceNode($resourceNode);
+
                                 $em->persist($existingDocument);
                                 $em->flush();
 
@@ -282,7 +297,7 @@ public function handleCreateFileRequest(
 
                                 // Return any data you need for further processing
                                 return [
-                                    'title' => $title,
+                                    'title' => $newTitle,
                                     'filetype' => 'file',
                                     'comment' => $comment,
                                 ];
@@ -294,13 +309,10 @@ public function handleCreateFileRequest(
                                 // or perform any other desired actions based on your application's requirements
                                 $resource->setResourceName($title);
                                 $flashBag = $request->getSession()->getFlashBag();
-                                $flashBag->add('warning', 'Upload Already Exists');
+                                $message = $translator ? $translator->trans('upload.already_exists') : 'Upload Already Exists';
+                                $flashBag->add('warning', $message);
 
-                                return [
-                                    'title' => $title,
-                                    'filetype' => 'file',
-                                    'comment' => $comment,
-                                ];
+                                throw new BadRequestHttpException($translator ? $translator->trans('file.already_exists') : 'The file already exists and was not uploaded.');
                             }
 
                             throw new InvalidArgumentException('Invalid fileExistsOption');
@@ -614,8 +626,15 @@ private function formatFolderStructure(array $folderStructure): array
         return $result;
     }
 
+    /**
+     * Generates a unique filename by appending a random suffix.
+     */
     private function generateUniqueTitle(string $title): string
     {
-        return $title.'_'.uniqid();
+        $info = pathinfo($title);
+        $filename = $info['filename'];
+        $extension = isset($info['extension']) ? '.'.$info['extension'] : '';
+
+        return $filename.'_'.uniqid().$extension;
     }
 }

src/CoreBundle/Controller/Api/CreateDocumentFileAction.php

@@ -11,11 +11,17 @@
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CreateDocumentFileAction extends BaseResourceFileAction
 {
-    public function __invoke(Request $request, CDocumentRepository $repo, EntityManager $em, KernelInterface $kernel): CDocument
-    {
+    public function __invoke(
+        Request $request,
+        CDocumentRepository $repo,
+        EntityManager $em,
+        KernelInterface $kernel,
+        TranslatorInterface $translator
+    ): CDocument {
         $isUncompressZipEnabled = $request->get('isUncompressZipEnabled', 'false');
         $fileExistsOption = $request->get('fileExistsOption', 'rename');
 
@@ -24,7 +30,7 @@ public function __invoke(Request $request, CDocumentRepository $repo, EntityMana
         if ('true' === $isUncompressZipEnabled) {
             $result = $this->handleCreateFileRequestUncompress($document, $request, $em, $kernel);
         } else {
-            $result = $this->handleCreateFileRequest($document, $repo, $request, $em, $fileExistsOption);
+            $result = $this->handleCreateFileRequest($document, $repo, $request, $em, $fileExistsOption, $translator);
         }
 
         $document->setTitle($result['title']);