yupei/add live feedback history

app/controllers/concerns/course/statistics/submissions_concern.rb

@@ -25,23 +25,14 @@
  def answer_statistics_hash
  submission_answer_statistics = Course::Assessment::Answer.find_by_sql(<<-SQL.squish
  WITH
- attempt_count AS (
- SELECT
- caa.question_id,
- caa.submission_id,
- COUNT(*) AS attempt_count
- FROM course_assessment_answers caa
- JOIN course_assessment_submissions cas ON caa.submission_id = cas.id
- WHERE cas.assessment_id = #{assessment_params[:id]}
- GROUP BY caa.question_id, caa.submission_id
- ),
  attempt_info AS (
  SELECT
  caa_ranked.question_id,
  caa_ranked.submission_id,
- jsonb_agg(jsonb_build_array(caa_ranked.grade, caa_ranked.correct, caa_ranked.workflow_state)) AS submission_info
+ jsonb_agg(jsonb_build_array(caa_ranked.id, caa_ranked.grade, caa_ranked.correct, caa_ranked.workflow_state)) AS submission_info
  FROM (
  SELECT
+ caa_inner.id,
  caa_inner.question_id,
  caa_inner.submission_id,
  caa_inner.correct,
@@ -57,19 +48,33 @@
  ) AS caa_ranked
  WHERE caa_ranked.row_num <= 2
  GROUP BY caa_ranked.question_id, caa_ranked.submission_id
+ ),
+
+ attempt_count AS (
+ SELECT
+ caa.question_id,
+ caa.submission_id,
+ COUNT(*) AS attempt_count
+ FROM course_assessment_answers caa
+ JOIN course_assessment_submissions cas ON caa.submission_id = cas.id
+ WHERE cas.assessment_id = #{assessment_params[:id]} AND caa.workflow_state != 'attempting'
+ GROUP BY caa.question_id, caa.submission_id
  )
  SELECT
- attempt_count.question_id,
- attempt_count.submission_id,
- attempt_count.attempt_count,
- CASE WHEN jsonb_array_length(attempt_info.submission_info) = 1 OR attempt_info.submission_info->0->>2 != 'attempting'
+ CASE WHEN jsonb_array_length(attempt_info.submission_info) = 1 OR attempt_info.submission_info->0->>3 != 'attempting'
  THEN attempt_info.submission_info->0->>0 ELSE attempt_info.submission_info->1->>0
- END AS grade,
- CASE WHEN jsonb_array_length(attempt_info.submission_info) = 1 OR attempt_info.submission_info->0->>2 != 'attempting'
+ END AS last_attempt_answer_id,
+ attempt_info.question_id,
+ attempt_info.submission_id,
+ attempt_count.attempt_count,
+ CASE WHEN jsonb_array_length(attempt_info.submission_info) = 1 OR attempt_info.submission_info->0->>3 != 'attempting'
  THEN attempt_info.submission_info->0->>1 ELSE attempt_info.submission_info->1->>1
+ END AS grade,
+ CASE WHEN jsonb_array_length(attempt_info.submission_info) = 1 OR attempt_info.submission_info->0->>3 != 'attempting'
+ THEN attempt_info.submission_info->0->>2 ELSE attempt_info.submission_info->1->>2
  END AS correct
- FROM attempt_count
- JOIN attempt_info
+ FROM attempt_info
+ LEFT JOIN attempt_count
  ON attempt_count.question_id = attempt_info.question_id AND attempt_count.submission_id = attempt_info.submission_id
  SQL
  )

app/controllers/course/statistics/answers_controller.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+class Course::Statistics::AnswersController < Course::Statistics::Controller
+ helper Course::Assessment::Submission::SubmissionsHelper.name.sub(/Helper$/, '')
+
+ MAX_ANSWERS_COUNT = 10
+
+ def question_answer_details
+ @answer = Course::Assessment::Answer.find(answer_params[:id])
+ @submission = @answer.submission
+ @assessment = @submission.assessment
+
+ @submission_question = Course::Assessment::SubmissionQuestion.
+ where(submission_id: @answer.submission_id, question_id: @answer.question_id).
+ includes({ discussion_topic: :posts }).first
+
+ @all_answers = fetch_all_answers(@answer.submission_id, @answer.question_id)
+ end
+
+ def all_answers
+ @submission_question = Course::Assessment::SubmissionQuestion.find(submission_question_params[:id])
+ question_id = @submission_question.question_id
+ submission_id = @submission_question.submission_id
+
+ @question = Course::Assessment::Question.find(question_id)
+ @submission = Course::Assessment::Submission.find(submission_id)
+ @assessment = @submission.assessment
+
+ @submission_question = Course::Assessment::SubmissionQuestion.
+ where(submission_id: submission_id, question_id: question_id).
+ includes({ discussion_topic: :posts }).first
+ @question_index = question_index(question_id)
+ @all_answers = Course::Assessment::Answer.
+ unscope(:order).
+ order(:created_at).
+ where(submission_id: submission_id, question_id: question_id)
+ end
+
+ private
+
+ def answer_params
+ params.permit(:id)
+ end
+
+ def submission_question_params
+ params.permit(:id)
+ end
+
+ def question_index(question_id)
+ question_ids = Course::QuestionAssessment.
+ where(assessment_id: @assessment.id).
+ order(:weight).
+ pluck(:question_id)
+
+ question_ids.index(question_id)
+ end
+
+ def fetch_all_answers(submission_id, question_id)
+ answers = Course::Assessment::Answer.
+ unscope(:order).
+ order(created_at: :desc).
+ where(submission_id: submission_id, question_id: question_id)
+
+ current_answer = answers.find(&:current_answer?)
+ past_answers = answers.where(current_answer: false).limit(MAX_ANSWERS_COUNT - 1).to_a.reverse
+ past_answers.unshift(current_answer)
+
+ past_answers
+ end
+end

