refactor(statsType): simplification of type

- submissionExists not used anymore
- ancestor and main stats jbuilder refactored
- since both are having quite similar structure, redefine some jbuilder

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+json.grader do
+  json.id grader&.id || 0
+  json.name grader&.name || 'System'
+end
+
+json.answers answers.each do |answer|
+  json.id answer.id
+  json.grade answer.grade
+  json.maximumGrade @question_maximum_grade_hash[answer.question_id]
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+json.id assessment.id
+json.title assessment.title
+json.startAt assessment.start_at&.iso8601
+json.endAt assessment.end_at&.iso8601
+json.maximumGrade assessment.maximum_grade
+json.url course_assessment_path(course, assessment)

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+json.courseUser do
+  json.id course_user.id
+  json.name course_user.name
+  json.role course_user.role
+  json.isPhantom course_user.phantom?
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+if submission.nil?
+  json.workflowState 'unstarted'
+else
+  json.workflowState submission.workflow_state
+  json.submittedAt submission.submitted_at&.iso8601
+  json.endAt end_at&.iso8601
+  json.totalGrade submission.grade
+end

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

@@ -1,27 +1,9 @@
 # frozen_string_literal: true
 json.assessment do
-  json.id @assessment.id
-  json.title @assessment.title
-  json.startAt @assessment.start_at&.iso8601
-  json.endAt @assessment.end_at&.iso8601
-  json.maximumGrade @assessment.maximum_grade
-  json.url course_assessment_path(current_course, @assessment)
+  json.partial! 'assessment', assessment: @assessment, course: current_course
 end
 
 json.submissions @student_submissions_hash.each do |course_user, (submission, end_at)|
-  json.courseUser do
-    json.id course_user.id
-    json.name course_user.name
-    json.role course_user.role
-    json.isPhantom course_user.phantom?
-  end
-
-  if submission.nil?
-    json.workflowState 'unstarted'
-  else
-    json.workflowState submission.workflow_state
-    json.submittedAt submission.submitted_at&.iso8601
-    json.endAt end_at&.iso8601
-    json.totalGrade submission.grade
-  end
+  json.partial! 'course_user', course_user: course_user
+  json.partial! 'submission', submission: submission, end_at: end_at
 end

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

@@ -1,50 +1,20 @@
 # frozen_string_literal: true
 json.assessment do
-  json.id @assessment.id
-  json.title @assessment.title
-  json.startAt @assessment.start_at&.iso8601
-  json.endAt @assessment.end_at&.iso8601
-  json.maximumGrade @assessment.maximum_grade
+  json.partial! 'assessment', assessment: @assessment, course: current_course
   json.questionCount @assessment.question_count
-  json.url course_assessment_path(current_course, @assessment)
 end
 
 json.submissions @student_submissions_hash.each do |course_user, (submission, answers, end_at)|
-  json.courseUser do
-    json.id course_user.id
-    json.name course_user.name
-    json.role course_user.role
-    json.isPhantom course_user.phantom?
-  end
+  json.partial! 'course_user', course_user: course_user
+  json.partial! 'submission', submission: submission, end_at: end_at
 
   json.groups course_user.groups do |group|
     json.name group.name
   end
 
-  json.submissionExists !submission.nil?
-
-  if submission.nil?
-    json.workflowState 'unstarted'
-  else
-    json.workflowState submission.workflow_state
-    json.submittedAt submission.submitted_at&.iso8601
-    json.endAt end_at&.iso8601
-    json.totalGrade submission.grade
-
-    if submission.workflow_state == 'published' && submission.grader_ids
-      # the graders are all the same regardless of question, so we just pick the first one
-      grader = @course_users_hash[submission.grader_ids.first]
-      json.grader do
-        json.id grader&.id || 0
-        json.name grader&.name || 'System'
-      end
-
-      json.answers answers.each do |answer|
-        json.id answer.id
-        json.grade answer.grade
-        json.maximumGrade @question_maximum_grade_hash[answer.question_id]
-      end
-    end
+  if !submission.nil? && submission.workflow_state == 'published' && submission.grader_ids
+    # the graders are all the same regardless of question, so we just pick the first one
+    json.partial! 'answer', grader: @course_users_hash[submission.grader_ids.first], answers: answers
   end
 end
 

client/app/types/course/statistics/assessmentStatistics.ts

@@ -43,7 +43,6 @@ export interface MainSubmissionInfo extends SubmissionInfo {
   answers?: AnswerInfo[];
   grader?: UserInfo;
   groups: { name: string }[];
-  submissionExists: boolean;
 }
 
 export interface AncestorSubmissionInfo extends SubmissionInfo {

spec/controllers/course/statistics/assessment_controller_spec.rb

@@ -65,11 +65,6 @@
           expect(json_result['submissions'][1]['workflowState']).to eq('attempting')
           expect(json_result['submissions'][2]['workflowState']).to be_nil
 
-          # checking if the submission exists
-          expect(json_result['submissions'][0]['submissionExists']).to be_truthy
-          expect(json_result['submissions'][1]['submissionExists']).to be_truthy
-          expect(json_result['submissions'][2]['submissionExists']).to be_falsey
-
           # only published submissions' answers will be included in the stats
           expect(json_result['submissions'][0]['answers']).not_to be_nil
           expect(json_result['submissions'][1]['answers']).to be_nil
@@ -102,11 +97,6 @@
           expect(json_result['submissions'][1]['workflowState']).to eq('attempting')
           expect(json_result['submissions'][2]['workflowState']).to be_nil
 
-          # checking if the submission exists
-          expect(json_result['submissions'][0]['submissionExists']).to be_truthy
-          expect(json_result['submissions'][1]['submissionExists']).to be_truthy
-          expect(json_result['submissions'][2]['submissionExists']).to be_falsey
-
           # only published submissions' answers will be included in the stats
           expect(json_result['submissions'][0]['answers']).not_to be_nil
           expect(json_result['submissions'][1]['answers']).to be_nil
@@ -153,9 +143,6 @@
           expect(subject).to have_http_status(:success)
           json_result = JSON.parse(response.body)
 
-          # all the students data will be included here, including the non-existing submission one
-          expect(json_result['allStudents'].count).to eq(3)
-
           # however, only the existing submissions will be shown
           expect(json_result['submissions'].count).to eq(2)
         end