fix: add selection plan is not null condition for actions filter

Change-Id: Ib54b7c61496929a68083345ff75d994541dd1510
OpenStackweb · Feb 13, 2024 · 66386e8 · 66386e8
1 parent a020884
commit 66386e8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/app/Repositories/Summit/DoctrineSummitEventRepository.php b/app/Repositories/Summit/DoctrineSummitEventRepository.php
@@ -150,6 +150,14 @@ public function getAllByPage(PagingInfo $paging_info, Filter $filter = null, Ord
 
         if (!is_null($filter)) {
             $filter->apply2Query($query, $this->getCustomFilterMappings($current_member_id, $current_track_id));
+            if($filter->hasFilter('actions')){
+                // if actions filter is required, we should do an inner join with the allowed
+                // actions of the selection plan of the presentation
+                $query = $query->innerJoin("p.selection_plan","sp_i")
+                    ->innerJoin("sp_i.allowed_presentation_action_types","allowed_at")
+                    ->innerJoin("allowed_at.type","allowed_at_type")
+                    ->andWhere("allowed_at_type = at");
+            }
         }
 
         $shouldPerformRandomOrderingByPage = false;

diff --git a/tests/FilterParserTest.php b/tests/FilterParserTest.php
@@ -136,6 +136,10 @@ public function testApplyFilterAND()
             )
         ]);
 
+        $query->innerJoin("p.selection_plan","sp");
+        $query->innerJoin("sp.allowed_presentation_action_types","allowed_at");
+        $query->innerJoin("allowed_at.type","allowed_at_type", Join::ON, "allowed_at_type.id = at.id");
+
         $dql = $query->getDQL();
         $this->assertTrue(!empty($dql));
     }