Clean up conclusion

reporting.js

@@ -16,35 +16,53 @@ const graphQLClient = new GraphQLClient(endpoint, {
 const completedSubmissionReportQuery = gql`
   mutation CompletedSubmissionReport(
     $submissionId: ID!
-    $testReport: String
-    $conclusion: SubmissionReportConclusion!
+    $report: String
+    $status: SubmissionReportStatus!
+    $reporter: String!
+    $heading: String
   ) {
     concludeSubmissionReport(
       submissionId: $submissionId
-      testReport: $testReport
-      conclusion: $conclusion
+      report: $report
+      status: $status
+      reporter: $reporter
+      heading: $heading
     ) {
       success
     }
   }
 `;
 
 const inProgressSubmissionReportQuery = gql`
-  mutation InProgressSubmissionReport($submissionId: ID!, $testReport: String) {
+  mutation InProgressSubmissionReport(
+    $submissionId: ID!
+    $report: String
+    $reporter: String!
+    $heading: String
+  ) {
     beginProcessingSubmissionReport(
       submissionId: $submissionId
-      testReport: $testReport
+      report: $report
+      reporter: $reporter
+      heading: $heading
     ) {
       success
     }
   }
 `;
 
 const queuedSubmissionReportQuery = gql`
-  mutation QueuedSubmissionReport($submissionId: ID!, $testReport: String) {
+  mutation QueuedSubmissionReport(
+    $submissionId: ID!
+    $report: String
+    $reporter: String!
+    $heading: String
+  ) {
     queueSubmissionReport(
       submissionId: $submissionId
-      testReport: $testReport
+      report: $report
+      reporter: $reporter
+      heading: $heading
     ) {
       success
     }
@@ -67,13 +85,10 @@ const reportFilePath = core.getInput("report_file_path");
 
 const statusInput = core.getInput("status");
 
-const conclusionInput = core.getInput("conclusion");
-
 const descriptionInput = core.getInput("description");
 
 // Check for report data
 let reportData;
-let reportConclusion;
 let reportDescription;
 
 if (reportFilePath != "") {
@@ -89,12 +104,12 @@ if (reportFilePath != "") {
 let reportIfGraded = (reportData) => {
   let grading = reportData.grading;
 
-  let testReport =
+  let report =
     grading == "reject"
       ? "Submission will be eventually rejected and feedback will be shared"
       : "";
 
-  return testReport;
+  return report;
 };
 
 let truncateReport = (reportText) => {
@@ -112,49 +127,51 @@ let truncateReport = (reportText) => {
   }
 };
 
+let reportStatus = statusInput;
+
 if (reportData != undefined) {
-  reportConclusion = reportData.status;
+  reportStatus = reportData.status;
   reportDescription =
     truncateReport(reportData.report) ||
     descriptionInput ||
     reportIfGraded(reportData) ||
     "Test report unavailable";
 } else {
-  reportConclusion = conclusionInput;
   reportDescription = descriptionInput || "Test report unavailable";
 }
 
-let reportStatus = statusInput;
-
-const validConclusions = ["success", "error", "failure"];
-
-let validConclusion = (conclusion) => {
-  return validConclusions.includes(conclusion);
-};
-
 let variables = {
   submissionId: submissionData.id,
-  testReport: reportDescription,
+  report: reportDescription,
   status: reportStatus,
+  reporter: "Virtual Teaching Assistant",
 };
 
 async function run() {
   let mutation;
   switch (statusInput) {
     case "queued":
       mutation = queuedSubmissionReportQuery;
+      variables.heading = "Automated tests are queued";
       break;
     case "in_progress":
       mutation = inProgressSubmissionReportQuery;
+      variables.heading = "Automated tests are in progress";
       break;
-    case "completed":
+    case "error":
       mutation = completedSubmissionReportQuery;
-      if (validConclusion(reportConclusion) && reportDescription != undefined) {
-        variables.conclusion = reportConclusion;
-      } else {
-        throw "Invalid conclusion for completed status or missing description";
-      }
-
+      variables.heading = "Automated tests passed";
+      variables.status = "error";
+      break;
+    case "failure":
+      mutation = completedSubmissionReportQuery;
+      variables.heading = "Automated tests failed";
+      variables.status = "failure";
+      break;
+    case "success":
+      mutation = completedSubmissionReportQuery;
+      variables.heading = "Automated tests passed";
+      variables.status = "success";
       break;
     default:
       throw "Invalid submission report status";