Changed the submission response so that the reject reason is now a ge…

…neral message.
OliverLok · Dec 30, 2023 · fde7b07 · fde7b07
1 parent 6c444c4
commit fde7b07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/api/submission/submit.go b/api/submission/submit.go
@@ -18,7 +18,7 @@ type SubmitRequest struct {
 
 type SubmitResponse struct {
     Rejected bool `json:"rejected"`
-    RejectReason string `json:"reject-reason"`
+    Message string `json:"message"`
 
     GradingSucess bool `json:"grading-success"`
     GradingInfo *model.GradingInfo `json:"result"`
@@ -44,7 +44,7 @@ func HandleSubmit(request *SubmitRequest) (*SubmitResponse, *core.APIError) {
 
     if (reject != nil) {
         response.Rejected = true;
-        response.RejectReason = reject.String();
+        response.Message = reject.String();
         return &response, nil;
     }
 

diff --git a/api/submission/submit_test.go b/api/submission/submit_test.go
@@ -45,7 +45,7 @@ func TestSubmit(test *testing.T) {
             continue;
         }
 
-        if (responseContent.RejectReason != "") {
+        if (responseContent.Message != "") {
             test.Errorf("Case %d: Response has a reject reason when it should not: '%v'.", i, responseContent);
             continue;
         }
@@ -100,13 +100,13 @@ func TestRejectSubmissionMaxAttempts(test *testing.T) {
         test.Fatalf("Response is not rejected when it should be: '%v'.", responseContent);
     }
 
-    if (responseContent.RejectReason == "") {
+    if (responseContent.Message == "") {
         test.Fatalf("Response does not have a reject reason when it should: '%v'.", responseContent);
     }
 
     expected := (&grader.RejectMaxAttempts{0}).String();
-    if (expected != responseContent.RejectReason) {
+    if (expected != responseContent.Message) {
         test.Fatalf("Did not get the expected rejection reason. Expected: '%s', Actual: '%s'.",
-            expected, responseContent.RejectReason);
+            expected, responseContent.Message);
     }
 }