SAK-50380 Samigo solve availabile mail sending for groups (#12850)

sakaiproject · Sep 4, 2024 · fee4944 · fee4944
1 parent 00a6737
commit fee4944
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...go-impl/src/java/org/sakaiproject/samigo/impl/SamigoAvailableNotificationServiceImpl.java b/...go-impl/src/java/org/sakaiproject/samigo/impl/SamigoAvailableNotificationServiceImpl.java
@@ -159,8 +159,12 @@ public void execute(String publishedId) {
                     }
                 } else if (StringUtils.equals(publishedAssessment.getAssessmentAccessControl().getReleaseTo(), "Selected Groups")){ //when there is a releaseTo setting that limits the access of the test
                     for (Object groupId : publishedAssessment.getReleaseToGroups().keySet().toArray()){ //loop through applicable group IDs
-                        Set<String> groupUserUids = site.getGroup((String) groupId).getUsersIsAllowed(SamigoConstants.AUTHZ_TAKE_ASSESSMENT);
-                        for (User groupUser : userDirectoryService.getUsers(groupUserUids)) {
+                        Set<String> studentUserUids = site.getUsersIsAllowed(SamigoConstants.AUTHZ_TAKE_ASSESSMENT);
+                        Set<String> groupUserUids = site.getGroup((String) groupId).getUsers();
+                        // Intersection of studentUserUids and groupUserUids
+                        studentUserUids.retainAll(groupUserUids);
+
+                        for (User groupUser : userDirectoryService.getUsers(studentUserUids)) {
                             if (!isUserInException(publishedAssessment, groupUser.getId(), site)) {
                                 log.debug("Calling send email notification: {}", groupUser.getId());
                                 sendEmailNotification(site, publishedAssessment, groupUser, null);