Skip to content

Commit 9aa5914

Browse files
committed
fix: hidden selection plan with former allowed members
1 parent 11ba3e9 commit 9aa5914

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

app/Http/Controllers/Apis/Protected/Summit/OAuth2SummitSelectionPlansApiController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use App\Services\Model\ISummitSelectionPlanService;
2424
use Illuminate\Http\Request as LaravelRequest;
2525
use libs\utils\HTMLCleaner;
26+
use libs\utils\PaginationValidationRules;
2627
use models\exceptions\EntityNotFoundException;
2728
use models\oauth2\IResourceServerContext;
2829
use models\summit\ISummitEventRepository;
@@ -1670,7 +1671,7 @@ public function getMySelectionPlans($id){
16701671
$filter->addFilterCondition(FilterParser::buildFilter('is_enabled','==',true));
16711672
$filter->addFilterCondition(FilterParser::buildFilter('allowed_member_email','==', $current_member->getEmail()));
16721673

1673-
$page = $this->repository->getAllByPage(new PagingInfo(1,1000), $filter);
1674+
$page = $this->repository->getAllByPage(new PagingInfo(1,PaginationValidationRules::PerPageMax), $filter);
16741675

16751676
return $this->ok($page->toArray(
16761677
SerializerUtils::getExpand(),

app/Models/Foundation/Summit/SelectionPlan.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,10 @@ public function isHidden(): bool
432432
public function setIsHidden(bool $is_hidden)
433433
{
434434
$this->is_hidden = $is_hidden;
435+
if($this->is_hidden){
436+
// clear allowed members on hidden
437+
$this->allowed_members->clear();
438+
}
435439
}
436440

437441
/**

app/Repositories/Summit/DoctrineSelectionPlanRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected function getFilterMappings()
8383
),
8484
]
8585
),
86-
'allowed_member_email' => 'SIZE(e.allowed_members) = 0 OR am.email',
86+
'allowed_member_email' => 'e.is_hidden = true OR (e.is_hidden = false AND SIZE(e.allowed_members) = 0 ) OR am.email',
8787
'is_enabled' => 'e.is_enabled',
8888
'is_hidden' => 'e.is_hidden',
8989
];

0 commit comments

Comments
 (0)