Skip to content

fix: improper membership checks for public BM/GMM body pages #2025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomudding merged 2 commits into from
Jun 19, 2025
Merged

fix: improper membership checks for public BM/GMM body pages #2025

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c35b7d
fix: discharges already active on BM/GMM body pages
tomudding Jun 19, 2025
5bac369
fix: consistent BM/GMM body membership logic
tomudding Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion module/Decision/src/Service/Organ.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use Application\Service\Email as EmailService;
use Application\Service\FileStorage as FileStorageService;
use DateTime;
use Decision\Form\OrganInformation as OrganInformationForm;
use Decision\Mapper\Member as MemberMapper;
use Decision\Mapper\Organ as OrganMapper;
Expand Down Expand Up @@ -390,9 +391,19 @@ public function getOrganMemberInformation(OrganModel $organ): array
$activeMembers = [];
$inactiveMembers = [];
$oldMembers = [];
$today = new DateTime();

foreach ($organ->getMembers() as $install) {
if (null === $install->getDischargeDate()) {
if ($install->getInstallDate() > $today) {
continue;
}

$dischargeDate = $install->getDischargeDate();

if (
null === $dischargeDate
|| $dischargeDate > $today
) {
// current member
if (InstallationFunctions::InactiveMember === $install->getFunction()) {
// inactive
Expand Down
Loading