Fixing call and queries with references to resourceNode.resourceFiles #5600

AngelFQC · AngelFQC · commit fac8decbe28a · 2024-07-02T18:18:35.000-05:00
diff --git a/public/main/exercise/annotation_user.php b/public/main/exercise/annotation_user.php
@@ -26,7 +26,7 @@
 
 $answer_type = $objQuestion->getType(); //very important
 
-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();
+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();
 $pictureWidth = $resourceFile->getWidth();
 $pictureHeight = $resourceFile->getHeight();
 $imagePath = $questionRepo->getHotSpotImageUrl($objQuestion);
diff --git a/public/main/exercise/hotspot_actionscript.as.php b/public/main/exercise/hotspot_actionscript.as.php
@@ -36,7 +36,7 @@
 if (!$objQuestion->getResourceNode()->hasResourceFile()) {
     api_not_allowed();
 }
-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();
+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();
 $pictureWidth = $resourceFile->getWidth();
 $pictureHeight = $resourceFile->getHeight();
 $imagePath = $questionRepo->getHotSpotImageUrl($objQuestion).'?'.api_get_cidreq();
diff --git a/public/main/exercise/hotspot_actionscript_admin.as.php b/public/main/exercise/hotspot_actionscript_admin.as.php
@@ -32,7 +32,7 @@
 if (!$objQuestion->getResourceNode()->hasResourceFile()) {
     api_not_allowed();
 }
-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();
+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();
 $pictureWidth = $resourceFile->getWidth();
 $pictureHeight = $resourceFile->getHeight();
 $imagePath = $questionRepo->getHotSpotImageUrl($objQuestion).'?'.api_get_cidreq();
diff --git a/public/main/exercise/hotspot_answers.as.php b/public/main/exercise/hotspot_answers.as.php
@@ -60,7 +60,7 @@
 $answer_type = $objQuestion->getType(); //very important
 $TBL_ANSWERS = Database::get_course_table(TABLE_QUIZ_ANSWER);
 
-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();
+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();
 $pictureWidth = $resourceFile->getWidth();
 $pictureHeight = $resourceFile->getHeight();
 $imagePath = $questionRepo->getHotSpotImageUrl($objQuestion).'?'.api_get_cidreq();
diff --git a/public/main/gradebook/lib/be/category.class.php b/public/main/gradebook/lib/be/category.class.php
@@ -2077,7 +2077,7 @@ public static function generateUserCertificate(
 
         $html = [];
         if (!empty($my_certificate)) {
-            $pathToCertificate = $category->getDocument()->getResourceNode()->getResourceFile()->getFile()->getPathname();
+            $pathToCertificate = $category->getDocument()->getResourceNode()->getResourceFiles()->first()->getFile()->getPathname();
 
             $certificate_obj = new Certificate(
                 $my_certificate['id'],
diff --git a/public/main/inc/lib/CourseChatUtils.php b/public/main/inc/lib/CourseChatUtils.php
@@ -485,13 +485,7 @@ public function readMessages($reset = false, $friendId = 0)
             $resourceNode = $resource->getResourceNode();
         }
 
-        if ($resourceNode->hasResourceFile()) {
-            //$resourceFile = $resourceNode->getResourceFile();
-            //$fileName = $this->getFilename($resourceFile);
-            return $this->repository->getResourceNodeFileContent($resourceNode);
-        }
-
-        return '';
+        return $this->repository->getResourceNodeFileContent($resourceNode);
 
         $remove = 0;
         $content = [];
diff --git a/public/main/inc/lib/document.lib.php b/public/main/inc/lib/document.lib.php
@@ -2272,7 +2272,6 @@ class="moved ui-sortable-handle link_with_id"
             ->from(ResourceNode::class, 'node')
             ->innerJoin('node.resourceType', 'type')
             ->innerJoin('node.resourceLinks', 'links')
-            ->leftJoin('node.resourceFile', 'file')
             ->where('type = :type')
             ->andWhere('links.course = :course')
             ->setParameters(['type' => $type, 'course' => $course])
diff --git a/public/main/lp/learnpath.class.php b/public/main/lp/learnpath.class.php
@@ -8748,10 +8748,6 @@ private function getSavedFinalItem()
         /** @var CDocument $document */
         $document = $repo->find($finalItem->path);
 
-        if ($document && $document->getResourceNode()->hasResourceFile()) {
-            return $repo->getResourceFileContent($document);
-        }
-
-        return '';
+        return $document ? $repo->getResourceFileContent($document) : '';
     }
 }
