Replace UserRelCourseVoteHelper with UserRelCourseVoteRepository for course rating controller #2860

Author: AngelFQC

src/CoreBundle/Controller/CatalogueController.php

@@ -19,9 +19,9 @@
 use Chamilo\CoreBundle\Helpers\UserHelper;
 use Chamilo\CoreBundle\Repository\Node\CourseRepository;
 use Chamilo\CoreBundle\Repository\SessionRepository;
+use Chamilo\CoreBundle\Repository\UserRelCourseVoteRepository;
 use Chamilo\CoreBundle\Settings\SettingsManager;
 use Chamilo\CoreBundle\Helpers\TrackingStatsHelper;
-use Chamilo\CoreBundle\Helpers\UserRelCourseVoteHelper;
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use ExtraField;
@@ -42,20 +42,17 @@ public function __construct(
  private readonly CourseRepository $courseRepository,
  private readonly TrackingStatsHelper $trackingStatsHelper,
  private readonly SessionRepository $sessionRepository,
- private readonly UserRelCourseVoteHelper $userRelCourseVoteHelper
+ private readonly UserRelCourseVoteRepository $courseVoteRepository,
  ) {}
 
  #[Route('/api/courses/{id}/rating', name: 'api_course_rating', methods: ['GET'])]
  public function courseRating(Course $course, Request $request): JsonResponse
  {
  $sessionId = $request->query->getInt('session', 0);
  $session = $sessionId > 0 ? $this->sessionRepository->find($sessionId) : null;
- $res = $this->userRelCourseVoteHelper->getCourseRating($course, $session);
+ $rating = $this->courseVoteRepository->getCouseRating($course, $session);
 
- return $this->json([
- 'average' => $res['avg'],
- 'count' => $res['count'],
- ]);
+ return $this->json($rating);
  }
  #[Route('/api/courses/{id}/visits', name: 'api_course_visits', methods: ['GET'])]
  public function courseVisits(Course $course, Request $request): JsonResponse

src/CoreBundle/Helpers/UserRelCourseVoteHelper.php

@@ -0,0 +1,70 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Repository;
+
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\UserRelCourseVote;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\DBAL\ParameterType;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<UserRelCourseVote>
+ */
+class UserRelCourseVoteRepository extends ServiceEntityRepository
+{
+ public function __construct(ManagerRegistry $registry)
+ {
+ parent::__construct($registry, UserRelCourseVote::class);
+ }
+
+ /**
+ * Retrieves the average vote and the count of votes for a specific course.
+ *
+ * @return array The first element of the array is the average vote (rounded to 2 decimal places),
+ * and the second element is the count of votes.
+ */
+ public function getCouseRating(Course $course, ?Session $session = null): array
+ {
+ $qb = $this->createQueryBuilder('v');
+
+ $qb
+ ->select([
+ $qb->expr()->avg('v.vote'),
+ $qb->expr()->count('v.id')
+ ])
+ ->where($qb->expr()->eq('v.course', ':course'))
+ ->setParameter('course', $course->getId(), ParameterType::INTEGER)
+ ;
+
+ if ($session !== null) {
+ $qb
+ ->andWhere($qb->expr()->eq('v.session', ':session'))
+ ->setParameter('session', $session->getId(), ParameterType::INTEGER)
+ ;
+ } else {
+ $qb->andWhere($qb->expr()->isNull('v.session'));
+ }
+
+ try {
+ $result = $qb
+ ->setMaxResults(1)
+ ->getQuery()
+ ->getSingleResult();
+ } catch (NoResultException|NonUniqueResultException) {
+ $result = [1 => 0, 2 => 0];
+ }
+
+ return [
+ 'average' => round((float) $result[1], 2),
+ 'count' => $result[2]
+ ];
+ }
+}