Feature/dnd validation

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/DndValidationResponse.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022 James Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package uk.ac.cam.cl.dtg.isaac.dos;
+
+import uk.ac.cam.cl.dtg.isaac.dos.content.Choice;
+import uk.ac.cam.cl.dtg.isaac.dos.content.Content;
+
+import java.util.Date;
+import java.util.Map;
+
+
+/**
+ *  Class for providing correctness feedback about drag and drop questions in a submitted Choice.
+ */
+public class DndValidationResponse extends QuestionValidationResponse {
+    private Map<String, Boolean> dropZonesCorrect;
+
+    /**
+     * Default constructor for Jackson.
+     */
+    public DndValidationResponse() {
+    }
+
+    /**
+     *  Full constructor.
+     *
+     * @param questionId - questionId.
+     * @param answer - answer.
+     * @param correct - correct.
+     * @param dropZonesCorrect - map of correctness status of each submitted item. Key: dropZoneId, value: isCorrect
+     * @param explanation - explanation.
+     * @param dateAttempted - dateAttempted.
+     */
+    public DndValidationResponse(final String questionId, final Choice answer,
+                                 final Boolean correct, final Map<String, Boolean> dropZonesCorrect,
+                                 final Content explanation, final Date dateAttempted) {
+        super(questionId, answer, correct, explanation, dateAttempted);
+        this.dropZonesCorrect = dropZonesCorrect;
+    }
+
+    public Map<String, Boolean> getDropZonesCorrect() {
+        return dropZonesCorrect;
+    }
+
+    public void setDropZonesCorrect(final Map<String, Boolean> itemsCorrect) {
+        this.dropZonesCorrect = itemsCorrect;
+    }
+}

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/IsaacDndQuestion.java

@@ -17,19 +17,17 @@
 
 import uk.ac.cam.cl.dtg.isaac.dos.content.DTOMapping;
 import uk.ac.cam.cl.dtg.isaac.dos.content.JsonContentType;
-import uk.ac.cam.cl.dtg.isaac.dto.IsaacClozeQuestionDTO;
 import uk.ac.cam.cl.dtg.isaac.dto.IsaacDndQuestionDTO;
-import uk.ac.cam.cl.dtg.isaac.quiz.IsaacClozeValidator;
+import uk.ac.cam.cl.dtg.isaac.quiz.IsaacDndValidator;
 import uk.ac.cam.cl.dtg.isaac.quiz.ValidatesWith;
 
-
 /**
  * Content DO for IsaacDndQuestions.
  *
  */
 @DTOMapping(IsaacDndQuestionDTO.class)
 @JsonContentType("isaacDndQuestion")
-@ValidatesWith(IsaacClozeValidator.class)
+@ValidatesWith(IsaacDndValidator.class)
 public class IsaacDndQuestion extends IsaacItemQuestion {
 
     private Boolean withReplacement;

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/DndChoice.java

@@ -17,16 +17,28 @@
 
 import uk.ac.cam.cl.dtg.isaac.dto.content.DndChoiceDTO;
 
+import java.util.List;
+
 /**
- * Choice for Dnd Questions, containing a list of DndItems.
+ * Choice for Item Questions, containing a list of Items.
  *
  */
 @DTOMapping(DndChoiceDTO.class)
 @JsonContentType("dndChoice")
-public class DndChoice extends ItemChoice {
+public class DndChoice extends Choice {
+    private List<DndItem> items;
+
     /**
      * Default constructor required for mapping.
      */
     public DndChoice() {
     }
-}
+
+    public List<DndItem> getItems() {
+        return items;
+    }
+
+    public void setItems(final List<DndItem> items) {
+        this.items = items;
+    }
+}

src/main/java/uk/ac/cam/cl/dtg/isaac/dos/content/ItemChoice.java

@@ -26,7 +26,6 @@
 @DTOMapping(ItemChoiceDTO.class)
 @JsonContentType("itemChoice")
 public class ItemChoice extends Choice {
-
     private Boolean allowSubsetMatch;
     private List<Item> items;
 

src/main/java/uk/ac/cam/cl/dtg/isaac/dto/DndValidationResponseDTO.java

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2022 James Sharkey
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package uk.ac.cam.cl.dtg.isaac.dto;
+
+import uk.ac.cam.cl.dtg.isaac.dto.content.ChoiceDTO;
+import uk.ac.cam.cl.dtg.isaac.dto.content.ContentDTO;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ *  Class for providing correctness feedback about drag and drop questions in a submitted Choice.
+ */
+public class DndValidationResponseDTO extends QuestionValidationResponseDTO {
+    private Map<String, Boolean> dropZonesCorrect;
+
+    /**
+     * Default constructor for Jackson.
+     */
+    public DndValidationResponseDTO() {
+    }
+
+    /**
+     *  Full constructor.
+     *
+     * @param questionId - questionId.
+     * @param answer - answer.
+     * @param correct - correct.
+     * @param dropZonesCorrect - map of correctness status of each submitted item. Key: dropZoneId, value: isCorrect
+     * @param explanation - explanation.
+     * @param dateAttempted - dateAttempted.
+     */
+    public DndValidationResponseDTO(final String questionId, final ChoiceDTO answer,
+                                 final Boolean correct, final Map<String, Boolean> dropZonesCorrect,
+                                 final ContentDTO explanation, final Date dateAttempted) {
+        super(questionId, answer, correct, explanation, dateAttempted);
+        this.dropZonesCorrect = dropZonesCorrect;
+    }
+
+    public Map<String, Boolean> getDropZonesCorrect() {
+        return dropZonesCorrect;
+    }
+
+    public void setDropZonesCorrect(final Map<String, Boolean> dropZonesCorrect) {
+        this.dropZonesCorrect = dropZonesCorrect;
+    }
+}

src/main/java/uk/ac/cam/cl/dtg/isaac/dto/content/DndChoiceDTO.java

@@ -15,16 +15,26 @@
  */
 package uk.ac.cam.cl.dtg.isaac.dto.content;
 
+import java.util.List;
+
 /**
  * Choice for Dnd Questions, containing a list of DndItems.
  *
  */
-public class DndChoiceDTO extends ItemChoiceDTO {
+public class DndChoiceDTO extends ChoiceDTO {
+    private List<DndItemDTO> items;
 
     /**
      * Default constructor required for mapping.
      */
     public DndChoiceDTO() {
     }
 
+    public List<DndItemDTO> getItems() {
+        return items;
+    }
+
+    public void setItems(final List<DndItemDTO> items) {
+        this.items = items;
+    }
 }