diff --git a/public/main/lp/learnpathItem.class.php b/public/main/lp/learnpathItem.class.php
@@ -4035,7 +4035,7 @@ public function addAudio()
         );*/
 
         if ($document) {
-            $name = '/audio/'.$document->getResourceNode()->getResourceFile()->getOriginalName();
+            $name = '/audio/'.$document->getResourceNode()->getResourceFiles()->first()->getOriginalName();
             // Store the mp3 file in the lp_item table.
             $table = Database::get_course_table(TABLE_LP_ITEM);
             $sql = "UPDATE $table SET
diff --git a/public/main/lp/lp_edit.php b/public/main/lp/lp_edit.php
@@ -333,8 +333,11 @@ function activate_end_date() {
     }
 
     if (isset($_REQUEST['remove_picture']) && $_REQUEST['remove_picture']) {
-        if ($lp->getResourceNode()->hasResourceFile()) {
-            $lp->getResourceNode()->setResourceFile(null);
+        $resourceFiles = $lp->getResourceNode()->getResourceFiles();
+
+        foreach ($resourceFiles as $resourceFile) {
+            $em->remove($resourceFile);
+            $em->flush();
         }
     }
 
diff --git a/public/main/work/work.lib.php b/public/main/work/work.lib.php
@@ -3987,7 +3987,7 @@ function getWorkComment(CStudentPublicationComment $commentEntity, array $course
             $filePath = '';
             $deleteUrl = api_get_path(WEB_CODE_PATH).
                 'work/view.php?'.api_get_cidreq().'&id='.$workId.'&action=delete_attachment&comment_id='.$id;
-            $fileName = $commentEntity->getResourceNode()->getResourceFile()->getTitle();
+            $fileName = $commentEntity->getResourceNode()->getResourceFiles()->first()->getTitle();
         }
         $comment['comment'] = $commentEntity->getComment();
         $comment['delete_file_url'] = $deleteUrl;
@@ -4016,10 +4016,7 @@ function deleteCommentFile($id, $courseInfo = [])
     /** @var CStudentPublicationComment $commentEntity */
     $commentEntity = $repo->findOneBy($criteria);
 
-    if ($commentEntity->getResourceNode()->hasResourceFile()) {
-        $file = $commentEntity->getResourceNode()->getResourceFile();
-
-        $commentEntity->getResourceNode()->setResourceFile(null);
+    foreach ($commentEntity->getResourceNode()->getResourceFiles() as $file) {
         $em->remove($file);
         $em->flush();
     }
@@ -5969,7 +5966,7 @@ function getFileContents($id, $courseInfo, $sessionId = 0, $correction = false,
             $title = $titleCorrection = $studentPublication->getCorrection()->getTitle();
         }
         if ($hasFile) {
-            $title = $studentPublication->getResourceNode()->getResourceFile()->getTitle();
+            $title = $studentPublication->getResourceNode()->getResourceFiles()->first()->getTitle();
         }
 
         $title = str_replace(' ', '_', $title);
diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php
@@ -28,6 +28,7 @@
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Filesystem\Exception\FileNotFoundException;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -251,12 +252,17 @@ public function download(Request $request, EntityManagerInterface $entityManager
         $type = $repo->getResourceType();
 
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->neq('resourceFile', null)) // must have a file
+            ->where(Criteria::expr()->neq('resourceFiles', null)) // must have a file
             ->andWhere(Criteria::expr()->eq('resourceType', $type)) // only download same type
         ;
 
         $qb = $resourceNodeRepo->getChildrenQueryBuilder($resourceNode);
-        $qb->addCriteria($criteria);
+        $qbAlias = $qb->getRootAliases()[0];
+
+        $qb
+            ->leftJoin(sprintf('%s.resourceFiles', $qbAlias), 'resourceFiles') // must have a file
+            ->addCriteria($criteria)
+        ;
 
         /** @var ArrayCollection|ResourceNode[] $children */
         $children = $qb->getQuery()->getResult();
diff --git a/src/CoreBundle/Entity/ResourceNode.php b/src/CoreBundle/Entity/ResourceNode.php
@@ -68,7 +68,7 @@
         ],
     ]
 )]
