diff --git a/app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php b/app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php index 8335319c..c49af8aa 100644 --- a/app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php +++ b/app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitTracksApiController.php @@ -111,6 +111,8 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController 'description' => ['=@', '=='], 'code' => ['=@', '=='], 'group_name' => ['=@', '=='], + 'voting_visible' => ['=='], + 'chair_visible' => ['=='], ]); } @@ -122,6 +124,8 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController 'description' => 'sometimes|string', 'code' => 'sometimes|string', 'group_name' => 'sometimes|string', + 'voting_visible' => 'sometimes|boolean', + 'chair_visible' => 'sometimes|boolean', ]); $order = null; @@ -207,9 +211,22 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController 'description' => ['=@', '=='], 'code' => ['=@', '=='], 'group_name' => ['=@', '=='], + 'voting_visible' => ['=='], + 'chair_visible' => ['=='], ]); } + if(is_null($filter)) $filter = new Filter(); + + $filter->validate([ + 'name' => 'sometimes|string', + 'description' => 'sometimes|string', + 'code' => 'sometimes|string', + 'group_name' => 'sometimes|string', + 'voting_visible' => 'sometimes|boolean', + 'chair_visible' => 'sometimes|boolean', + ]); + $order = null; if (Input::has('order')) @@ -222,8 +239,6 @@ final class OAuth2SummitTracksApiController extends OAuth2ProtectedController ]); } - if(is_null($filter)) $filter = new Filter(); - $data = $this->repository->getBySummit($summit, new PagingInfo($page, $per_page), $filter, $order); $filename = "tracks-" . date('Ymd'); diff --git a/app/Repositories/Summit/DoctrineSummitTrackRepository.php b/app/Repositories/Summit/DoctrineSummitTrackRepository.php index 00631b3c..d0a3f838 100644 --- a/app/Repositories/Summit/DoctrineSummitTrackRepository.php +++ b/app/Repositories/Summit/DoctrineSummitTrackRepository.php @@ -48,6 +48,8 @@ final class DoctrineSummitTrackRepository ( "(g.name :operator :value)" ), + 'voting_visible' => 't.voting_visible', + 'chair_visible' => 't.chair_visible', ]; }