Skip to content

Internal: Optimize session reminders handling and type determination - refs BT#22151 #5944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Internal: Optimize session reminders handling and type determination - refs BT#22151 #5944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions src/CoreBundle/Command/SendEventRemindersCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
namespace Chamilo\CoreBundle\Command;

use Chamilo\CoreBundle\Entity\AgendaReminder;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Entity\User;
use Chamilo\CoreBundle\Repository\Node\CourseRepository;
use Chamilo\CoreBundle\ServiceHelper\MessageHelper;
Expand Down Expand Up @@ -160,11 +161,34 @@ protected function execute(InputInterface $input, OutputInterface $output): int

case 'session':
if ($session = $resourceLink->getSession()) {
foreach ($session->getUsers() as $sessionRelUser) {
$user = $sessionRelUser->getUser();
$course = $resourceLink->getCourse();
if (!$course) {
if ($debug) {
error_log("No course found for resource link in session ID: {$session->getId()}");
}
break;
}

$usersToNotify = [];
$studentSubscriptions = $session->getSessionRelCourseRelUsersByStatus($course, Session::STUDENT);
foreach ($studentSubscriptions as $studentSubscription) {
$usersToNotify[$studentSubscription->getUser()->getId()] = $studentSubscription->getUser();
}

$coachSubscriptions = $session->getSessionRelCourseRelUsersByStatus($course, Session::COURSE_COACH);
foreach ($coachSubscriptions as $coachSubscription) {
$usersToNotify[$coachSubscription->getUser()->getId()] = $coachSubscription->getUser();
}

$generalCoaches = $session->getGeneralCoaches();
foreach ($generalCoaches as $generalCoach) {
$usersToNotify[$generalCoach->getId()] = $generalCoach;
}

foreach ($usersToNotify as $user) {
$this->messageHelper->sendMessageSimple($user->getId(), $messageSubject, $messageContent, $senderId);
if ($debug) {
error_log("Message sent to user ID: {$user->getId()} for session event: ".$event->getTitle());
error_log("Message sent to user ID: {$user->getId()} ({$user->getUsername()}) for session event: {$event->getTitle()}");
}
$sentRemindersCount++;
}
Expand Down
16 changes: 8 additions & 8 deletions src/CourseBundle/Entity/CCalendarEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,21 +513,21 @@ public function determineType(): string
$resourceLinks = $this->resourceNode->getResourceLinks();

foreach ($resourceLinks as $link) {
if (null !== $link->getCourse() && null === $link->getSession()) {
return 'course';
}

if (null !== $link->getSession()) {
return 'session';
}

if (null === $link->getCourse()
&& null === $link->getSession()
&& null === $link->getGroup()
&& null === $link->getUser()
) {
return 'global';
}

if (null !== $link->getCourse()) {
return 'course';
}

if (null !== $link->getSession()) {
return 'session';
}
}

return 'personal';
Expand Down
Loading