[MBL-19889][Teacher] Fix SpeedGrader grading status showing Graded when grade is null

refs: MBL-19889
affects: Teacher
release note: Fixed an issue where SpeedGrader incorrectly displayed a submission as "Graded" when the teacher had only left a comment without assigning an actual grade.

Author: kristofnemere

automation/espresso/src/main/kotlin/com/instructure/canvas/espresso/mockcanvas/fakes/FakeSubmissionContentManager.kt

@@ -136,7 +136,8 @@ class FakeSubmissionContentManager : SubmissionContentManager {
             mediaObject = mediaObject,
             user = user,
             assignment = fragmentAssignment,
-            customGradeStatus = null
+            customGradeStatus = null,
+            grade = submission?.grade
         )
 
         val edges = if (submissionHistory.isNotEmpty()) {

libs/canvas-api-2/src/main/graphql/com/instructure/canvasapi2/SubmissionContentQuery.graphql

@@ -45,6 +45,7 @@ query SubmissionContent(
 fragment SubmissionFields on SubmissionInterface {
     groupId
     state
+    grade
     attempt
     body
     url

libs/pandautils/src/main/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentViewModel.kt

@@ -173,7 +173,8 @@ class SpeedGraderContentViewModel @Inject constructor(
                 submissionState = getSubmissionStateLabel(
                     submissionFields?.state,
                     submissionFields?.customGradeStatus,
-                    submissionFields?.statusTag
+                    submissionFields?.statusTag,
+                    submissionFields?.grade
                 ),
                 dueDate = submissionFields?.assignment?.dueAt,
                 attachmentSelectorUiState = SelectorUiState(
@@ -202,7 +203,8 @@ class SpeedGraderContentViewModel @Inject constructor(
                 submissionState = getSubmissionStateLabel(
                     submissionFields?.state,
                     submissionFields?.customGradeStatus,
-                    submissionFields?.statusTag
+                    submissionFields?.statusTag,
+                    submissionFields?.grade
                 )
             )
         }
@@ -211,7 +213,8 @@ class SpeedGraderContentViewModel @Inject constructor(
     private fun getSubmissionStateLabel(
         submissionState: SubmissionState?,
         customGradeStatus: String?,
-        statusTag: SubmissionStatusTagType?
+        statusTag: SubmissionStatusTagType?,
+        grade: String?
     ): SubmissionStateLabel {
         return when {
             statusTag == SubmissionStatusTagType.excused -> SubmissionStateLabel.Excused
@@ -222,15 +225,16 @@ class SpeedGraderContentViewModel @Inject constructor(
                 customGradeStatus
             )
 
-            submissionState == SubmissionState.graded -> SubmissionStateLabel.Graded
+            submissionState == SubmissionState.graded && grade != null -> SubmissionStateLabel.Graded
 
             statusTag == SubmissionStatusTagType.late -> SubmissionStateLabel.Late
             statusTag == SubmissionStatusTagType.missing -> SubmissionStateLabel.Missing
 
             submissionState in setOf(
                 SubmissionState.submitted,
                 SubmissionState.ungraded,
-                SubmissionState.pending_review
+                SubmissionState.pending_review,
+                SubmissionState.graded
             ) -> SubmissionStateLabel.Submitted
 
             submissionState == SubmissionState.unsubmitted -> SubmissionStateLabel.NotSubmitted

libs/pandautils/src/test/java/com/instructure/pandautils/features/speedgrader/content/SpeedGraderContentViewModelTest.kt

@@ -354,13 +354,25 @@ class SpeedGraderContentViewModelTest {
     @Test
     fun `fetchData updates uiState with GRADED state`() = runTest {
         coEvery { submissionFields.state } returns SubmissionState.graded
+        coEvery { submissionFields.grade } returns "A"
         coEvery { repository.getSubmission(assignmentId, studentId) } returns submissionData
 
         createViewModel()
 
         assertEquals(SubmissionStateLabel.Graded, viewModel.uiState.value.submissionState)
     }
 
+    @Test
+    fun `fetchData updates uiState with Submitted state when workflow state is graded but grade is null`() = runTest {
+        coEvery { submissionFields.state } returns SubmissionState.graded
+        coEvery { submissionFields.grade } returns null
+        coEvery { repository.getSubmission(assignmentId, studentId) } returns submissionData
+
+        createViewModel()
+
+        assertEquals(SubmissionStateLabel.Submitted, viewModel.uiState.value.submissionState)
+    }
+
     @Test
     fun `fetchData updates uiState with NONE state when submission state is null`() = runTest {
         coEvery { submissionFields.state } returns SubmissionState.UNKNOWN__
@@ -482,6 +494,7 @@ class SpeedGraderContentViewModelTest {
         assertEquals(SubmissionStateLabel.Submitted, viewModel.uiState.value.submissionState)
 
         coEvery { submissionFields.state } returns SubmissionState.graded
+        coEvery { submissionFields.grade } returns "A"
 
         gradingEventHandler.postEvent(GradingEvent.GradeChanged)