Skip to content

fix: program notification recipients disabled check (#21665) #21697

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
netroms merged 2 commits into from
Aug 20, 2025
Merged

fix: program notification recipients disabled check (#21665) #21697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c8f505
fix: program notification recipients disabled check (#21665)
netroms Aug 19, 2025
6ffb378
fix: program notification recipients disabled check
netroms Aug 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
5 changes: 5 additions & 0 deletions ...e/src/main/java/org/hisp/dhis/program/notification/DefaultProgramNotificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ private Set<User> resolveDhisMessageRecipients(
orgUnitInHierarchy.addAll(orgUnit.getAncestors());

return userGroupMembers.stream()
.filter(User::isEnabled)
.filter(r -> orgUnitInHierarchy.contains(r.getOrganisationUnit()))
.collect(Collectors.toSet());

Expand All @@ -507,6 +508,7 @@ private Set<User> resolveDhisMessageRecipients(
OrganisationUnit parentOrgUnit = orgUnit.getParent();

return userGroupMembers.stream()
.filter(User::isEnabled)
.filter(u -> u.getOrganisationUnit().equals(parentOrgUnit))
.collect(Collectors.toSet());
}
Expand All @@ -516,6 +518,9 @@ private Set<User> resolveDhisMessageRecipients(
userGroupMembers.addAll(orgUnit.getUsers());
}

// filter out all users that are disabled
userGroupMembers.removeIf(User::isDisabled);

return userGroupMembers;
}

Expand Down
8 changes: 8 additions & 0 deletions ...core/src/test/java/org/hisp/dhis/program/notification/ProgramNotificationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ class ProgramNotificationServiceTest extends DhisConvenienceTest {

private User userLvlTwoLeftLeft;

private User userLvlTwoLeftLeftDisabled;

private User userLvlTwoLeftRight;

private User userLvlOneLeft;
Expand Down Expand Up @@ -607,6 +609,7 @@ void testSendToHierarchy() {
assertTrue(users.contains(userLvlOneLeft));
assertTrue(users.contains(userRoot));

assertFalse(users.contains(userLvlTwoLeftLeftDisabled));
assertFalse(users.contains(userLvlTwoLeftRight));
assertFalse(users.contains(userLvlOneRight));
}
Expand Down Expand Up @@ -734,10 +737,15 @@ private void setUpInstances() {
userB = makeUser("V");
userB.setPhoneNumber(USERB_PHONE_NUMBER);
userB.getOrganisationUnits().add(lvlTwoLeftLeft);
userB.getOrganisationUnits().add(lvlOneLeft);

userGroup = createUserGroup('G', Sets.newHashSet(userA, userB));

// User based on hierarchy
userLvlTwoLeftLeftDisabled = makeUser("D");
userLvlTwoLeftLeftDisabled.setDisabled(true);
userLvlTwoLeftLeftDisabled.getOrganisationUnits().add(lvlTwoLeftLeft);
lvlTwoLeftLeft.getUsers().add(userLvlTwoLeftLeftDisabled);

userLvlTwoLeftLeft = makeUser("K");
userLvlTwoLeftLeft.getOrganisationUnits().add(lvlTwoLeftLeft);
Expand Down