Internal: Add tracking to all resource event - refs #6134

assets/vue/services/linkService.js

@@ -68,8 +68,8 @@ export default {
    */
   toggleLinkVisibility: async (linkId, visible, cid, sid) => {
     const endpoint = `${ENTRYPOINT}links/${linkId}/toggle_visibility?cid=${cid}&sid=${sid}`
-
-    return baseService.put(endpoint, { visible })
+    const response = await axios.put(endpoint, { visible })
+    return response.data
   },
 
   /**

assets/vue/views/links/LinksList.vue

@@ -217,6 +217,7 @@ const categoryToDelete = ref(null)
 const isLoading = ref(true)
 
 const linkValidationResults = ref({})
+const isToggling = ref({})
 
 onMounted(async () => {
   isAllowedToEdit.value = await checkIsAllowedToEdit(true, true, true)
@@ -266,17 +267,28 @@ async function checkLink(id, url) {
 }
 
 async function toggleVisibility(link) {
+  if (isToggling.value[link.iid]) return
+  isToggling.value = { ...isToggling.value, [link.iid]: true }
+
   try {
-    const visibility = toggleVisibilityProperty(!link.linkVisible)
-    let newLink = await linkService.toggleLinkVisibility(link.iid, isVisible(visibility), cid, sid)
-    notifications.showSuccessNotification(t("Link visibility updated"))
-    Object.values(categories.value)
-      .map((c) => c.links)
-      .flat()
+    const newVisible = !isVisible(link.linkVisible)
+    const updatedLink = await linkService.toggleLinkVisibility(link.iid, newVisible, cid, sid)
+    const newFlagValue = visibilityFromBoolean(updatedLink.linkVisible)
+
+    linksWithoutCategory.value
       .filter((l) => l.iid === link.iid)
-      .forEach((l) => (l.linkVisible = visibilityFromBoolean(newLink.linkVisible)))
-  } catch (error) {
+      .forEach((l) => (l.linkVisible = newFlagValue))
+
+    categories.value
+      .flatMap((c) => c.links || [])
+      .filter((l) => l.iid === link.iid)
+      .forEach((l) => (l.linkVisible = newFlagValue))
+
+    notifications.showSuccessNotification(t("Link visibility updated"))
+  } catch (err) {
     notifications.showErrorNotification(t("Could not change visibility of link"))
+  } finally {
+    isToggling.value = { ...isToggling.value, [link.iid]: false }
   }
 }
 

public/main/exercise/exercise.class.php

@@ -10,6 +10,7 @@
 use Chamilo\CoreBundle\Entity\TrackEHotspot;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\ResourceLinkRepository;
+use Chamilo\CoreBundle\Repository\TrackEDefaultRepository;
 use Chamilo\CourseBundle\Entity\CQuizCategory;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Chamilo\CourseBundle\Entity\CQuizRelQuestionCategory;
@@ -1851,6 +1852,21 @@ public function delete()
             GradebookUtils::remove_resource_from_course_gradebook($linkInfo['id']);
         }
 
+        // Register resource deletion manually because this is a soft delete (active = -1)
+        // and Doctrine does not trigger postRemove in this case.
+        /* @var TrackEDefaultRepository $trackRepo */
+        $trackRepo = Container::$container->get(TrackEDefaultRepository::class);
+        $resourceNode = $exercise->getResourceNode();
+        if ($resourceNode) {
+            $trackRepo->registerResourceEvent(
+                $resourceNode,
+                'deletion',
+                api_get_user_id(),
+                api_get_course_int_id(),
+                api_get_session_id()
+            );
+        }
+
         return true;
     }
 

public/main/forum/forumfunction.inc.php

@@ -9,6 +9,7 @@
 use Chamilo\CoreBundle\Entity\Session as SessionEntity;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Framework\Container;
