Skip to content

SAK-51326 DateManager gradebook by groups introduced a thread safety issue #13564

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
merged 1 commit into from
Apr 8, 2025
Merged

SAK-51326 DateManager gradebook by groups introduced a thread safety issue #13564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 3 additions & 12 deletions ...emanager/impl/src/main/java/org/sakaiproject/datemanager/impl/DateManagerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
import org.sakaiproject.util.ResourceLoader;
import org.sakaiproject.util.api.FormattedText;

import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.sakaiproject.tool.api.ToolSession;
Expand Down Expand Up @@ -130,7 +129,6 @@ public class DateManagerServiceImpl implements DateManagerService {
@Setter private UserTimeService userTimeService;
@Setter private SamigoAvailableNotificationService samigoAvailableNotificationService;
@Setter private FormattedText formattedText;
@Setter @Getter private List<Gradebook> gradebooksForGroup;

private final Map<String, Calendar> calendarMap = new HashMap<>();
private final DateTimeFormatter inputDateFormatter;
Expand Down Expand Up @@ -405,7 +403,7 @@ public void updateAssignments(DateManagerValidation assignmentValidation) throws
contextIds.add(gradebookUid);
if (gradingService.isGradebookGroupEnabled(getCurrentSiteId())) {
contextIds = new ArrayList<>();
List<Gradebook> gradebooks = getGradebooksForGroup(gradebookUid);
List<Gradebook> gradebooks = gradingService.getGradebookGroupInstances(gradebookUid);
for (Gradebook gradebook : gradebooks) {
List<org.sakaiproject.grading.api.Assignment> groupAssignments = gradingService.getAssignments(gradebook.getUid().toString(), getCurrentSiteId(), SortType.SORT_BY_NONE);
for (org.sakaiproject.grading.api.Assignment assignmentAux : groupAssignments) {
Expand Down Expand Up @@ -680,7 +678,7 @@ public void updateAssessments(DateManagerValidation assessmentsValidation) throw
contextIds.add(gradebookUid);
if (gradingService.isGradebookGroupEnabled(getCurrentSiteId())) {
contextIds = new ArrayList<>();
List<Gradebook> gradebooks = getGradebooksForGroup(gradebookUid);
List<Gradebook> gradebooks = gradingService.getGradebookGroupInstances(gradebookUid);
for (Gradebook gradebook : gradebooks) {
List<org.sakaiproject.grading.api.Assignment> groupAssignments = gradingService.getAssignments(gradebook.getUid().toString(), getCurrentSiteId(), SortType.SORT_BY_NONE);
for (org.sakaiproject.grading.api.Assignment assignment : groupAssignments) {
Expand Down Expand Up @@ -793,7 +791,7 @@ public DateManagerValidation validateGradebookItems(String siteId, JSONArray gra

org.sakaiproject.grading.api.Assignment gbitem;
if (gradingService.isGradebookGroupEnabled(getCurrentSiteId())) {
List<Gradebook> gradebooks = getGradebooksForGroup(siteId);
List<Gradebook> gradebooks = gradingService.getGradebookGroupInstances(siteId);
String groupId = "";
for (Gradebook gra : gradebooks) {
List<org.sakaiproject.grading.api.Assignment> groupAssignments = gradingService.getAssignments(gra.getUid().toString(), getCurrentSiteId(), SortType.SORT_BY_NONE);
Expand Down Expand Up @@ -2107,11 +2105,4 @@ public JSONObject createJsonObject(String[] columnsNames, String[] columns, int
}
return jsonObject;
}

public List<Gradebook> getGradebooksForGroup(String context) {
if (gradebooksForGroup == null || gradebooksForGroup.size() > 0) {
gradebooksForGroup = gradingService.getGradebookGroupInstances(context);
}
return gradebooksForGroup;
}
}
Loading