app/controllers/course/statistics/assessments_controller.rb

@@ -18,7 +18,7 @@
  fetch_all_ancestor_assessments
  create_question_related_hash
 
- @assessment_autograded = @question_auto_gradable_status_hash.any? { |_, value| value }
+ @assessment_autograded = @question_hash.any? { |_, (_, _, auto_gradable)| auto_gradable }
  @student_submissions_hash = fetch_hash_for_main_assessment(submissions, @all_students)
  end
 
@@ -54,6 +54,12 @@
  @all_students)
  end
 
+ def live_feedback_history
+ @live_feedbacks = fetch_live_feedbacks
+ @live_feedback_details_hash = build_live_feedback_details_hash(@live_feedbacks)
+ @question = Course::Assessment::Question.find(params[:question_id])
+ end
+
  private
 
  def assessment_params
@@ -79,11 +85,8 @@
 
  def create_question_related_hash
  create_question_order_hash
- @question_maximum_grade_hash = @assessment.questions.to_h do |q|
- [q.id, q.maximum_grade]
- end
- @question_auto_gradable_status_hash = @assessment.questions.to_h do |q|
- [q.id, q.auto_gradable?]
+ @question_hash = @assessment.questions.to_h do |q|
+ [q.id, [q.maximum_grade, q.question_type, q.auto_gradable?]]
  end
  end
 
@@ -92,4 +95,32 @@
  [q.question_id, q.weight]
  end
  end
+
+ def fetch_live_feedbacks
+ Course::Assessment::LiveFeedback.where(assessment_id: assessment_params[:id],
+ creator_course_id: params[:course_user_id],
+ question_id: params[:question_id]).
+ order(created_at: :asc).includes(:code, code: :comments)
+ end
+
+ def build_live_feedback_details_hash(live_feedbacks)
+ live_feedbacks.each_with_object({}) do |lf, hash|
+ hash[lf.id] = lf.code.map do |code|
+ {
+ code: {
+ id: code.id,
+ filename: code.filename,
+ content: code.content
+ },
+ comments: code.comments.map do |comment|
+ {
+ id: comment.id,
+ line_number: comment.line_number,
+ comment: comment.comment
+ }
+ end
+ }
+ end
+ end
+ end
 end

app/views/course/statistics/answers/_answer.json.jbuilder

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+specific_answer = answer.specific
+
+json.id answer.id
+json.grade answer.grade
+json.questionType question.question_type
+json.partial! specific_answer, answer: specific_answer, can_grade: false

app/views/course/statistics/answers/all_answers.json.jbuilder

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+json.question do
+ json.id @question.id
+ json.title @question.title
+ json.maximumGrade @question.maximum_grade
+ json.description format_ckeditor_rich_text(@question.description)
+ json.type @question.question_type
+ json.questionNumber @question_index + 1
+
+ json.partial! @question, question: @question.specific, can_grade: false, answer: @all_answers.first
+end
+
+json.allAnswers @all_answers do |answer|
+ json.partial! 'answer', answer: answer, question: @question
+ json.createdAt answer.created_at&.iso8601
+ json.currentAnswer answer.current_answer
+ json.workflowState answer.workflow_state
+end
+
+json.submissionId @submission.id
+
+posts = @submission_question.discussion_topic.posts
+
+json.comments posts do |post|
+ json.partial! post, post: post if post.published?
+end

app/views/course/statistics/answers/question_answer_details.json.jbuilder

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+question = @answer.question
+
+json.question do
+ json.id question.id
+ json.title question.title
+ json.maximumGrade question.maximum_grade
+ json.description format_ckeditor_rich_text(question.description)
+ json.type question.question_type
+
+ json.partial! question, question: question.specific, can_grade: false, answer: @answer
+end
+
+json.answer do
+ json.partial! 'answer', answer: @answer, question: question
+end
+
+json.allAnswers @all_answers do |answer|
+ json.partial! 'answer', answer: answer, question: question
+ json.createdAt answer.created_at&.iso8601
+ json.currentAnswer answer.current_answer
+ json.workflowState answer.workflow_state
+end
+
+posts = @submission_question.discussion_topic.posts
+
+json.comments posts do |post|
+ json.partial! post, post: post if post.published?
+end
+
+json.submissionId @submission.id
+json.submissionQuestionId @submission_question.id