+use Chamilo\CoreBundle\Repository\TrackEDefaultRepository;
 use Chamilo\CourseBundle\Entity\CForum;
 use Chamilo\CourseBundle\Entity\CForumAttachment;
 use Chamilo\CourseBundle\Entity\CForumCategory;
@@ -131,7 +132,7 @@ function handleForum($url)
                     if ('visible' === $action) {
                         $repo->setVisibilityPublished($resource, $course, $session);
                     } else {
-                        $repo->setVisibilityPending($resource);
+                        $repo->setVisibilityPending($resource, $course, $session);
                     }
 
                     if ('visible' === $action) {
@@ -149,6 +150,13 @@ function handleForum($url)
                 if ($resource) {
                     $linksRepo->removeByResourceInContext($resource, $course, $session);
 
+                    // Manually register thread deletion event because the resource is not removed via Doctrine
+                    $trackRepo = Container::$container->get(TrackEDefaultRepository::class);
+                    $node = $resource->getResourceNode();
+                    if ($node) {
+                        $trackRepo->registerResourceEvent($node, 'deletion', api_get_user_id(), api_get_course_int_id(), api_get_session_id());
+                    }
+
                     Display::addFlash(
                         Display::return_message(get_lang('Forum category deleted'), 'confirmation', false)
                     );
@@ -160,6 +168,13 @@ function handleForum($url)
                 if ($resource) {
                     $linksRepo->removeByResourceInContext($resource, $course, $session);
 
+                    // Register forum deletion manually as it's not deleted via Doctrine
+                    $trackRepo = Container::$container->get(TrackEDefaultRepository::class);
+                    $node = $resource->getResourceNode();
+                    if ($node) {
+                        $trackRepo->registerResourceEvent($node, 'deletion', api_get_user_id(), api_get_course_int_id(), api_get_session_id());
+                    }
+
                     Display::addFlash(Display::return_message(get_lang('Forum deleted'), 'confirmation', false));
                 }
 
@@ -183,6 +198,14 @@ function handleForum($url)
                         $link_id = $link_info['id'];
                         GradebookUtils::remove_resource_from_course_gradebook($link_id);
                     }
+
+                    // Manually register thread deletion event because the resource is not removed via Doctrine
+                    $trackRepo = Container::$container->get(TrackEDefaultRepository::class);
+                    $node = $resource->getResourceNode();
+                    if ($node) {
+                        $trackRepo->registerResourceEvent($node, 'deletion', api_get_user_id(), api_get_course_int_id(), api_get_session_id());
+                    }
+
                     Display::addFlash(Display::return_message(get_lang('Thread deleted'), 'confirmation', false));
                 }
 
@@ -856,22 +879,34 @@ function deletePost(CForumPost $post): void
     $em->remove($post);
     $em->flush();
 
-    $lastPostOfTheTread = getLastPostOfThread($post->getThread()->getIid());
+    $threadId = $post->getThread()->getIid();
+    $lastPostOfTheTread = getLastPostOfThread($threadId);
 
     if (!empty($lastPostOfTheTread)) {
-        // Decreasing the number of replies for this thread and also changing the last post information.
-        $sql = "UPDATE $table_threads
-                SET
-                    thread_replies = thread_replies - 1,
-                    thread_last_post = ".$lastPostOfTheTread['iid'].",
-                    thread_date = '".$lastPostOfTheTread['post_date']."'
-                WHERE iid = ".$post->getThread()->getIid();
+        // Decreasing the number of replies only if > 0
+        $threadReplies = Database::fetch_array(Database::query("SELECT thread_replies FROM $table_threads WHERE iid = $threadId"));
+        $replyCount = (int) $threadReplies['thread_replies'];
+
+        if ($replyCount > 0) {
+            $sql = "UPDATE $table_threads
+                    SET
+                        thread_replies = thread_replies - 1,
+                        thread_last_post = ".$lastPostOfTheTread['iid'].",
+                        thread_date = '".$lastPostOfTheTread['post_date']."'
+                    WHERE iid = $threadId";
+        } else {
+            $sql = "UPDATE $table_threads
+                    SET
+                        thread_last_post = ".$lastPostOfTheTread['iid'].",
+                        thread_date = '".$lastPostOfTheTread['post_date']."'
+                    WHERE iid = $threadId";
+        }
+
         Database::query($sql);
         Display::addFlash(Display::return_message(get_lang('Post has been deleted')));
     } else {
         // We deleted the very last post of the thread, so we need to delete the thread as well.
-        $sql = "DELETE FROM $table_threads
-                WHERE iid = ".$post->getThread()->getIid();
+        $sql = "DELETE FROM $table_threads WHERE iid = $threadId";
         Database::query($sql);
 
         Display::addFlash(Display::return_message(get_lang('Thread deleted')));
@@ -3138,22 +3173,24 @@ function updateThreadInfo($threadId, $lastPostId, $post_date)
     Database::query($sql);
 }
 
