Skip to content
Permalink
Browse files Browse the repository at this point in the history
Merge pull request from GHSA-fhq8-p3w6-mmgr
  • Loading branch information
Zitrone44 committed Mar 7, 2023
1 parent 3f1b613 commit f1ae67d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
Expand Up @@ -97,7 +97,7 @@ class SubmissionController {
List()
} else {
checkerConfigurationService.getAll(cid, tid).headOption match {
case Some(cc) => checkrunnerSubTaskServer.listResultsWithTasks(cc.id, sid)
case Some(cc) => checkrunnerSubTaskServer.listResultsWithTasks(uid, cc.id, sid)
case None => throw new ResourceNotFoundException()
}
}
Expand Down
Expand Up @@ -111,12 +111,13 @@ class CheckrunnerSubTaskService {
* @param submissionId The id of the submission to get the subtasks results
* @return List of subtasks results with tasks
*/
def listResultsWithTasks(configurationId: Int, submissionId: Int): List[SubTaskResult] = DB.query(
"SELECT st.name, st.points AS max_points, str.points FROM checkrunner_sub_task_result str JOIN " +
"checkrunner_sub_task st ON str.sub_task_id = st.sub_task_id " +
"WHERE str.configuration_id = ? AND str.submission_id = ?",
def listResultsWithTasks(userId: Int, configurationId: Int, submissionId: Int): List[SubTaskResult] = DB.query(
"SELECT st.name, st.points AS max_points, str.points FROM checkrunner_sub_task_result str " +
"JOIN checkrunner_sub_task st ON str.sub_task_id = st.sub_task_id " +
"JOIN user_task_submission uts ON str.submission_id = uts.submission_id " +
"WHERE str.configuration_id = ? AND str.submission_id = ? AND uts.user_id = ?",
(res, _) => parseSubTaskResultWithSubTask(res),
configurationId, submissionId
configurationId, submissionId, userId
)

/**
Expand Down

0 comments on commit f1ae67d

Please sign in to comment.