Update ControllerActivity.php

Author: Arouz

Controller/ControllerActivity.php

@@ -385,7 +385,6 @@ public function __construct($entityManager, $user)
 
                 $folder = $this->entityManager->getRepository(Folders::class)->find($id);
 
-                // check if allowed 
                 $requester_id = $_SESSION['id'];
                 $creator_id = $folder->getUser();
                 $Allowed = $this->isAllowed($creator_id->getId(), $requester_id);
@@ -403,12 +402,6 @@ public function __construct($entityManager, $user)
 
                 return $folder;
             }
-            // @ToBeRemoved
-            // @Naser no ajax call to this method from the front
-            // last check June 2022
-            // 'get_mine' => function () {
-            //     return $this->entityManager->getRepository(Activity::class)->findBy(array("user" => $this->user));
-            // },
         );
     }
 
@@ -420,7 +413,6 @@ private function deleteChildren($folder) {
         foreach ($Courses as $course) {
             $courseLinkActivity = $this->entityManager->getRepository(CourseLinkActivity::class)->findBy(["course" => $course]);
             foreach ($courseLinkActivity as $cla) {
-                // get userlinkactivity 
                 $userLinkActivity = $this->entityManager->getRepository(ActivityLinkUser::class)->findBy(["activity" => $cla->getActivity(), "isFromCourse" => 1, "course" => $course->getId()]);
                 foreach ($userLinkActivity as $ula) {
                     $this->entityManager->remove($ula);
@@ -432,16 +424,24 @@ private function deleteChildren($folder) {
 
         foreach ($Activities as $activity) {
             $activitiesLinkUser = $this->entityManager->getRepository(ActivityLinkUser::class)->findBy(["activity" => $activity->getId()]);
+            $courseLinkActivity = $this->entityManager->getRepository(CourseLinkActivity::class)->findBy(["activity" => $activity->getId()]);
+
             foreach ($activitiesLinkUser as $activityLinkUser) {
                 $this->entityManager->remove($activityLinkUser);
             }
+
+            foreach ($courseLinkActivity as $cla) {
+                $this->entityManager->remove($cla);
+            }
+            
             $this->entityManager->remove($activity);
         }
 
         foreach ($Childrens as $child) {
             $this->deleteChildren($child);
             $this->entityManager->remove($child);
         }
+        $this->entityManager->flush();
 
         return true;
     }