diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationController.java b/src/main/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationController.java index 2ca61814d..3af670536 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationController.java @@ -62,8 +62,12 @@ private List getStudentDataForReferenceComponent(PeerGrou String nodeId, String componentId, String fieldName) throws Exception { Run run = peerGroup.getPeerGrouping().getRun(); ReferenceComponent component = getReferenceComponent(run, nodeId, componentId, fieldName); - String referenceComponentType = getProjectComponent(run, component.nodeId, - component.componentId).getType(); + ProjectComponent referenceProjectComponent = component == null ? null + : getProjectComponent(run, component.nodeId, component.componentId); + if (referenceProjectComponent == null) { + return new ArrayList(); + } + String referenceComponentType = referenceProjectComponent.getType(); if (referenceComponentType.equals("MultipleChoice")) { return getStudentDataForMultipleChoice(peerGroup, component); } else if (referenceComponentType.equals("OpenResponse")) { @@ -92,6 +96,9 @@ private List getStudentDataForOpenResponse(PeerGroup peer private ReferenceComponent getReferenceComponent(Run run, String nodeId, String componentId, String fieldName) throws IOException, JSONException, ObjectNotFoundException { ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId); + if (projectComponent == null) { + return null; + } JSONObject referenceComponentJSON = projectComponent.getJSONObject(fieldName); return new ReferenceComponent(referenceComponentJSON); } diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateDataController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateDataController.java index 439aee09e..f14d74c0f 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateDataController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateDataController.java @@ -67,7 +67,8 @@ protected boolean isTeacherOfRun(Authentication auth, Run run) { protected boolean isComponentType(Run run, String nodeId, String componentId, String expectedComponentType) throws IOException, JSONException, ObjectNotFoundException { ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId); - return projectComponent.getString("type").equals(expectedComponentType); + return projectComponent != null + && projectComponent.getString("type").equals(expectedComponentType); } protected ProjectComponent getProjectComponent(Run run, String nodeId, String componentId) diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataController.java index 2f9982dce..d91958000 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataController.java @@ -72,8 +72,9 @@ private boolean isValidGraphComponent(Run run, String nodeId, String componentId String showWorkNodeId, String showWorkComponentId, String showClassmateWorkSource) throws IOException, JSONException, ObjectNotFoundException { ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId); - return isGraphComponent(projectComponent) && hasMatchingConnectedComponent(projectComponent, - showWorkNodeId, showWorkComponentId, showClassmateWorkSource); + return projectComponent != null && isGraphComponent(projectComponent) + && hasMatchingConnectedComponent(projectComponent, showWorkNodeId, showWorkComponentId, + showClassmateWorkSource); } private boolean isGraphComponent(ProjectComponent projectComponent) throws JSONException { diff --git a/src/main/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkController.java b/src/main/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkController.java index b308a97a2..cbbda9c07 100644 --- a/src/main/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkController.java +++ b/src/main/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkController.java @@ -46,7 +46,8 @@ private boolean isValidShowPeerGroupWorkComponent(Run run, String nodeId, String String showWorkNodeId, String showWorkComponentId) throws JSONException, IOException, ObjectNotFoundException { ProjectComponent projectComponent = getProjectComponent(run, nodeId, componentId); - return projectComponent.getString("type").equals(SHOW_PEER_GROUP_WORK_TYPE) + return projectComponent != null + && projectComponent.getString("type").equals(SHOW_PEER_GROUP_WORK_TYPE) && projectComponent.getString("showWorkNodeId").equals(showWorkNodeId) && projectComponent.getString("showWorkComponentId").equals(showWorkComponentId); } diff --git a/src/test/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationControllerTest.java b/src/test/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationControllerTest.java index d7490e254..27f583159 100644 --- a/src/test/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationControllerTest.java +++ b/src/test/java/org/wise/portal/presentation/web/controllers/peergroup/PeerGroupStudentWorkAnnotationControllerTest.java @@ -60,6 +60,54 @@ public void getStudentDataForDynamicPrompt_InvalidDynamicPromptContent_Exception verifyAll(); } + @Test + public void getStudentDataForDynamicPrompt_ComponentNotInProject_ReturnEmptyList() + throws Exception { + expectUserInPeerGroup(); + expectInvalidDynamicPromptContent(); + replayAll(); + List studentWorkAnnotation = controller + .getStudentDataForDynamicPrompt(peerGroup1, run1Node2Id, run1Component1Id, studentAuth); + assertTrue(studentWorkAnnotation.isEmpty()); + verifyAll(); + } + + @Test + public void getStudentDataForQuestionBank_ReferenceComponentNotInProject_ReturnEmptyList() + throws Exception { + expectUserInPeerGroup(); + String project_with_missing_reference_component = """ + { + "nodes": [ + { + "id": "%s", + "type": "node", + "components": [ + { + "id": "%s", + "type": "OpenResponse", + "questionBank": { + "peerGroupingTag": "%s", + "referenceComponent": { + "nodeId": "%s", + "componentId": "%s" + } + } + } + ] + } + ] + }""".formatted(run1Node2Id, run1Component2Id, peerGrouping1Tag, run1Node1Id, + run1Component1Id); + expect(projectService.getProjectContent(project1)) + .andReturn(project_with_missing_reference_component).times(2); + replayAll(); + List studentWorkAnnotation = controller + .getStudentDataForQuestionBank(peerGroup1, run1Node2Id, run1Component2Id, studentAuth); + assertTrue(studentWorkAnnotation.isEmpty()); + verifyAll(); + } + private void expectInvalidDynamicPromptContent() throws IOException { String project_sans_reference_component = """ { diff --git a/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateDiscussionDataControllerTest.java b/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateDiscussionDataControllerTest.java index 7d104b462..b16bfb3ab 100644 --- a/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateDiscussionDataControllerTest.java +++ b/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateDiscussionDataControllerTest.java @@ -52,6 +52,29 @@ public void getClassmateDiscussionWork_NotDiscussionComponent_ThrowException() verifyAll(); } + @Test + public void getClassmateDiscussionWork_ComponentNotInProject_ThrowException() + throws IOException, NoSuchMethodException, ObjectNotFoundException { + setupStudent1InRunAndInPeriod(); + expectComponentType(controller.DISCUSSION_TYPE); + replayAll(); + assertThrows(AccessDeniedException.class, () -> controller + .getClassmateDiscussionWork(studentAuth, run1, run1Period1Id, NODE_ID1, "null")); + verifyAll(); + } + + @Test + public void getClassmateDiscussionAnnotations_NodeNotInProject_ThrowException() + throws IOException, NoSuchMethodException, ObjectNotFoundException { + setupStudent1InRunAndInPeriod(); + expectComponentType(controller.DISCUSSION_TYPE); + replayAll(); + assertThrows(AccessDeniedException.class, () -> controller + .getClassmateDiscussionAnnotations(studentAuth, run1, run1Period1Id, OTHER_NODE_ID, + COMPONENT_ID1)); + verifyAll(); + } + @Test public void getClassmateDiscussionWork_InRunDiscussionComponent_ReturnWork() throws IOException, NoSuchMethodException, ObjectNotFoundException { diff --git a/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataControllerTest.java b/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataControllerTest.java index 8784b0553..e5a287bf1 100644 --- a/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataControllerTest.java +++ b/src/test/java/org/wise/portal/presentation/web/controllers/student/ClassmateGraphDataControllerTest.java @@ -60,6 +60,18 @@ public void getClassmateGraphWorkInPeriod_NotGraphComponent_ThrowException() verifyAll(); } + @Test + public void getClassmateGraphWorkInPeriod_ComponentNotInProject_ThrowException() + throws IOException, NoSuchMethodException, ObjectNotFoundException { + setupStudent1InRunAndInPeriod(); + expectComponentType(controller.GRAPH_TYPE); + replayAll(); + assertThrows(AccessDeniedException.class, + () -> controller.getClassmateGraphWorkInPeriod(studentAuth, run1, NODE_ID1, + OTHER_COMPONENT_ID, SHOW_WORK_NODE_ID, SHOW_WORK_COMPONENT_ID, run1Period1Id)); + verifyAll(); + } + @Test public void getClassmateGraphWorkInPeriod_InvalidNodeId_ThrowException() throws IOException, NoSuchMethodException, ObjectNotFoundException { diff --git a/src/test/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkControllerTest.java b/src/test/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkControllerTest.java new file mode 100644 index 000000000..750cb5e9d --- /dev/null +++ b/src/test/java/org/wise/portal/presentation/web/controllers/student/PeerGroupWorkControllerTest.java @@ -0,0 +1,43 @@ +package org.wise.portal.presentation.web.controllers.student; + +import static org.junit.jupiter.api.Assertions.*; + +import java.io.IOException; + +import org.easymock.EasyMockExtension; +import org.easymock.TestSubject; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.security.access.AccessDeniedException; +import org.wise.portal.dao.ObjectNotFoundException; +import org.wise.portal.presentation.web.controllers.peergroup.AbstractPeerGroupWorkControllerTest; + +@ExtendWith(EasyMockExtension.class) +public class PeerGroupWorkControllerTest extends AbstractPeerGroupWorkControllerTest { + + @TestSubject + private PeerGroupWorkController controller = new PeerGroupWorkController(); + + @Test + public void getPeerGroupWork_NotShowGroupWorkComponent_ThrowException() + throws IOException, ObjectNotFoundException { + expectUserInPeerGroup(); + expectComponentType(run1Node1Id, run1Component1Id, "OpenResponse"); + replayAll(); + assertThrows(AccessDeniedException.class, () -> controller.getPeerGroupWork(studentAuth, + peerGroup1, run1Node1Id, run1Component1Id, run1Node2Id, run1Component2Id)); + verifyAll(); + } + + @Test + public void getPeerGroupWork_ComponentNotInProject_ThrowException() + throws IOException, ObjectNotFoundException { + expectUserInPeerGroup(); + expectComponentType(run1Node1Id, run1Component1Id, + controller.SHOW_PEER_GROUP_WORK_TYPE); + replayAll(); + assertThrows(AccessDeniedException.class, () -> controller.getPeerGroupWork(studentAuth, + peerGroup1, run1Node1Id, run1Component2Id, run1Node2Id, run1Component2Id)); + verifyAll(); + } +}