-#[ApiFilter(filterClass: OrderFilter::class, properties: ['id', 'title', 'resourceFile', 'createdAt', 'updatedAt'])]
+#[ApiFilter(filterClass: OrderFilter::class, properties: ['id', 'title', 'createdAt', 'updatedAt'])]
 #[ApiFilter(filterClass: PropertyFilter::class)]
 #[ApiFilter(filterClass: SearchFilter::class, properties: ['title' => 'partial'])]
 class ResourceNode implements Stringable
@@ -186,7 +186,13 @@ class ResourceNode implements Stringable
      *
      * @var Collection<int, ResourceFile>
      */
-    #[ORM\OneToMany(mappedBy: 'resourceNode', targetEntity: ResourceFile::class, cascade: ['persist'])]
+    #[Groups(['resource_node:read', 'resource_node:write', 'document:read', 'document:write', 'message:read'])]
+    #[ORM\OneToMany(
+        mappedBy: 'resourceNode',
+        targetEntity: ResourceFile::class,
+        cascade: ['persist', 'remove'],
+        fetch: 'EXTRA_LAZY',
+    )]
     private Collection $resourceFiles;
 
     public function __construct()
diff --git a/src/CoreBundle/Repository/Node/IllustrationRepository.php b/src/CoreBundle/Repository/Node/IllustrationRepository.php
@@ -92,7 +92,7 @@ public function getIllustrationNodeFromParent(ResourceNode $resourceNode): ?Reso
             ->select('node')
             ->from(ResourceNode::class, 'node')
             ->innerJoin('node.resourceType', 'type')
