From bbc795514f65720a708a3e3e9678435f519f732e Mon Sep 17 00:00:00 2001 From: "smarcet@gmail.com" Date: Tue, 13 Feb 2024 12:26:59 -0300 Subject: [PATCH] fix: add selection plan is not null condition for actions filter Change-Id: Ib54b7c61496929a68083345ff75d994541dd1510 --- app/Repositories/Summit/DoctrineSummitEventRepository.php | 7 +++++++ tests/FilterParserTest.php | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/app/Repositories/Summit/DoctrineSummitEventRepository.php b/app/Repositories/Summit/DoctrineSummitEventRepository.php index 9b0a5dffa..597d6e9c4 100644 --- a/app/Repositories/Summit/DoctrineSummitEventRepository.php +++ b/app/Repositories/Summit/DoctrineSummitEventRepository.php @@ -150,6 +150,13 @@ 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')){ + $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 index ed0e4eb5b..458fdcc3e 100644 --- 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)); }