Skip to content

Add question status data to user progress endpoint #760

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

Open
sjd210 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add question status data to user progress endpoint #760

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c4be0f
Count correct question parts per question
sjd210 Feb 24, 2026
12be6d6
Replace ContentDTO list with SummaryDTO list
sjd210 Feb 24, 2026
39e92fd
Replace List with Queue to limit question count
sjd210 Feb 24, 2026
06de127
Add completion state to incomplete question pages
sjd210 Feb 24, 2026
6c5bf8a
Map to ContentSummaryDTO outside the loop
sjd210 Feb 24, 2026
b5562d3
Revert "Map to ContentSummaryDTO outside the loop"
sjd210 Feb 26, 2026
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
32 changes: 21 additions & 11 deletions src/main/java/uk/ac/cam/cl/dtg/segue/api/managers/StatisticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import uk.ac.cam.cl.dtg.isaac.api.managers.GameManager;
import uk.ac.cam.cl.dtg.isaac.api.managers.UserAttemptManager;
import uk.ac.cam.cl.dtg.isaac.api.services.ContentSummarizerService;
import uk.ac.cam.cl.dtg.isaac.dos.AudienceContext;
import uk.ac.cam.cl.dtg.isaac.dos.Difficulty;
Expand Down Expand Up @@ -196,8 +197,8 @@ public Map<String, Object> getUserQuestionInformation(final RegisteredUserDTO us
Map<Stage, Map<Difficulty, Integer>> questionsCorrectByStageAndDifficultyStats = Maps.newHashMap();
Map<String, Integer> questionAttemptsByTypeStats = Maps.newHashMap();
Map<String, Integer> questionsCorrectByTypeStats = Maps.newHashMap();
List<IsaacQuestionPageDTO> incompleteQuestionPages = Lists.newArrayList();
Queue<ContentDTO> mostRecentlyAttemptedQuestionPages = new CircularFifoQueue<>(PROGRESS_MAX_RECENT_QUESTIONS);
List<ContentSummaryDTO> incompleteQuestionPages = Lists.newArrayList();
Queue<ContentSummaryDTO> mostRecentlyAttemptedQuestionsQueue = new CircularFifoQueue<>(PROGRESS_MAX_RECENT_QUESTIONS);

LocalDate now = LocalDate.now();
LocalDate endOfAugustThisYear = LocalDate.of(now.getYear(), Month.AUGUST, 31);
Expand All @@ -218,14 +219,17 @@ public Map<String, Object> getUserQuestionInformation(final RegisteredUserDTO us
}
IsaacQuestionPageDTO questionPageDTO = (IsaacQuestionPageDTO) contentDTO;

mostRecentlyAttemptedQuestionPages.add(questionPageDTO); // Assumes questionAttemptsByUser is sorted!
attemptedQuestions++;
boolean questionIsCorrect = true; // Are all Parts of the Question correct?
LocalDate mostRecentCorrectQuestionPart = null;
LocalDate mostRecentAttemptAtQuestion = null;
int questionPartsCorrect = 0;
int questionPartsIncorrect = 0;
int questionPartsTotal = 0;
// Loop through each Part of the Question:
for (QuestionDTO questionPart : GameManager.getAllMarkableQuestionPartsDFSOrder(questionPageDTO)) {

questionPartsTotal++;
boolean questionPartIsCorrect = false; // Is this Part of the Question correct?
// Has the user attempted this part of the question at all?
if (question.getValue().containsKey(questionPart.getId())) {
Expand All @@ -251,6 +255,7 @@ public Map<String, Object> getUserQuestionInformation(final RegisteredUserDTO us
questionPartIsCorrect = true;
break; // early so that later attempts are ignored
}

}

// Type Stats - Count the attempt at the Question Part:
Expand Down Expand Up @@ -278,13 +283,22 @@ public Map<String, Object> getUserQuestionInformation(final RegisteredUserDTO us
} else {
questionsCorrectByTypeStats.put(questionPartType, 1);
}

questionPartsCorrect++;
} else {
questionPartsIncorrect++;
}
}

// Correctness of whole Question: is the Question correct so far, and is this Question Part also correct?
questionIsCorrect = questionIsCorrect && questionPartIsCorrect;
}

// Convert QuestionPageDTO to ContentSummaryDTO and calculate completion state
ContentSummaryDTO contentSummaryDTO = contentSummarizerService.extractContentSummary(questionPageDTO);
contentSummaryDTO.setState(UserAttemptManager.getCompletionState(questionPartsTotal, questionPartsCorrect, questionPartsIncorrect));
mostRecentlyAttemptedQuestionsQueue.add(contentSummaryDTO);

// Tag Stats - Loop through the Question's tags:
for (String tag : questionPageDTO.getTags()) {
// Count the attempt at the Question:
Expand Down Expand Up @@ -355,21 +369,17 @@ public Map<String, Object> getUserQuestionInformation(final RegisteredUserDTO us
correctQuestionsThisAcademicYear++;
}
} else {
incompleteQuestionPages.add(questionPageDTO);
incompleteQuestionPages.add(contentSummaryDTO);
}
}

// Collate all the information into the JSON response as a Map:
Map<String, Object> questionInfo = Maps.newHashMap();

// Create the recent and unanswered question lists:
List<ContentSummaryDTO> mostRecentlyAttemptedQuestionsList = mostRecentlyAttemptedQuestionPages
.stream().map(contentSummarizerService::extractContentSummary).collect(Collectors.toList());
List<ContentSummaryDTO> mostRecentlyAttemptedQuestionsList = new ArrayList<>(mostRecentlyAttemptedQuestionsQueue);
Collections.reverse(mostRecentlyAttemptedQuestionsList); // We want most-recent first order and streams cannot reverse.
List<ContentSummaryDTO> questionsNotCompleteList = incompleteQuestionPages.stream()
.sorted(Comparator.comparing(SeguePageDTO::getDeprecated, Comparator.nullsFirst(Comparator.naturalOrder())))
.limit(PROGRESS_MAX_RECENT_QUESTIONS)
.map(contentSummarizerService::extractContentSummary).collect(Collectors.toList());
.sorted(Comparator.comparing(ContentSummaryDTO::getDeprecated, Comparator.nullsFirst(Comparator.naturalOrder())))
.limit(PROGRESS_MAX_RECENT_QUESTIONS).collect(Collectors.toList());

questionInfo.put("totalQuestionsAttempted", attemptedQuestions);
questionInfo.put("totalQuestionsCorrect", correctQuestions);
Expand Down
Loading