Attendance: Fix session reference handling - refs BT#22571

Author: christianbeeznest

src/CoreBundle/Filter/SidFilter.php

@@ -42,19 +42,17 @@ public function getDescription(string $resourceClass): array
                 'property' => null,
                 'type' => 'string',
                 'required' => false,
-                'description' => 'Course identifier',
+                'description' => 'Session identifier',
             ],
         ];
     }
 
     /**
-     * @param mixed $value
-     *
      * @throws ReflectionException
      */
     protected function filterProperty(
         string $property,
-        $value,
+               $value,
         QueryBuilder $queryBuilder,
         QueryNameGeneratorInterface $queryNameGenerator,
         string $resourceClass,
@@ -65,41 +63,44 @@ protected function filterProperty(
             return;
         }
 
-        $reflection = new ReflectionClass($resourceClass);
+        $alias = $queryBuilder->getRootAliases()[0];
+        $session = $this->getSession();
 
+        $reflection = new ReflectionClass($resourceClass);
         $loadBaseSessionContent = \in_array(
             ResourceShowCourseResourcesInSessionInterface::class,
             $reflection->getInterfaceNames(),
             true
         );
 
-        // Session was set with a kernel request from CoreBundle\EventListener\CidReqListener class
-        $session = $this->getSession();
+        $joins = $queryBuilder->getDQLPart('join');
+
+        if (empty($joins[$alias]) || !array_filter($joins[$alias], fn($j) => $j->getAlias() === 'resourceNode')) {
+            $queryBuilder->leftJoin($alias . '.resourceNode', 'resourceNode');
+        }
+
+        if (empty($joins['resourceNode']) || !array_filter($joins['resourceNode'], fn($j) => $j->getAlias() === 'resourceLink')) {
+            $queryBuilder->leftJoin('resourceNode.resourceLinks', 'resourceLink');
+        }
 
         if (null === $session) {
             $queryBuilder->andWhere(
                 $queryBuilder->expr()->orX(
-                    $queryBuilder->expr()->isNull('resource_links.session'),
-                    $queryBuilder->expr()->eq('resource_links.session', 0)
+                    'resourceLink.session IS NULL',
+                    'resourceLink.session = 0'
                 )
             );
         } elseif ($loadBaseSessionContent) {
-            $queryBuilder
-                ->andWhere(
-                    $queryBuilder->expr()->orX(
-                        $queryBuilder->expr()->eq('resource_links.session', ':session'),
-                        $queryBuilder->expr()->isNull('resource_links.session')
-                    )
+            $queryBuilder->andWhere(
+                $queryBuilder->expr()->orX(
+                    'resourceLink.session = :session',
+                    'resourceLink.session IS NULL'
                 )
-                ->setParameter('session', $session?->getId())
-            ;
+            )->setParameter('session', $session->getId());
         } else {
             $queryBuilder
-                ->andWhere(
-                    $queryBuilder->expr()->eq('resource_links.session', ':session')
-                )
-                ->setParameter('session', $session?->getId())
-            ;
+                ->andWhere('resourceLink.session = :session')
+                ->setParameter('session', $session->getId());
         }
     }
 }

src/CourseBundle/Entity/CAttendance.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Metadata\Put;
 use Chamilo\CoreBundle\Entity\AbstractResource;
 use Chamilo\CoreBundle\Entity\ResourceInterface;
+use Chamilo\CoreBundle\Filter\SidFilter;
 use Chamilo\CoreBundle\State\CAttendanceStateProcessor;
 use Chamilo\CourseBundle\Repository\CAttendanceRepository;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -78,11 +79,12 @@
             security: "is_granted('ROLE_TEACHER')"
         ),
     ],
-    normalizationContext: ['groups' => ['attendance:read']],
+    normalizationContext: ['groups' => ['attendance:read', 'resource_node:read', 'resource_link:read']],
     denormalizationContext: ['groups' => ['attendance:write']],
     paginationEnabled: true,
 )]
 #[ApiFilter(SearchFilter::class, properties: ['active' => 'exact', 'title' => 'partial', 'resourceNode.parent' => 'exact'])]
+#[ApiFilter(filterClass: SidFilter::class)]
 #[ORM\Table(name: 'c_attendance')]
 #[ORM\Index(columns: ['active'], name: 'active')]
 #[ORM\Entity(repositoryClass: CAttendanceRepository::class)]