Internal: Fix conditions to check the value for the document.access_url_specific_files setting

Author: AngelFQC

src/CoreBundle/Controller/ResourceController.php

@@ -13,6 +13,7 @@
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Helpers\AccessUrlHelper;
+use Chamilo\CoreBundle\Helpers\ResourceFileHelper;
 use Chamilo\CoreBundle\Helpers\UserHelper;
 use Chamilo\CoreBundle\Repository\ResourceFileRepository;
 use Chamilo\CoreBundle\Repository\ResourceNodeRepository;
@@ -144,8 +145,7 @@ public function diskSpace(Request $request): Response
     public function view(
         Request $request,
         TrackEDownloadsRepository $trackEDownloadsRepository,
-        SettingsManager $settingsManager,
-        AccessUrlHelper $accessUrlHelper
+        ResourceFileHelper $resourceFileHelper,
     ): Response {
         $id = $request->get('id');
         $resourceFileId = $request->get('resourceFileId');
@@ -161,26 +161,7 @@ public function view(
             $resourceFile = $this->resourceFileRepository->find($resourceFileId);
         }
 
-        if (!$resourceFile) {
-            $accessUrlSpecificFiles = $settingsManager->getSetting('document.access_url_specific_files') && $accessUrlHelper->isMultiple();
-            $currentUrl = $accessUrlHelper->getCurrent()?->getUrl();
-
-            $resourceFiles = $resourceNode->getResourceFiles();
-
-            if ($accessUrlSpecificFiles) {
-                foreach ($resourceFiles as $file) {
-                    if ($file->getAccessUrl() && $file->getAccessUrl()->getUrl() === $currentUrl) {
-                        $resourceFile = $file;
-
-                        break;
-                    }
-                }
-            }
-
-            if (!$resourceFile) {
-                $resourceFile = $resourceFiles->filter(fn ($file) => null === $file->getAccessUrl())->first();
-            }
-        }
+        $resourceFile ??= $resourceFileHelper->resolveResourceFileByAccessUrl($resourceNode);
 
         if (!$resourceFile) {
             throw new FileNotFoundException($this->trans('Resource file not found for the given resource node'));
@@ -254,8 +235,7 @@ public function link(Request $request, RouterInterface $router, CLinkRepository
     public function download(
         Request $request,
         TrackEDownloadsRepository $trackEDownloadsRepository,
-        SettingsManager $settingsManager,
-        AccessUrlHelper $accessUrlHelper
+        ResourceFileHelper $resourceFileHelper,
     ): Response {
         $id = $request->get('id');
         $resourceNode = $this->getResourceNodeRepository()->findOneBy(['uuid' => $id]);
@@ -272,23 +252,7 @@ public function download(
             $this->trans('Unauthorised access to resource')
         );
 
-        $accessUrlSpecificFiles = $settingsManager->getSetting('document.access_url_specific_files') && $accessUrlHelper->isMultiple();
-        $currentUrl = $accessUrlHelper->getCurrent()?->getUrl();
-
-        $resourceFiles = $resourceNode->getResourceFiles();
-        $resourceFile = null;
-
-        if ($accessUrlSpecificFiles) {
-            foreach ($resourceFiles as $file) {
-                if ($file->getAccessUrl() && $file->getAccessUrl()->getUrl() === $currentUrl) {
-                    $resourceFile = $file;
-
-                    break;
-                }
-            }
-        }
-
-        $resourceFile ??= $resourceFiles->filter(fn ($file) => null === $file->getAccessUrl())->first();
+        $resourceFile = $resourceFileHelper->resolveResourceFileByAccessUrl($resourceNode);
 
         // If resource node has a file just download it. Don't download the children.
         if ($resourceFile) {

src/CoreBundle/Helpers/ResourceFileHelper.php

@@ -0,0 +1,44 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Helpers;
+
+use Chamilo\CoreBundle\Entity\ResourceFile;
+use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Settings\SettingsManager;
+
+class ResourceFileHelper
+{
+    public function __construct(
+        private readonly SettingsManager $settingsManager,
+        private readonly AccessUrlHelper $accessUrlHelper,
+    ){}
+
+    public function resolveResourceFileByAccessUrl(ResourceNode $resourceNode): ?ResourceFile
+    {
+        $accessUrlSpecificFiles = 'true' === $this->settingsManager->getSetting('document.access_url_specific_files')
+            && $this->accessUrlHelper->isMultiple();
+
+        $resourceFile = null;
+        $resourceFiles = $resourceNode->getResourceFiles();
+
+        if ($accessUrlSpecificFiles) {
+            $currentUrl = $this->accessUrlHelper->getCurrent()?->getUrl();
+
+            foreach ($resourceFiles as $file) {
+                if ($file->getAccessUrl() && $file->getAccessUrl()->getUrl() === $currentUrl) {
+                    $resourceFile = $file;
+
+                    break;
+                }
+            }
+        }
+
+        $resourceFile ??= $resourceFiles->filter(fn ($file) => null === $file->getAccessUrl())->first();
+
+        return $resourceFile;
+    }
+}