Add question part status to AssignmentProgressDTO

Author: mwtrew

src/main/java/uk/ac/cam/cl/dtg/isaac/api/AssignmentFacade.java

@@ -405,25 +405,29 @@ public Response getAssignmentProgress(@Context final HttpServletRequest request,
 
                 // can the user access the data?
                 if (userSummary.isAuthorisedFullAccess()) {
-                    ArrayList<GameboardItemState> states = Lists.newArrayList();
+                    ArrayList<GameboardItemState> questionStates = Lists.newArrayList();
+                    ArrayList<List<QuestionPartState>> questionPartStates = Lists.newArrayList();
                     ArrayList<Integer> correctQuestionParts = Lists.newArrayList();
                     ArrayList<Integer> incorrectQuestionParts = Lists.newArrayList();
                     for (GameboardItem questionResult : userGameboardItems.getRight()) {
-                        states.add(questionResult.getState());
+                        questionStates.add(questionResult.getState());
+                        questionPartStates.add(questionResult.getQuestionPartStates());
                         correctQuestionParts.add(questionResult.getQuestionPartsCorrect());
                         incorrectQuestionParts.add(questionResult.getQuestionPartsIncorrect());
                     }
                     result.add(new AssignmentProgressDTO(
                             userSummary,
                             correctQuestionParts,
                             incorrectQuestionParts,
-                            states
+                            questionStates,
+                            questionPartStates
                     ));
                 } else {
                     result.add(new AssignmentProgressDTO(
                             userSummary,
                             Collections.emptyList(),
                             Collections.emptyList(),
+                            Collections.emptyList(),
                             Collections.emptyList()
                     ));
                 }

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

@@ -12,7 +12,8 @@ public class AssignmentProgressDTO {
     public UserSummaryDTO user;
     public List<Integer> correctPartResults;
     public List<Integer> incorrectPartResults;
-    public List<Constants.GameboardItemState> results;
+    public List<Constants.GameboardItemState> questionResults;
+    public List<List<Constants.QuestionPartState>> questionPartResults;
 
     /**
      * Complete AssignmentProgressDTO constructor with all dependencies.
@@ -25,11 +26,12 @@ public class AssignmentProgressDTO {
      * @param results
      *            - Array of results.
      */
-    public AssignmentProgressDTO(UserSummaryDTO user, List<Integer> correctPartResults, List<Integer> incorrectPartResults, List<Constants.GameboardItemState> results) {
+    public AssignmentProgressDTO(UserSummaryDTO user, List<Integer> correctPartResults, List<Integer> incorrectPartResults, List<Constants.GameboardItemState> results, List<List<Constants.QuestionPartState>> partResults) {
         this.user = user;
         this.correctPartResults = correctPartResults;
         this.incorrectPartResults = incorrectPartResults;
-        this.results = results;
+        this.questionResults = results;
+        this.questionPartResults = partResults;
     }
 
     public AssignmentProgressDTO() {
@@ -59,11 +61,20 @@ public void setIncorrectPartResults(List<Integer> incorrectPartResults) {
         this.incorrectPartResults = incorrectPartResults;
     }
 
-    public List<Constants.GameboardItemState> getResults() {
-        return results;
+    public List<Constants.GameboardItemState> getQuestionResults() {
+        return questionResults;
     }
 
-    public void setResults(List<Constants.GameboardItemState> results) {
-        this.results = results;
+    public void setQuestionResults(List<Constants.GameboardItemState> questionResults) {
+        this.questionResults = questionResults;
+    }
+
+
+    public List<List<Constants.QuestionPartState>> getQuestionPartResults() {
+        return questionPartResults;
+    }
+
+    public void setQuestionPartResults(List<List<Constants.QuestionPartState>> questionPartResults) {
+        this.questionPartResults = questionPartResults;
     }
 }

src/test/java/uk/ac/cam/cl/dtg/isaac/api/AssignmentFacadeIT.java

@@ -28,7 +28,6 @@
 import uk.ac.cam.cl.dtg.isaac.dto.AssignmentStatusDTO;
 import uk.ac.cam.cl.dtg.isaac.dto.SegueErrorResponse;
 import uk.ac.cam.cl.dtg.isaac.dto.UserGroupDTO;
-import uk.ac.cam.cl.dtg.isaac.dto.users.UserSummaryDTO;
 import uk.ac.cam.cl.dtg.segue.dao.SegueDatabaseException;
 
 import jakarta.servlet.http.Cookie;
@@ -45,7 +44,6 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
-import java.util.Map;
 
 import static org.easymock.EasyMock.replay;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -506,7 +504,7 @@ public void getAssignmentProgressEndpoint_getProgressAsGroupOwner_succeeds() thr
         // check the progress response contains the right fields
         AssignmentProgressDTO progressDTO = responseData.get(0);
         Assertions.assertNotNull(progressDTO.getUser());
-        Assertions.assertNotNull(progressDTO.getResults());
+        Assertions.assertNotNull(progressDTO.getQuestionResults());
         Assertions.assertNotNull(progressDTO.getCorrectPartResults());
         Assertions.assertNotNull(progressDTO.getIncorrectPartResults());
     }
@@ -540,7 +538,7 @@ public void getAssignmentProgressEndpoint_getProgressAsAdditionalManager_succeed
         // check the progress response contains the right fields
         AssignmentProgressDTO progressDTO = responseData.get(0);
         Assertions.assertNotNull(progressDTO.getUser());
-        Assertions.assertNotNull(progressDTO.getResults());
+        Assertions.assertNotNull(progressDTO.getQuestionResults());
         Assertions.assertNotNull(progressDTO.getCorrectPartResults());
         Assertions.assertNotNull(progressDTO.getIncorrectPartResults());
     }

src/test/java/uk/ac/cam/cl/dtg/isaac/api/AuthorisationFacadeIT.java

@@ -276,7 +276,7 @@ public void revokeOwnerAssociation_studentRevokesTeacherConnection_studentNotInM
                 UserSummaryDTO userSummary = studentResults.getUser();
                 assert userSummary != null;
                 if (userSummary.getId() == ALICE_STUDENT_ID) {
-                    List<Constants.GameboardItemState> results = studentResults.getResults();
+                    List<Constants.GameboardItemState> results = studentResults.getQuestionResults();
                     assertTrue(results != null && results.isEmpty());
                     break;
                 }