-function approvePost(CForumPost $post, $action)
+function approvePost(CForumPost $post, $action): string
 {
     if ('invisible' === $action) {
         $visibility = 0;
+        $message = 'PostMadeInvisible';
     }
 
     if ('visible' === $action) {
         $visibility = 1;
         handle_mail_cue('post', $post->getIid());
+        $message = 'PostMadeVisible';
     }
 
     $post->setVisible($visibility);
     Database::getManager()->persist($post);
     Database::getManager()->flush();
 
-    Display::addFlash(Display::return_message(get_lang('The visibility has been changed')));
+    return $message;
 }
 
 /**

public/main/lp/learnpath.class.php

@@ -9,6 +9,7 @@
 use Chamilo\CoreBundle\Entity\Session as SessionEntity;
 use Chamilo\CoreBundle\Event\Events;
 use Chamilo\CoreBundle\Event\LearningPathEndedEvent;
+use Chamilo\CoreBundle\Repository\TrackEDefaultRepository;
 use Chamilo\CoreBundle\ServiceHelper\ThemeHelper;
 use Chamilo\CourseBundle\Entity\CLpRelUser;
 use Chamilo\CoreBundle\Framework\Container;
@@ -793,33 +794,6 @@ public function delete($courseInfo = null, $id = null, $delete = 'keep')
 
         $course = api_get_course_entity();
         $session = api_get_session_entity();
-
-        //$lp_item = Database::get_course_table(TABLE_LP_ITEM);
-        //$lp_view = Database::get_course_table(TABLE_LP_VIEW);
-        //$lp_item_view = Database::get_course_table(TABLE_LP_ITEM_VIEW);
-
-        // Delete lp item id.
-        //foreach ($this->items as $lpItemId => $dummy) {
-        //    $sql = "DELETE FROM $lp_item_view
-        //            WHERE lp_item_id = '".$lpItemId."'";
-        //    Database::query($sql);
-        //}
-
-        // Proposed by Christophe (nickname: clefevre)
-        //$sql = "DELETE FROM $lp_item
-        //        WHERE lp_id = ".$this->lp_id;
-        //Database::query($sql);
-
-        //$sql = "DELETE FROM $lp_view
-        //        WHERE lp_id = ".$this->lp_id;
-        //Database::query($sql);
-
-        //$table = Database::get_course_table(TABLE_LP_REL_USERGROUP);
-        //$sql = "DELETE FROM $table
-        //        WHERE
-        //            lp_id = {$this->lp_id}";
-        //Database::query($sql);
-
         $lp = Container::getLpRepository()->find($this->lp_id);
 
         Database::getManager()
@@ -837,9 +811,17 @@ public function delete($courseInfo = null, $id = null, $delete = 'keep')
             GradebookUtils::remove_resource_from_course_gradebook($link_info['id']);
         }
 
-        //if ('true' === api_get_setting('search_enabled')) {
-        //    delete_all_values_for_item($this->cc, TOOL_LEARNPATH, $this->lp_id);
-        //}
+        $trackRepo     = Container::$container->get(TrackEDefaultRepository::class);
+        $resourceNode  = $lp->getResourceNode();
+        if ($resourceNode) {
+            $trackRepo->registerResourceEvent(
+                $resourceNode,
+                'deletion',
+                api_get_user_id(),
+                api_get_course_int_id(),
+                api_get_session_id()
+            );
+        }
     }
 
     /**

src/CoreBundle/Controller/Api/UpdateDocumentFileAction.php

@@ -6,17 +6,33 @@
 
 namespace Chamilo\CoreBundle\Controller\Api;
 
+use Chamilo\CoreBundle\Repository\TrackEDefaultRepository;
 use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Repository\CDocumentRepository;
 use Doctrine\ORM\EntityManager;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\Request;
 
 class UpdateDocumentFileAction extends BaseResourceFileAction
 {
+    public function __construct(
+        private TrackEDefaultRepository $trackRepo,
+        private Security $security
+    ) {}
+
     public function __invoke(CDocument $document, Request $request, CDocumentRepository $repo, EntityManager $em): CDocument
     {
         $this->handleUpdateRequest($document, $repo, $request, $em);
 
+        $node = $document->getResourceNode();
+        if ($node) {
+            $this->trackRepo->registerResourceEvent(
+                $node,
+                'edition',
+                $this->security->getUser()?->getId()
+            );
+        }
+
         return $document;
     }
 }

src/CoreBundle/Controller/Api/UpdateVisibilityDocument.php

@@ -6,26 +6,37 @@
 
 namespace Chamilo\CoreBundle\Controller\Api;
 
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\ServiceHelper\CidReqHelper;
 use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Repository\CDocumentRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpKernel\Attribute\AsController;
+use Doctrine\ORM\EntityManagerInterface;
 
 #[AsController]
 class UpdateVisibilityDocument extends AbstractController
 {
     public function __construct(
         private readonly CidReqHelper $cidReqHelper,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     public function __invoke(CDocument $document, CDocumentRepository $repo): CDocument
     {
-        $repo->toggleVisibilityPublishedDraft(
-            $document,
-            $this->cidReqHelper->getCourseEntity(),
-            $this->cidReqHelper->getSessionEntity()
-        );
+        $course = $this->cidReqHelper->getCourseEntity();
+        $session = $this->cidReqHelper->getSessionEntity();
+
+        if ($course) {
+            $course = $this->em->getRepository(Course::class)->find($course->getId());
+        }
+
+        if ($session) {
+            $session = $this->em->getRepository(Session::class)->find($session->getId());
+        }
+
+        $repo->toggleVisibilityPublishedDraft($document, $course, $session);
 
         return $document;
     }

src/CoreBundle/Controller/Api/UpdateVisibilityLink.php

@@ -23,8 +23,8 @@ public function __invoke(CLink $link, CLinkRepository $repo): CLink
     {
         $repo->toggleVisibilityPublishedDraft(
             $link,
-            $this->cidReqHelper->getCourseEntity(),
-            $this->cidReqHelper->getSessionEntity()
+            $this->cidReqHelper->getDoctrineCourseEntity(),
+            $this->cidReqHelper->getDoctrineSessionEntity()
         );
         $link->toggleVisibility();
 

src/CoreBundle/Controller/Api/UpdateVisibilityLinkCategory.php

@@ -23,8 +23,8 @@ public function __invoke(CLinkCategory $linkCategory, CLinkCategoryRepository $r
     {
         $repo->toggleVisibilityPublishedDraft(
             $linkCategory,
-            $this->cidReqHelper->getCourseEntity(),
-            $this->cidReqHelper->getSessionEntity()
+            $this->cidReqHelper->getDoctrineCourseEntity(),
+            $this->cidReqHelper->getDoctrineSessionEntity()
         );
         $linkCategory->toggleVisibility();