Add delete and update tests

Author: solomonng2001

apps/execution-service/README.md

@@ -134,7 +134,14 @@ curl -X PUT http://localhost:8083/tests/{questionDocRefId} \
 }'
 ```
 
+`DELETE /tests/{questionDocRefId}`
+
+To delete an existing test case from an existing question, run the following command:
+
 ```bash
+curl -X DELETE http://localhost:8083/tests/{questionDocRefId} \
+-H "Content-Type: application/json"
+```
 
 `POST /tests/{questionDocRefId}/execute`
 

apps/execution-service/handlers/create.go

@@ -24,6 +24,10 @@ func (s *Service) CreateTest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Normalise test cases
+	test.VisibleTestCases = utils.NormaliseTestCaseFormat(test.VisibleTestCases)
+	test.HiddenTestCases = utils.NormaliseTestCaseFormat(test.HiddenTestCases)
+
 	// Automatically populate validation for input and output in test case
 	test.InputValidation = utils.GetDefaultValidation()
 	test.OutputValidation = utils.GetDefaultValidation()
@@ -54,6 +58,7 @@ func (s *Service) CreateTest(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "Test already exists for the question", http.StatusConflict)
 		return
 	}
+	defer iter.Stop()
 
 	// Save test to Firestore
 	docRef, _, err := s.Client.Collection("tests").Add(ctx, map[string]interface{}{
@@ -103,3 +108,12 @@ func (s *Service) CreateTest(w http.ResponseWriter, r *http.Request) {
 //"visibleTestCases": "2\nhello\nolleh\nHannah\nhannaH",
 //"hiddenTestCases": "2\nHannah\nhannaH\nabcdefg\ngfedcba"
 //}'
+
+//curl -X POST http://localhost:8083/tests \
+//-H "Content-Type: application/json" \
+//-d "{
+//\"questionDocRefId\": \"sampleDocRefId12345\",
+//\"questionTitle\": \"Sample Question Title\",
+//\"visibleTestCases\": \"2\\nhello\\nolleh\\nHannah\\nhannaH\",
+//\"hiddenTestCases\": \"2\\nHannah\\nhannaH\\nabcdefg\\ngfedcba\"
+//}"

apps/execution-service/handlers/delete.go

@@ -0,0 +1,40 @@
+package handlers
+
+import (
+	"github.com/go-chi/chi/v5"
+	"google.golang.org/api/iterator"
+	"net/http"
+)
+
+func (s *Service) DeleteTest(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+
+	// Parse request
+	docRefID := chi.URLParam(r, "questionDocRefId")
+
+	docRef := s.Client.Collection("tests").Where("questionDocRefId", "==", docRefID).Limit(1).Documents(ctx)
+	doc, err := docRef.Next()
+	if err != nil {
+		if err == iterator.Done {
+			http.Error(w, "Test not found", http.StatusNotFound)
+			return
+		}
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	defer docRef.Stop()
+
+	_, err = doc.Ref.Delete(ctx)
+	if err != nil {
+		http.Error(w, "Error deleting test", http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+}
+
+// Manual test cases
+
+//curl -X DELETE http://localhost:8083/tests/sampleDocRefId123 \
+//-H "Content-Type: application/json"

apps/execution-service/handlers/update.go

@@ -22,6 +22,10 @@ func (s *Service) UpdateTest(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Normalise test cases
+	test.VisibleTestCases = utils.NormaliseTestCaseFormat(test.VisibleTestCases)
+	test.HiddenTestCases = utils.NormaliseTestCaseFormat(test.HiddenTestCases)
+
 	// Only test cases will be updated
 	// Validate test case format with default validation
 	if _, err := utils.ValidateTestCaseFormat(test.VisibleTestCases, utils.GetDefaultValidation(),

apps/execution-service/main.go

@@ -91,7 +91,7 @@ func registerRoutes(r *chi.Mux, service *handlers.Service) {
 			// Current: Unused, since testcases are executed within service and not exposed
 			// Future extension: can be read by admin to view testcases
 			r.Put("/", service.UpdateTest)
-			//r.Delete("/", service.DeleteTest)
+			r.Delete("/", service.DeleteTest)
 			r.Get("/", service.ReadVisibleTests)
 			r.Post("/execute", service.ExecuteVisibleAndCustomTests)
 			r.Post("/submit", service.ExecuteVisibleAndHiddenTestsAndSubmit)

apps/execution-service/utils/validateTestCaseFormat.go

@@ -77,3 +77,7 @@ package main
 	result := validateFunc.Interface().(func(string) bool)(inputOrOutput)
 	return result, nil
 }
+
+func NormaliseTestCaseFormat(testCase string) string {
+	return strings.ReplaceAll(testCase, "\\n", "\n")
+}