Internal: Implement automatic session repetition and coach notificati…

…ons - refs BT#22057
christianbeeznest · Dec 4, 2024 · 7b66599 · 7b66599
1 parent 8f8fa4f
commit 7b66599
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/src/CoreBundle/Command/ReinscriptionCheckCommand.php b/src/CoreBundle/Command/ReinscriptionCheckCommand.php
@@ -62,6 +62,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($expiredViews as $view) {
             $user = $view->getUser();
             $session = $view->getSession();
+
+            if ($this->isUserAlreadyEnrolledInChildSession($user, $session)) {
+                if ($debug) {
+                    $output->writeln(sprintf('User %d is already enrolled in a valid child session.', $user->getId()));
+                }
+                continue;
+            }
+
             $lp = $view->getLp();
 
             if ($debug) {
@@ -171,4 +179,16 @@ private function findValidSessionInHierarchy(Session $session): ?Session
         return null;
     }
 
+    private function isUserAlreadyEnrolledInChildSession($user, $parentSession): bool
+    {
+        $childSessions = $this->sessionRepository->findChildSessions($parentSession);
+
+        foreach ($childSessions as $childSession) {
+            if ($this->findUserSubscriptionInSession($user, $childSession)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/CoreBundle/Command/SessionRepetitionCommand.php b/src/CoreBundle/Command/SessionRepetitionCommand.php
@@ -105,7 +105,7 @@ private function duplicateSession(Session $session, bool $debug, OutputInterface
             ->setCoachAccessStartDate($newStartDate)
             ->setCoachAccessEndDate($newEndDate)
             ->setVisibility($session->getVisibility())
-            ->setDuration($duration)
+            ->setDuration(0)
             ->setDescription($session->getDescription() ?? '')
             ->setShowDescription($session->getShowDescription() ?? false)
             ->setCategory($session->getCategory())
@@ -123,7 +123,9 @@ private function duplicateSession(Session $session, bool $debug, OutputInterface
         // Copy the courses from the original session
         foreach ($session->getCourses() as $sessionRelCourse) {
             $course = $sessionRelCourse->getCourse();
-            $newSession->addCourse($course);
+            if ($course) {
+                $newSession->addCourse($course);
+            }
         }
 
         // Copy the general coaches from the original session

diff --git a/src/CoreBundle/Repository/SessionRepository.php b/src/CoreBundle/Repository/SessionRepository.php
@@ -559,7 +559,12 @@ public function findSessionsWithoutChildAndReadyForRepetition()
             ->andWhere('s.daysToNewRepetition IS NOT NULL')
             ->andWhere('s.lastRepetition = :false')
             ->andWhere(':currentDate BETWEEN DATE_SUB(s.accessEndDate, s.daysToNewRepetition, \'DAY\') AND s.accessEndDate')
-            ->andWhere('NOT EXISTS (SELECT 1 FROM Chamilo\CoreBundle\Entity\Session child WHERE child.parentId = s.id)')
+            ->andWhere('NOT EXISTS (
+            SELECT 1
+            FROM Chamilo\CoreBundle\Entity\Session child
+            WHERE child.parentId = s.id
+            AND child.accessEndDate >= :currentDate
+        )')
             ->setParameter('false', false)
             ->setParameter('currentDate', $currentDate);