-            ->innerJoin('node.resourceFile', 'file')
+            ->innerJoin('node.resourceFiles', 'file')
             ->where('node.parent = :parent')
             ->andWhere('type.title = :name')
             ->setParameters([
diff --git a/src/CoreBundle/Repository/ResourceNodeRepository.php b/src/CoreBundle/Repository/ResourceNodeRepository.php
@@ -142,7 +142,7 @@ public function getSize(ResourceNode $resourceNode, ResourceType $type, ?Course
     {
         $qb = $this->createQueryBuilder('node')
             ->select('SUM(file.size) as total')
-            ->innerJoin('node.resourceFile', 'file')
+            ->innerJoin('node.resourceFiles', 'file')
             ->innerJoin('node.resourceLinks', 'l')
             ->where('node.resourceType = :type')
             ->andWhere('node.parent = :parentNode')
diff --git a/src/CoreBundle/Repository/ResourceRepository.php b/src/CoreBundle/Repository/ResourceRepository.php
@@ -366,7 +366,7 @@ public function getResources(?ResourceNode $parentNode = null): QueryBuilder
             ->innerJoin('resource.resourceNode', 'node')
             ->innerJoin('node.resourceLinks', 'links')
             ->innerJoin('node.resourceType', 'type')
-            ->leftJoin('node.resourceFile', 'file')
+            ->leftJoin('node.resourceFiles', 'file')
             ->where('type.title = :type')
             ->setParameter('type', $resourceTypeName, Types::STRING)
             ->addSelect('node')
@@ -695,7 +695,7 @@ public function getTotalSpaceByCourse(Course $course, ?CGroup $group = null, ?Se
             ->select('SUM(file.size) as total')
             ->innerJoin('resource.resourceNode', 'node')
             ->innerJoin('node.resourceLinks', 'l')
-            ->innerJoin('node.resourceFile', 'file')
+            ->innerJoin('node.resourceFiles', 'file')
             ->where('l.course = :course')
             ->andWhere('file IS NOT NULL')
             ->setParameters(
diff --git a/tests/CoreBundle/Repository/MessageRepositoryTest.php b/tests/CoreBundle/Repository/MessageRepositoryTest.php
@@ -346,9 +346,11 @@ public function testCreateMessageWithAttachment(): void
                         '@type' => 'http://schema.org/MediaObject',
                         'resourceNode' => [
                             '@type' => 'ResourceNode',
-                            'resourceFile' => [
-                                '@type' => 'http://schema.org/MediaObject',
-                                '@id' => $resourceFileId,
+                            'resourceFiles' => [
+                                [
+                                    '@type' => 'http://schema.org/MediaObject',
+                                    '@id' => $resourceFileId,
+                                ],
                             ],
                         ],
                     ],
diff --git a/tests/CoreBundle/Repository/MessageTagRepositoryTest.php b/tests/CoreBundle/Repository/MessageTagRepositoryTest.php
@@ -7,6 +7,7 @@
 namespace Chamilo\Tests\CoreBundle\Repository;
 
 use Chamilo\CoreBundle\Entity\MessageTag;
+use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\MessageTagRepository;
 use Chamilo\CoreBundle\Repository\Node\UserRepository;
 use Chamilo\Tests\AbstractApiTest;
@@ -19,6 +20,7 @@ class MessageTagRepositoryTest extends AbstractApiTest
 
     public function testCreateTagAndDeleteUser(): void
     {
+        Container::$container = self::getContainer();
         $tagRepo = self::getContainer()->get(MessageTagRepository::class);
 
         $testUser = $this->createUser('test');

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`if (!$objQuestion->getResourceNode()->hasResourceFile()) {`
`37`	`37`	`api_not_allowed();`
`38`	`38`	`}`
`39`		`-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();`
	`39`	`+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();`
`40`	`40`	`$pictureWidth = $resourceFile->getWidth();`
`41`	`41`	`$pictureHeight = $resourceFile->getHeight();`
`42`	`42`	`$imagePath = $questionRepo->getHotSpotImageUrl($objQuestion).'?'.api_get_cidreq();`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`if (!$objQuestion->getResourceNode()->hasResourceFile()) {`
`33`	`33`	`api_not_allowed();`
`34`	`34`	`}`
`35`		`-$resourceFile = $objQuestion->getResourceNode()->getResourceFile();`
	`35`	`+$resourceFile = $objQuestion->getResourceNode()->getResourceFiles()->first();`
`36`	`36`	`$pictureWidth = $resourceFile->getWidth();`
`37`	`37`	`$pictureHeight = $resourceFile->getHeight();`
`38`	`38`	`$imagePath = $questionRepo->getHotSpotImageUrl($objQuestion).'?'.api_get_cidreq();`
Original file line number	Diff line number	Diff line change
`@@ -8748,10 +8748,6 @@ private function getSavedFinalItem()`
`8748`	`8748`	`/** @var CDocument $document */`
`8749`	`8749`	`$document = $repo->find($finalItem->path);`
`8750`	`8750`
`8751`		`- if ($document && $document->getResourceNode()->hasResourceFile()) {`
`8752`		`- return $repo->getResourceFileContent($document);`
`8753`		`- }`
`8754`		`-`
`8755`		`- return '';`
	`8751`	`+ return $document ? $repo->getResourceFileContent($document) : '';`
`8756`	`8752`	`}`
`8757`	`8753`	`}`
Original file line number	Diff line number	Diff line change
`@@ -333,8 +333,11 @@ function activate_end_date() {`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`if (isset($_REQUEST['remove_picture']) && $_REQUEST['remove_picture']) {`
`336`		`- if ($lp->getResourceNode()->hasResourceFile()) {`
`337`		`- $lp->getResourceNode()->setResourceFile(null);`
	`336`	`+ $resourceFiles = $lp->getResourceNode()->getResourceFiles();`
	`337`	`+`
	`338`	`+ foreach ($resourceFiles as $resourceFile) {`
	`339`	`+ $em->remove($resourceFile);`
	`340`	`+ $em->flush();`
`338`	`341`	`}`
`339`	`342`	`}`
`340`	`343`