app/views/course/statistics/assessments/_answer.json.jbuilder

@@ -5,7 +5,10 @@ json.grader do
 end
 
 json.answers answers.each do |answer|
- json.id answer.id
+ maximum_grade, question_type, = @question_hash[answer.question_id]
+
+ json.lastAttemptAnswerId answer.last_attempt_answer_id
  json.grade answer.grade
- json.maximumGrade @question_maximum_grade_hash[answer.question_id]
+ json.maximumGrade maximum_grade
+ json.questionType question_type
 end

app/views/course/statistics/assessments/_attempt_status.json.jbuilder

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 json.attemptStatus answers.each do |answer|
- json.isAutograded @question_auto_gradable_status_hash[answer.question_id]
+ _, _, auto_gradable = @question_hash[answer.question_id]
+
+ json.lastAttemptAnswerId answer.last_attempt_answer_id
+ json.isAutograded auto_gradable
  json.attemptCount answer.attempt_count
  json.correct answer.correct
 end

app/views/course/statistics/assessments/_live_feedback_history_details.json.jbuilder

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+json.files @live_feedback_details_hash[live_feedback_id].each do |live_feedback_details|
+ json.id live_feedback_details[:code][:id]
+ json.filename live_feedback_details[:code][:filename]
+ json.content live_feedback_details[:code][:content]
+ json.language @question.specific.language[:name]
+ json.comments live_feedback_details[:comments].map do |comment|
+ json.lineNumber comment[:line_number]
+ json.comment comment[:comment]
+ end
+end

app/views/course/statistics/assessments/live_feedback_history.json.jbuilder

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+json.liveFeedbackHistory do
+ json.array! @live_feedbacks.map do |live_feedback|
+ json.id live_feedback.id
+ json.createdAt live_feedback.created_at&.iso8601
+ json.partial! 'live_feedback_history_details', live_feedback_id: live_feedback.id
+ end
+end
+
+json.question do
+ json.id @question.id
+ json.title @question.title
+ json.description format_ckeditor_rich_text(@question.description)
+end

app/views/course/statistics/assessments/live_feedback_statistics.json.jbuilder

@@ -10,5 +10,7 @@ json.array! @student_live_feedback_hash.each do |course_user, (submission, live_
  json.groups @group_names_hash[course_user.id] do |name|
  json.name name
  end
+
  json.liveFeedbackCount live_feedback_count
+ json.questionIds(@question_order_hash.keys.sort_by { |key| @question_order_hash[key] })
 end

client/app/api/course/Statistics/AllAnswerStatistics.ts

@@ -0,0 +1,18 @@
+import { QuestionType } from 'types/course/assessment/question';
+import { QuestionAllAnswerDisplayDetails } from 'types/course/statistics/assessmentStatistics';
+
+import { APIResponse } from 'api/types';
+
+import BaseCourseAPI from '../Base';
+
+export default class AllAnswerStatisticsAPI extends BaseCourseAPI {
+ get #urlPrefix(): string {
+ return `/courses/${this.courseId}/statistics/submission_question`;
+ }
+
+ fetchAllAnswers(
+ submissionQuestionId: number,
+ ): APIResponse<QuestionAllAnswerDisplayDetails<keyof typeof QuestionType>> {
+ return this.client.get(`${this.#urlPrefix}/${submissionQuestionId}`);
+ }
+}

client/app/api/course/Statistics/AnswerStatistics.ts

@@ -0,0 +1,18 @@
+import { QuestionType } from 'types/course/assessment/question';
+import { QuestionAnswerDetails } from 'types/course/statistics/assessmentStatistics';
+
+import { APIResponse } from 'api/types';
+
+import BaseCourseAPI from '../Base';
+
+export default class AnswerStatisticsAPI extends BaseCourseAPI {
+ get #urlPrefix(): string {
+ return `/courses/${this.courseId}/statistics/answer`;
+ }
+
+ fetchQuestionAnswerDetails(
+ answerId: number,
+ ): APIResponse<QuestionAnswerDetails<keyof typeof QuestionType>> {
+ return this.client.get(`${this.#urlPrefix}/${answerId}`);
+ }
+}

client/app/api/course/Statistics/AssessmentStatistics.ts

@@ -1,3 +1,4 @@
+import { LiveFeedbackHistoryState } from 'types/course/assessment/submission/liveFeedback';
 import {
  AncestorAssessmentStats,
  AssessmentLiveFeedbackStatistics,
@@ -42,4 +43,15 @@ export default class AssessmentStatisticsAPI extends BaseCourseAPI {
  `${this.#urlPrefix}/${assessmentId}/live_feedback_statistics`,
  );
  }
+
+ fetchLiveFeedbackHistory(
+ assessmentId: string | number,
+ questionId: string | number,
+ courseUserId: string | number,
+ ): APIResponse<LiveFeedbackHistoryState> {
+ return this.client.get(
+ `${this.#urlPrefix}/${assessmentId}/live_feedback_history`,
+ { params: { question_id: questionId, course_user_id: courseUserId } },
+ );
+ }
 }