final fixes

SELab-2 · May 9, 2024 · b672fda · b672fda
1 parent 59c24ca
commit b672fda
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/backend/app/src/main/java/com/ugent/pidgeon/controllers/TestController.java b/backend/app/src/main/java/com/ugent/pidgeon/controllers/TestController.java
@@ -149,11 +149,7 @@ private ResponseEntity<?> alterTests(
               DockerSubmissionTestModel.installImage(finalDockerImage);
             }
           });
-          testEntity.setDockerImage(dockerImage);
 
-          testEntity.setDockerTestScript(dockerScript);
-          testEntity.setDockerTestTemplate(
-              dockerTemplate); // If present, the test is in template mode
           //Update fields
           if (dockerImage != null || !httpMethod.equals(HttpMethod.PATCH)) {
             testEntity.setDockerImage(dockerImage);

diff --git a/backend/app/src/main/java/com/ugent/pidgeon/model/json/SubmissionJson.java b/backend/app/src/main/java/com/ugent/pidgeon/model/json/SubmissionJson.java
@@ -23,6 +23,7 @@ public class SubmissionJson {
 
 
     private DockerTestFeedbackJson dockerFeedback;
+    private String artifactUrl;
 
 
 
@@ -31,7 +32,8 @@ public SubmissionJson() {
 
     public SubmissionJson(
             long id, String projectUrl, String groupUrl, Long projectId, Long groupId, String fileUrl,
-            Boolean structureAccepted, OffsetDateTime submissionTime, String structureFeedbackUrl, DockerTestFeedbackJson dockerFeedback, String dockerStatus) {
+            Boolean structureAccepted, OffsetDateTime submissionTime, String structureFeedbackUrl, DockerTestFeedbackJson dockerFeedback, String dockerStatus,
+        String artifactUrl) {
         this.submissionId = id;
         this.projectUrl = projectUrl;
         this.groupUrl = groupUrl;
@@ -43,6 +45,7 @@ public SubmissionJson(
         this.dockerFeedback = dockerFeedback;
         this.structureFeedback = structureFeedbackUrl;
         this.dockerStatus = dockerStatus;
+      this.artifactUrl = artifactUrl;
     }
 
     public long getSubmissionId() {
@@ -134,4 +137,12 @@ public DockerTestFeedbackJson getDockerFeedback() {
     public void setDockerFeedback(DockerTestFeedbackJson dockerFeedback) {
         this.dockerFeedback = dockerFeedback;
     }
+
+    public String getArtifactUrl() {
+        return artifactUrl;
+    }
+
+    public void setArtifactUrl(String artifactUrl) {
+        this.artifactUrl = artifactUrl;
+    }
 }
diff --git a/...pp/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerSubmissionTestModel.java b/...pp/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerSubmissionTestModel.java
@@ -237,11 +237,15 @@ private static DockerSubtestResult getDockerSubtestResult(String entry) {
         templateEntry.setRequired(true);
       } else if (currentOption.equalsIgnoreCase(">Optional")) {
         templateEntry.setRequired(false);
-      } else if (currentOption.substring(0, 12).equalsIgnoreCase(">Description")) {
+      } else if (currentOption.length() >=13 && currentOption.substring(0, 13).equalsIgnoreCase(">Description=")) {
         templateEntry.setTestDescription(currentOption.split("=\"")[1].split("\"")[0]);
       }
     }
-    templateEntry.setCorrect(entry.substring(lineIterator));
+    String substring = entry.substring(lineIterator);
+    if (substring.endsWith("\n")) {
+      substring = substring.substring(0, substring.length() - 1);
+    }
+    templateEntry.setCorrect(substring);
     return templateEntry;
   }
 
@@ -309,9 +313,10 @@ public static boolean isValidTemplate(String template) {
       }
       if (isConfigurationLine) {
         if (line.charAt(0) == '>') {
+          boolean isDescription = line.length() >= 13 && line.substring(0, 13).equalsIgnoreCase(">Description=");
           // option lines
           if (!line.equalsIgnoreCase(">Required") && !line.equalsIgnoreCase(">Optional")
-              && !line.substring(0, 12).equalsIgnoreCase(">Description")) {
+              && !isDescription) {
             return false;
           }
         } else {

diff --git a/backend/app/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerSubtestResult.java b/backend/app/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerSubtestResult.java
@@ -62,13 +62,14 @@ public void setRequired(boolean required) {
 
     @Override
     public boolean isAllowed() {
-        return false;
+        return correct.equals(output);
     }
 
     @Override
     public String getFeedbackAsString() {
         // Display feedback as a json, only display testName and testDescription if they are not empty
         String testDescription = this.testDescription.isEmpty() ? "" : "\",\"testDescription\":\"" + this.testDescription;
-        return "{\"testName\":\"" + testName + testDescription + "\",\"correct\":\"" + correct + "\",\"output\":\"" + output + "\"}";
+        //TODO add allowed to json
+        return "{\"testName\":\"" + testName + testDescription + "\",\"correct\":\"" + correct + "\",\"output\":\"" + output + "\", \"required\":" + required + ", \"succes\": " + isAllowed() + "}";
     }
 }
diff --git a/...app/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerTemplateTestOutput.java b/...app/src/main/java/com/ugent/pidgeon/model/submissionTesting/DockerTemplateTestOutput.java
@@ -22,7 +22,7 @@ public DockerTemplateTestOutput(List<DockerSubtestResult> subtestResults, boolea
   @Override
   public String getFeedbackAsString(){
     //json representation of the tests
-    StringBuilder feedback = new StringBuilder("{subtests: [");
+    StringBuilder feedback = new StringBuilder("{\"subtests\": [");
     for (DockerSubtestResult subtestResult : subtestResults) {
       feedback.append(subtestResult.getFeedbackAsString()).append(",");
     }

diff --git a/backend/app/src/main/java/com/ugent/pidgeon/util/EntityToJsonConverter.java b/backend/app/src/main/java/com/ugent/pidgeon/util/EntityToJsonConverter.java
@@ -251,7 +251,8 @@ else if (submission.getDockerTestType().equals(DockerTestType.SIMPLE)) {
                 submission.getSubmissionTime(),
                 submission.getStructureFeedback(),
                 feedback,
-                submission.getDockerTestState().toString()
+                submission.getDockerTestState().toString(),
+            ApiRoutes.SUBMISSION_BASE_PATH + "/" + submission.getId() + "/artifacts"
         );
     }